diff options
Diffstat (limited to 'views/mods')
24 files changed, 410 insertions, 482 deletions
diff --git a/views/mods/mod_deliverynote/settings_edit.phtml b/views/mods/mod_deliverynote/settings_edit.phtml index 20464a2..edb8b19 100644 --- a/views/mods/mod_deliverynote/settings_edit.phtml +++ b/views/mods/mod_deliverynote/settings_edit.phtml @@ -23,14 +23,15 @@ <?php } else { ?>
<a href="<?php echo $this->view['wpsg_mod_deliverynote']['bp']; ?>" target="_blank"><?php echo __('Derzeitiges Briefpapier', 'wpsg'); ?></a>
<?php } ?>
- <a style="float:right; position:relative;" class="glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_bp" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_bp"></a>
+ <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_bp" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_bp"></a>
<input type="file" name="wpsg_mod_deliverynote_bp">
<?php $strSuffix = ''; if ($this->view['wpsg_mod_deliverynote']['bp'] !== false) { $strSuffix = '
<label>
<input type="checkbox" name="wpsg_mod_deliverynote_bp_del" value="1" /> '.__('Löschen', 'wpsg').'
</label>';
- } ?>
- <?php echo wpsg_drawForm_TextEnd(__('Briefpapier (PDF/JPG)', 'wpsg').$strSuffix, array('noP' => true, 'help' => 'wpsg_mod_deliverynote_bp')); ?>
+ echo __($strSuffix);
+ } ?>
+ <?php echo wpsg_drawForm_TextEnd(__('Briefpapier (PDF/JPG)', 'wpsg'), array('noP' => true, 'helps' => 'wpsg_mod_deliverynote_bp')); ?>
<?php echo wpsg_drawForm_TextStart(); ?>
<?php if ($this->view['wpsg_mod_deliverynote']['logo'] === false) { ?>
@@ -38,14 +39,15 @@ <?php } else { ?>
<a href="<?php echo $this->view['wpsg_mod_deliverynote']['logo']; ?>" target="_blank"><?php echo __('Derzeitiges Logo', 'wpsg'); ?></a>
<?php } ?>
- <a style="float:right; position:relative;" class="glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_logo" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_logo"></a>
+ <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_logo" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_logo"></a>
<input type="file" name="wpsg_mod_deliverynote_logo">
<?php $strSuffix = ''; if ($this->view['wpsg_mod_deliverynote']['logo'] !== false) { $strSuffix = '
<label>
<input type="checkbox" name="wpsg_mod_deliverynote_logo_del" value="1" /> '.__('Löschen', 'wpsg').'
</label>';
+ echo __($strSuffix);
} ?>
- <?php echo wpsg_drawForm_TextEnd(__('Logo (JPG)', 'wpsg'), array('noP' => true, 'help' => 'wpsg_mod_deliverynote_logo')); ?>
+ <?php echo wpsg_drawForm_TextEnd(__('Logo (JPG)', 'wpsg'), array('noP' => true, 'helps' => 'wpsg_mod_deliverynote_logo')); ?>
<br />
@@ -102,7 +104,7 @@ <div class="info">
<?php echo __('Die Angaben für X (Abstand von Links) und Y (Abstand von Oben) werden in mm eingetragen.', 'wpsg'); ?><br />
- <?php echo __('Die Farbe wird im Hexadezimalformat angegeben (#FFFFF für weiß, #000000 für schwarz).', 'wpsg'); ?>
+ <?php echo __('Die Farbe wird im Hexadezimalformat angegeben (#FFFFFF für weiß, #000000 für schwarz).', 'wpsg'); ?>
</div>
<br />
diff --git a/views/mods/mod_discount/produkt_addedit_sidebar.phtml b/views/mods/mod_discount/produkt_addedit_sidebar.phtml index 5902ba8..7d6d4b7 100644 --- a/views/mods/mod_discount/produkt_addedit_sidebar.phtml +++ b/views/mods/mod_discount/produkt_addedit_sidebar.phtml @@ -13,9 +13,9 @@ </div>
<div class="inside">
<?php echo wpsg_drawForm_Checkbox('wpsg_mod_discount[discount_aktiv]', __('Aktion aktiv', 'wpsg'), $this->view['wpsg_mod_discount']['data'][0]); ?>
- <?php echo wpsg_drawForm_Input('wpsg_mod_discount[discount_from]', __('Start (TT.MM.JJJJ)', 'wpsg'), wpsg_hspc($this->view['wpsg_mod_discount']['data'][1])); ?>
- <?php echo wpsg_drawForm_Input('wpsg_mod_discount[discount_to]', __('Ende (TT.MM.JJJJ)', 'wpsg'), wpsg_hspc($this->view['wpsg_mod_discount']['data'][2])); ?>
- <?php echo wpsg_drawForm_Input('wpsg_mod_discount[discount_value]', __('Rabatt', 'wpsg'), wpsg_ff($this->view['wpsg_mod_discount']['data'][3])); ?>
+ <?php echo wpsg_drawForm_Input('wpsg_mod_discount[discount_from]', __('Start (TT.MM.JJJJ)', 'wpsg'), wpsg_hspc(wpsg_getStr($this->view['wpsg_mod_discount']['data'][1]))); ?>
+ <?php echo wpsg_drawForm_Input('wpsg_mod_discount[discount_to]', __('Ende (TT.MM.JJJJ)', 'wpsg'), wpsg_hspc(wpsg_getStr($this->view['wpsg_mod_discount']['data'][2]))); ?>
+ <?php echo wpsg_drawForm_Input('wpsg_mod_discount[discount_value]', __('Rabatt', 'wpsg'), wpsg_ff(wpsg_getStr($this->view['wpsg_mod_discount']['data'][3]))); ?>
<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_discount"><span class="wpsg-glyphicon glyphicon glyphicon-wrench"></span><?php echo __('Zur Konfiguration der Rabatte', 'wpsg'); ?></a>
diff --git a/views/mods/mod_downloadplus/filelist.phtml b/views/mods/mod_downloadplus/filelist.phtml index 6b43615..b151177 100644 --- a/views/mods/mod_downloadplus/filelist.phtml +++ b/views/mods/mod_downloadplus/filelist.phtml @@ -11,9 +11,10 @@ <ul>
<?php foreach ($this->view['files'] as $v) { ?>
<li>
- <a target="_blank" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_downloadplus&noheader=1&cmd=download_file&file=<?php echo rawurlencode($v); ?>&edit_id=<?php echo $_REQUEST['edit_id']; ?>" title="<?php echo wpsg_hspc($v); ?>"><?php echo wpsg_hspc(substr($v, 0, 25)); ?></a>
+ <a target="_blank" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_downloadplus&noheader=1&cmd=download_file&file=<?php echo rawurlencode($v); ?>&edit_id=<?php echo $_REQUEST['edit_id']; ?>" title="<?php echo wpsg_hspc($v); ?>"><?php echo wpsg_hspc(substr($v, 0, 50)); ?></a>
(<?php echo wpsg_formatSize($this->callMod('wpsg_mod_downloadplus', 'getPDFPath', array($_REQUEST['edit_id'])).'/'.$v); ?>)
- <div class="wpsg_mod_downloadplus_admin_delete" title="<?php echo __('PDF löschen', 'wpsg'); ?>" onclick="return wpsg_pdfdownload_removePDF('<?php echo rawurlencode($v); ?>');"></div>
+ <div class="wpsg_glyphicon_right glyphicon glyphicon-trash" title="<?php echo __('PDF löschen', 'wpsg'); ?>" onclick="return wpsg_pdfdownload_removePDF('<?php echo rawurlencode($v); ?>');"></div>
+
</li>
<?php } ?>
</ul>
diff --git a/views/mods/mod_downloadprodukte/order_view_row.phtml b/views/mods/mod_downloadprodukte/order_view_row.phtml index 7ccebd4..887bb69 100644 --- a/views/mods/mod_downloadprodukte/order_view_row.phtml +++ b/views/mods/mod_downloadprodukte/order_view_row.phtml @@ -5,7 +5,7 @@ */
?>
-<tr class="wpsg_<?php echo (($this->view['i'] == 0)?'odd':'even'); ?>">
+<tr class="wpsg_<?php echo ((wpsg_getInt($this->view['i']) == 0)?'odd':'even'); ?>">
<td ><?php echo __('Downloads', 'wpsg'); ?>:</td>
<td align="right" colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'4':'3'); ?>">
<?php foreach ($this->view['wpsg_mod_downloadprodukte']['arFiles'] as $file) { ?>
diff --git a/views/mods/mod_downloadprodukte/produkt_addedit_sidebar.phtml b/views/mods/mod_downloadprodukte/produkt_addedit_sidebar.phtml index 63726c6..947be7d 100644 --- a/views/mods/mod_downloadprodukte/produkt_addedit_sidebar.phtml +++ b/views/mods/mod_downloadprodukte/produkt_addedit_sidebar.phtml @@ -73,7 +73,7 @@ <?php echo __('Downloadprodukt', 'wpsg'); ?>
</h3>
</div>
- <div class="inside">
+ <div class="panel-body">
<div id="produktfiles_target"><?php echo $this->view['prodFiles']; ?></div>
<?php if ($this->get_option('wpsg_classicupload') == '1') { ?>
diff --git a/views/mods/mod_downloadprodukte/produkt_edit_list.phtml b/views/mods/mod_downloadprodukte/produkt_edit_list.phtml index 926ebd4..4ccf430 100644 --- a/views/mods/mod_downloadprodukte/produkt_edit_list.phtml +++ b/views/mods/mod_downloadprodukte/produkt_edit_list.phtml @@ -7,15 +7,15 @@ ?>
<?php if (wpsg_isSizedArray($this->view['prodFiles']) && wpsg_isSizedInt($_REQUEST['edit_id'])) { ?>
<ul>
-<?php foreach ($this->view['prodFiles'] as $file) { ?>
+ <?php foreach ($this->view['prodFiles'] as $file) { ?>
<li>
- <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_downloadprodukte&noheader=1&cmd=download_file&file=<?php echo rawurlencode(basename($file[1])); ?>&edit_id=<?php echo $_REQUEST['edit_id']; ?>" title="<?php echo wpsg_hspc(basename($file[1])); ?>"><?php echo wpsg_hspc(substr(basename($file[1]), 0, 25)); ?></a>
+ <a target="_blank" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_downloadprodukte&noheader=1&cmd=download_file&file=<?php echo rawurlencode(basename($file[1])); ?>&edit_id=<?php echo $_REQUEST['edit_id']; ?>" title="<?php echo wpsg_hspc(basename($file[1])); ?>"><?php echo wpsg_hspc(substr(basename($file[1]), 0, 50)); ?></a>
(<?php echo wpsg_formatSize($file[1]); ?>)
- <div class="wpsg_mod_downloadprodukte_admin_delete" onclick="return wpsg_remove_file('<?php echo basename($file[0]) ?>');" title="<?php echo __('Datei löschen', 'wpsg') ?>"></div>
+ <div class="wpsg_glyphicon_right glyphicon glyphicon-trash" onclick="return wpsg_remove_file('<?php echo basename($file[0]) ?>');" title="<?php echo __('Datei löschen', 'wpsg') ?>"></div>
</li>
-<?php } ?>
+ <?php } ?>
</ul>
<?php } else { ?>
<p><?php echo __('Bisher keine Dateien hochgeladen.', 'wpsg'); ?>
diff --git a/views/mods/mod_ordercondition/list.phtml b/views/mods/mod_ordercondition/list.phtml index d2abc92..00eabc0 100644 --- a/views/mods/mod_ordercondition/list.phtml +++ b/views/mods/mod_ordercondition/list.phtml @@ -106,8 +106,8 @@ <script type="text/javascript">/* <![CDATA[ */
jQuery('#oc_typ_<?php echo $oc['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordercondition&do=inlinedit&noheader=1', {
- type: 'string',
- data: '<?php echo json_encode(array('0' => __('Inaktiv', 'wpsg'), '1' => __('Jede Bestellung', 'wpsg'), '2' => __('Bestimmte Produkte', 'wpsg'))); ?>',
+ type: 'select',
+ data: <?php echo wpsg_prepare_for_inlineEdit(array('0' => __('Inaktiv', 'wpsg'), '1' => __('Jede Bestellung', 'wpsg'), '2' => __('Bestimmte Produkte', 'wpsg'))); ?>,
submitdata: {
field: 'typ',
oc_id: '<?php echo $oc['id']; ?>'
diff --git a/views/mods/mod_productvars/produkt_addedit_sidebar.phtml b/views/mods/mod_productvars/produkt_addedit_sidebar.phtml index 3204b89..094b366 100644 --- a/views/mods/mod_productvars/produkt_addedit_sidebar.phtml +++ b/views/mods/mod_productvars/produkt_addedit_sidebar.phtml @@ -22,12 +22,12 @@ <br />
<br /><br />
-
+ <!--
<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productvars"><?php echo __('Zur Produktvariablenverwaltung', 'wpsg'); ?></a>
-
+ -->
<br /><br />
- <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_produktvars"><span class="wpsg-glyphicon glyphicon glyphicon-wrench"></span><?php echo __('Zur Konfiguration der Produktvariablen', 'wpsg'); ?></a>
+ <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productvars"><span class="wpsg-glyphicon glyphicon glyphicon-wrench"></span><?php echo __('Zur Konfiguration der Produktvariablen', 'wpsg'); ?></a>
</div>
</div>
diff --git a/views/mods/mod_productvars/pv_list.phtml b/views/mods/mod_productvars/pv_list.phtml index 9a16939..0eb134a 100644 --- a/views/mods/mod_productvars/pv_list.phtml +++ b/views/mods/mod_productvars/pv_list.phtml @@ -6,7 +6,8 @@ ?>
<?php if (is_array($this->view['data']) && sizeof($this->view['data']) > 0) { ?>
-<table class="wpsg_pv_table">
+<table class="wpsg_pv_table table table-body-striped">
+ <thead>
<tr>
<th><?php echo __('ID', 'wpsg'); ?></th>
<th class="wpsg_label"><?php echo __('Name', 'wpsg'); ?></th>
@@ -14,7 +15,9 @@ <th class="wpsg_pflicht"><?php echo __('Pflicht', 'wpsg'); ?></th>
<th class="wpsg_delcol"></th>
</tr>
+ </thead>
<?php $i = 0; foreach ($this->view['data'] as $pv) { $i ++; ?>
+ <tbody id="ov_<?php echo $pv['id']; ?>">
<tr class="wpsg_table wpsg_tablerow <?php echo (($i % 2 == 0)?'odd':'even'); ?>" id="pv_<?php echo $pv['id']; ?>">
<td class="wpsg_id"><?php echo $pv['id']; ?></td>
<td class="wpsg_label">
@@ -97,8 +100,10 @@ </td>
</tr>
+ </tbody>
<?php } ?>
</table>
+
<p class="wpsg_hinweis"><?php echo __('Die Reihenfolge lässt sich mittels Drag&Drop verändern.', 'wpsg'); ?>
<script type="text/javascript">/* <![CDATA[ */
diff --git a/views/mods/mod_productvars/settings_edit.phtml b/views/mods/mod_productvars/settings_edit.phtml index 607e441..963c6bb 100644 --- a/views/mods/mod_productvars/settings_edit.phtml +++ b/views/mods/mod_productvars/settings_edit.phtml @@ -57,13 +57,14 @@ <div class="head">
<div class="title">
<div class="fulltab">
- <?php echo __('Produktvariablen', 'wpsg'); ?>
- <a title="<?php echo __('Neue Produktvariable anlegen', 'wpsg'); ?>" href="" class="wpsg_glyphicon_right glyphicon glyphicon-plus-sign" onclick="return wpsg_addPV();"></a>
+ <?php echo __('', 'wpsg'); ?>
</div>
</div>
</div>
<div class="content" id="wpsg_pv_list">
<?php echo $this->mod->pv_list(); ?>
</div>
-
+<br />
+ <a title="<?php echo __('Neue Produktvariable anlegen', 'wpsg'); ?>" href="" class="" onclick="return wpsg_addPV();"><span class="glyphicon wpsg-glyphicon glyphicon-plus"></span><?php echo __('Neue Produktvariable anlegen.', 'wpsg'); ?></a>
+
</div>
\ No newline at end of file diff --git a/views/mods/mod_rechnungen/foottext_list.phtml b/views/mods/mod_rechnungen/foottext_list.phtml index e614cda..c311447 100644 --- a/views/mods/mod_rechnungen/foottext_list.phtml +++ b/views/mods/mod_rechnungen/foottext_list.phtml @@ -8,21 +8,26 @@ <?php if (sizeof($this->view['data']) <= 0) { ?>
<p><?php echo __('Bisher keine Fußtexte angelegt!', 'wpsg'); ?></p>
<?php } else { ?>
-<table class="wpsg_foottextlist">
+<table class="table table-body-striped wpsg_foottextlist">
+ <thead>
<tr>
<th class="col_kuerzel"><?php echo __('Kürzel', 'wpsg'); ?></th>
<th class="col_text"><?php echo __('Text', 'wpsg'); ?></th>
<th class="col_standard"><?php echo __('Standard', 'wpsg'); ?></th>
<th class="col_aktion"></th>
</tr>
+ </thead>
+ <tbody>
<?php foreach ((array)$this->view['data'] as $key => $d) { ?>
<tr>
- <td class="col_kuerzel wpsg_editable" id="wpsg_foottext_0_<?php echo $key; ?>"><?php echo wpsg_hspc($d[0]); ?></td>
- <td class="col_text wpsg_editable" id="wpsg_foottext_1_<?php echo $key; ?>"><?php echo wpsg_hspc($d[1]); ?></td>
+ <td class="col_kuerzel"><span class="wpsg_editable" id="wpsg_foottext_0_<?php echo $key; ?>"><?php echo wpsg_hspc($d[0]); ?></span></td>
+ <td class="col_text"><span class="wpsg_editable" id="wpsg_foottext_1_<?php echo $key; ?>"><?php echo wpsg_hspc($d[1]); ?></span></td>
<td class="col_standard"><input type="radio" value="<?php echo $key; ?>" <?php echo (($this->get_option('wpsg_rechnungen_foottext_standard') == $key)?'checked="checked"':''); ?> class="wpsg_rechnungen_foottext_standard" name="wpsg_rechnungen_foottext_standard" /></td>
<td class="col_aktion">
- <a onclick="return wpsg_removeFooter(<?php echo $key; ?>);" title="<?php echo __('Fußtext löschen', 'wpsg'); ?>'" href="#" class="wpsg_glyphicon_right glyphicon glyphicon-minus-sign"></a>
+ <a onclick="return wpsg_removeFooter(<?php echo $key; ?>);" title="<?php echo __('Fußtext löschen', 'wpsg'); ?>'" href="#" class="">
+ <span class="glyphicon glyphicon-trash"></span>
+ </a>
<script type="text/javascript">
@@ -57,5 +62,6 @@ </td>
</tr>
<?php } ?>
+ </tbody>
</table>
<?php } ?>
\ No newline at end of file diff --git a/views/mods/mod_rechnungen/settings_edit.phtml b/views/mods/mod_rechnungen/settings_edit.phtml index 3ed53c1..c215ba9 100644 --- a/views/mods/mod_rechnungen/settings_edit.phtml +++ b/views/mods/mod_rechnungen/settings_edit.phtml @@ -32,8 +32,9 @@ <label>
<input type="checkbox" name="wpsg_rechnungen_bp_del" value="1" /> '.__('Löschen', 'wpsg').'
</label>';
+ echo __($strSuffix);
} ?>
- <?php echo wpsg_drawForm_TextEnd(__('Briefpapier (PDF/JPG)', 'wpsg').$strSuffix, array('noP' => true, 'help' => 'wpsg_rechnungen_bp')); ?>
+ <?php echo wpsg_drawForm_TextEnd(__('Briefpapier (PDF/JPG)', 'wpsg'), array('noP' => true, 'helps' => 'wpsg_rechnungen_bp')); ?>
<?php echo wpsg_drawForm_TextStart(); ?>
<?php if ($this->view['logo'] === false) { ?>
@@ -47,8 +48,9 @@ <label>
<input type="checkbox" name="wpsg_rechnungen_logo_del" value="1" /> '.__('Löschen', 'wpsg').'
</label>';
+ echo __($strSuffix);
} ?>
- <?php echo wpsg_drawForm_TextEnd(__('Logo (JPG)', 'wpsg').$strSuffix, array('noP' => true, 'help' => 'wpsg_rechnungen_bp')); ?>
+ <?php echo wpsg_drawForm_TextEnd(__('Logo (JPG)', 'wpsg'), array('noP' => true, 'helps' => 'wpsg_rechnungen_bp')); ?>
<!--
<div class="wpsg_hinweis"><?php echo __('Das Briefpapier wird hinter die gesamte Seite gelegt, das Logo wird rechts oben auf jeder Seite platziert. (96 dpi)', 'wpsg'); ?></div>
@@ -102,7 +104,7 @@ <div class="wpsg_hinweis">
<?php echo __('Die Angaben für X (Abstand von Links) und Y (Abstand von Oben) werden in mm eingetragen.', 'wpsg'); ?><br />
- <?php echo __('Die Farbe wird im Hexadezimalformat angegeben (#FFFFF für weiß, #000000 für schwarz).', 'wpsg'); ?>
+ <?php echo __('Die Farbe wird im Hexadezimalformat angegeben (#FFFFFF für weiß, #000000 für schwarz).', 'wpsg'); ?>
</div>
<br />
@@ -110,8 +112,11 @@ <div id="tab2" role="tabpanel" class="tab-pane" >
<div id="foottext_list"><?php echo $this->view['foottext_list']; ?></div>
- <br />
-
+ <br />
+
+ <a title="<?php echo __('Neue Fußzeile anlegen', 'wpsg'); ?>" href="" class="" onclick="return wpsg_addFooter();"><span class="glyphicon wpsg-glyphicon glyphicon-plus"></span><?php echo __('Neue Fußzeile anlegen.', 'wpsg'); ?></a>
+
+ <br /><br />
<div class="wpsg_hinweis">
<?php echo __('Hier können Sie Texte vordefinieren, die sie unter die Rechnung setzen können.', 'wpsg'); ?>
</div>
diff --git a/views/mods/mod_spconditions/conditionList.phtml b/views/mods/mod_spconditions/conditionList.phtml index 38c49b4..f868169 100644 --- a/views/mods/mod_spconditions/conditionList.phtml +++ b/views/mods/mod_spconditions/conditionList.phtml @@ -10,7 +10,11 @@ <?php foreach ($this->view['data'] as $k => $v) { ?>
<?php echo wpsg_drawForm_Input('', __('Id', 'wpsg'), $v['id'], array('text' => true)); ?>
- <?php echo wpsg_drawForm_Select('shipping_id', __('Versandart', 'wpsg'), wpsg_getArray($this->view['arShipping']), $v['shipping_id']); ?>
+ <?php $artemp = Array();
+ foreach ($this->arShipping as $key => $val)
+ $artemp[] = $val['name'];
+ ?>
+ <?php echo wpsg_drawForm_Select('shipping_id', __('Versandart', 'wpsg'), wpsg_getArray($artemp), $v['shipping_id']); ?>
<hr />
<?php } ?>
diff --git a/views/mods/mod_statistics/chartsalestopaymentmethod/all.phtml b/views/mods/mod_statistics/chartsalestopaymentmethod/all.phtml index c519090..9b5fe3a 100644 --- a/views/mods/mod_statistics/chartsalestopaymentmethod/all.phtml +++ b/views/mods/mod_statistics/chartsalestopaymentmethod/all.phtml @@ -17,17 +17,26 @@ <div class="wpsg_clearer"></div>
<?php
+ $barChartJS = Array();
+ $pieChartJS = Array();
+ $barChartJS['amount'] = '';
+ $barChartJS['payment'] = '';
+ $barChartJS['total'] = '';
+ $pieChartJS['amount'] = '';
+ $pieChartJS['sales'] = '';
+ $pieChartJS['percent'] = '';
+
foreach ($this->view['chart']['data']['records'] as $data)
{
$barChartJS['payment'] .= "'".wpsg_hspc($data['name'])."', ";
$barChartJS['total'] .= wpsg_hspc($data['total']).", ";
- $pieChartJS .= "['".wpsg_hspc($data['name'])."', ".wpsg_hspc($data['percent'])."], ";
+ $pieChartJS['percent'] .= "['".wpsg_hspc($data['name'])."', ".wpsg_hspc($data['percent'])."], ";
}
$barChartJS['payment'] = substr($barChartJS['payment'], 0, -2);
$barChartJS['total'] = substr($barChartJS['total'], 0, -2);
- $pieChartJS = substr($pieChartJS, 0, -2);
+ $pieChartJS['percent'] = substr($pieChartJS['percent'], 0, -2);
?>
@@ -55,7 +64,7 @@ xaxis: {
renderer: jQuery.jqplot.CategoryAxisRenderer,
ticks: payment,
- label:'<?php echo wpsg_hspc($this->view['chart']['info']['xaxis']['label']); ?>'
+ label:'<?php echo wpsg_hspc(wpsg_getStr($this->view['chart']['info']['xaxis']['label'])); ?>'
},
yaxis:{
label:'<?php echo wpsg_hspc($this->view['chart']['info']['yaxis']['label']); ?>',
@@ -68,7 +77,7 @@ highlighter: { show: false }
});
- var data = [<?php echo $pieChartJS; ?>];
+ var data = [<?php echo $pieChartJS['percent']; ?>];
var chartsalestopaymentmethodPie = jQuery.jqplot ('chartsalestopaymentmethod-pie', [data],
{
diff --git a/views/mods/mod_statistics/charttopsellertosales/all.phtml b/views/mods/mod_statistics/charttopsellertosales/all.phtml index dfff484..6544b94 100644 --- a/views/mods/mod_statistics/charttopsellertosales/all.phtml +++ b/views/mods/mod_statistics/charttopsellertosales/all.phtml @@ -20,7 +20,15 @@ <div class="wpsg_clearer"></div>
<?php
-
+ $barChartJS = Array();
+ $pieChartJS = Array();
+ $barChartJS['amount'] = '';
+ $barChartJS['payment'] = '';
+ $barChartJS['total'] = '';
+
+ $pieChartJS['amount'] = '';
+ $pieChartJS['sales'] = '';
+
foreach ($this->view['chart']['data']['records'] as $data)
{
$barChartJS['payment'] .= "'".wpsg_hspc($data['name'])."', ";
@@ -83,7 +91,7 @@ fontWeight: 'normal',
textColor: '#666666'
},
- label:'<?php echo wpsg_hspc($this->view['chart']['info']['xaxis']['label']); ?>',
+ label:'<?php echo wpsg_hspc(wpsg_getStr($this->view['chart']['info']['xaxis']['label'])); ?>',
labelOptions: {
fontFamily: 'Arial',
fontSize: '14pt',
diff --git a/views/mods/mod_statistics/simplefilter.phtml b/views/mods/mod_statistics/simplefilter.phtml index c3906de..9c8eb5b 100644 --- a/views/mods/mod_statistics/simplefilter.phtml +++ b/views/mods/mod_statistics/simplefilter.phtml @@ -56,8 +56,10 @@ <input style="float:left; margin-left:25px;" type="submit" class="button-secondary" value="<?php echo __('Anzeigen', 'wpsg'); ?>" />
<div class="customfilter" style="display:none;">
+ <?php if (isset($this->view['filter']['day'][0])) { ?>
<?php echo wpsg_drawForm_Date('filter[day][0]', __('von', 'wpsg'), $this->view['filter']['day'][0]['d'].'.'.$this->view['filter']['day'][0]['m'].'.'.$this->view['filter']['day'][0]['Y'], array('time' => false)); ?>
<?php echo wpsg_drawForm_Date('filter[day][1]', __('bis', 'wpsg'), $this->view['filter']['day'][1]['d'].'.'.$this->view['filter']['day'][1]['m'].'.'.$this->view['filter']['day'][1]['Y'], array('time' => false)); ?>
+ <?php } ?>
</div>
<input type="hidden" id="wpsg_statistics_order" name="filter[order]" value="<?php echo wpsg_hspc($this->view['filter']['order']); ?>" />
diff --git a/views/mods/mod_stock/settings_edit.phtml b/views/mods/mod_stock/settings_edit.phtml index 92e2194..b384b79 100644 --- a/views/mods/mod_stock/settings_edit.phtml +++ b/views/mods/mod_stock/settings_edit.phtml @@ -5,25 +5,12 @@ */
?>
-<div class="wpsg_form_field">
- <div class="wpsg_form_left">
- <label for="wpsg_mod_stock_template"><?php echo __('Template für ausverkaufte Produkte', 'wpsg'); ?>:</label>
- </div>
- <div class="wpsg_form_right">
- <?php if (!is_array($this->view['arTemplates']) || sizeof($this->view['arTemplates']) <= 0) { ?>
- <p class="wpsg_error"><?php echo __('Keine Templatedatein gefunden!', 'wpsg'); ?></p>
- <?php } else { ?>
- <input type="hidden" name="wpsg_mod_stock_template" value="<?php echo $this->get_option('wpsg_mod_stock_template'); ?>" />
- <select name="wpsg_mod_stock_template" id="wpsg_mod_stock_template">
- <option value="-1"><?php echo __('Wie Produkttemplate', 'wpsg'); ?></option>
- <?php foreach ($this->view['arTemplates'] as $t) { ?>
- <option <?php echo (($t == $this->get_option('wpsg_mod_stock_template'))?'selected="selected"':''); ?> value="<?php echo wpsg_hspc($t); ?>"><?php echo wpsg_hspc($t); ?></option>
- <?php } ?>
- </select>
- <?php } ?>
- </div>
- <div class="wpsg_clear"></div>
-</div>
+<?php
+ $arTemp = wpsg_array_merge(array('-1' => __('Wie Produkttemplate', 'wpsg')), $this->view['arTemplates']);
+?>
+<?php echo wpsg_drawForm_Select('wpsg_mod_stock_template', __('Template für ausverkaufte Produkte', 'wpsg'),
+ $arTemp, @$this->get_option('wpsg_mod_stock_template')); ?>
+
<?php echo wpsg_drawForm_Checkbox('wpsg_mod_stock_notemplateswitch', __('Template nicht wechseln', 'wpsg'), $this->get_option('wpsg_mod_stock_notemplateswitch'), array('help' => 'wpsg_mod_stock_notemplateswitch')); ?>
<?php echo wpsg_drawForm_Checkbox('wpsg_mod_stock_allow', __('Bestellungen bei negativen Bestand verhindern', 'wpsg'), $this->get_option('wpsg_mod_stock_allow'), array('help' => 'wpsg_mod_stock_allow')); ?>
<?php echo wpsg_drawForm_Checkbox('wpsg_mod_stock_showBackendStock', __('Bestand in Produktübersicht (Backend) anzeigen', 'wpsg'), $this->get_option('wpsg_mod_stock_showBackendStock'), array('help' => 'wpsg_mod_stock_showBackendStock')); ?>
diff --git a/views/mods/mod_trustedshops/settings_edit.phtml b/views/mods/mod_trustedshops/settings_edit.phtml index 3a89a03..6f3712f 100644 --- a/views/mods/mod_trustedshops/settings_edit.phtml +++ b/views/mods/mod_trustedshops/settings_edit.phtml @@ -130,7 +130,8 @@ <div class="wpsg_form_field">
<div class="wpsg_form_left"> </div>
<div class="wpsg_form_right wpsg_form_right_unit">
- <?php if (wpsg_isSizedArray($this->callMod('wpsg_mod_trustedshops', 'getExportData'))) { ?>
+ <?php $temp = $this->callMod('wpsg_mod_trustedshops', 'getExportData');
+ if (wpsg_isSizedArray($temp)) { ?>
<a target="_blank" onclick="location.href=location.href;" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_trustedshops&do=export&noheader=1" class="button"><?php echo __('CSV-Export-Datei erstellen', 'wpsg'); ?></a>
<?php } else { ?>
<p><?php echo __('Derzeit keine Daten zum Export verfügbar.', 'wpsg'); ?></p>
diff --git a/views/mods/mod_userpayment/list.phtml b/views/mods/mod_userpayment/list.phtml index 8d00e48..68ca5ec 100644 --- a/views/mods/mod_userpayment/list.phtml +++ b/views/mods/mod_userpayment/list.phtml @@ -8,148 +8,119 @@ <?php if (!is_array($this->view['wpsg_mod_userpayment']['data']) || sizeof($this->view['wpsg_mod_userpayment']['data']) <= 0) { ?>
<?php echo __('Bisher keine Zahlvarianten angelegt.', 'wpsg'); ?>
<?php } else { ?>
- <table class="zv_table">
- <colgroup>
- <col class="wpsg_label" />
- <col class="wpsg_value" />
- <col class="wpsg_delcol" />
- </colgroup>
- <?php $i = 0; foreach ($this->view['wpsg_mod_userpayment']['data'] as $zv) { $i ++; ?>
- <tr>
- <td class="wpsg_label"><?php echo __('ID', 'wpsg'); ?>:</td>
- <td class="wpsg_value"><?php echo $zv['id']; ?></td>
- <td class="wpsg_delcol">
- <a class="wpsg_glyphicon_right glyphicon glyphicon-minus-sign" href="#" title="<?php echo __('Zahlvariante löschen', 'wpsg'); ?>" onclick="return wpsg_removeZV(<?php echo $zv['id']; ?>);"></a>
-
- <script type="text/javascript">
-
- jQuery(document).ready(function() {
-
- jQuery('#zv_<?php echo $zv['id']; ?>_name').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_userpayment&do=inlinedit&noheader=1', {
- submitdata: {
- field: 'name',
- zv_id: '<?php echo $zv['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('#zv_<?php echo $zv['id']; ?>_hint').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_userpayment&do=inlinedit&noheader=1', {
- submitdata: {
- field: 'hint',
- zv_id: '<?php echo $zv['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('#zv_<?php echo $zv['id']; ?>_rabgeb').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_userpayment&do=inlinedit&noheader=1', {
- submitdata: {
- field: 'rabgeb',
- zv_id: '<?php echo $zv['id']; ?>'
- },
- submit: '<?php echo __('Speichern', 'wpsg'); ?>',
- placeholder: '<?php echo __('Definieren ...', 'wpsg'); ?>',
- indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
- tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
- } );
-
- jQuery('#zv_<?php echo $zv['id']; ?>_mwst').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_userpayment&do=inlinedit&noheader=1', {
- submitdata: {
- field: 'mwst_key',
- zv_id: '<?php echo $zv['id']; ?>'
- },
- submit: '<?php echo __('Speichern', 'wpsg'); ?>',
- data: <?php echo wpsg_prepare_for_inlineEdit(wpsg_tax_groups()); ?>,
- type: 'select',
- placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
- indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
- tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
- });
-
- jQuery('#zv_<?php echo $zv['id']; ?>_aktiv').bind('change', function() {
-
- var value = 0;
- if (jQuery(this).attr("checked") == "checked") value = 1;
-
- jQuery.ajax( {
- url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_userpayment&do=inlinedit&noheader=1',
- data: {
- field: 'aktiv',
- zv_id: '<?php echo $zv['id']; ?>',
- value: value
- }
- } );
-
- } );
-
- } );
-
- </script>
-
- </td>
- </tr>
- <tr>
- <td class="wpsg_label"><?php echo __('Bezeichnung', 'wpsg'); ?>:</td>
- <td class="wpsg_value" id="zv_<?php echo $zv['id']; ?>_name"><?php echo wpsg_hspc($zv['name']); ?></td>
- <td class="wpsg_delcol">
- <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_name" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_name"></a>
- </td>
- </tr>
- <tr>
- <td class="wpsg_label"><?php echo __('Aktiv', 'wpsg'); ?>:</td>
- <td class="wpsg_value">
- <input type="checkbox" value="1" <?php echo (($zv['aktiv'] == '1')?'checked="checked"':''); ?> id="zv_<?php echo $zv['id']; ?>_aktiv" />
- </td>
- <td class="wpsg_delcol">
- <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_activ" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_activ"></a>
- </td>
- </tr>
- <tr>
- <td class="wpsg_label"><?php echo __('Hinweistext', 'wpsg'); ?>:</td>
- <td class="wpsg_value" id="zv_<?php echo $zv['id']; ?>_hint"><?php echo wpsg_hspc($zv['hint']); ?></td>
- <td class="wpsg_delcol">
- <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_hint" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_hint"></a>
- </td>
- </tr>
- <tr>
- <td class="wpsg_label"><?php echo __('Gebühr/Rabatt', 'wpsg'); ?>:</td>
- <td class="wpsg_value">
- <div style="float:left; width:70%" id="zv_<?php echo $zv['id']; ?>_rabgeb" class="editable"><?php echo wpsg_hspc(wpsg_ff($zv['rabgeb'], true)); ?></div>
- <div style="float:right;"><?php echo $this->get_option('wpsg_currency'); ?> / %</div>
- </td>
- <td class="wpsg_delcol">
- <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_gebuehr" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_gebuehr"></a>
- </td>
- </tr>
- <tr>
- <td class="wpsg_label"><?php echo __('Steuersatz', 'wpsg'); ?>:</td>
- <td id="zv_<?php echo $zv['id']; ?>_mwst" class="wpsg_value wpsg_editable"><?php
-
- $tax_groups = wpsg_tax_groups();
- echo wpsg_hspc($tax_groups[$zv['mwst_key']]);
-
- ?></td>
- <td class="wpsg_delcol">
- <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_gebuehr" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_gebuehr"></a>
- </td>
- </tr>
- <tr>
- <td class="wpsg_label"><?php echo __('Keine MwSt. wenn Land steuerfrei', 'wpsg'); ?>:</td>
- <td class="wpsg_value">
- <input onchange="wpsg_saveZVMwSt(this, <?php echo $zv['id']; ?>);" <?php echo (($zv['mwst_laender'] == '1')?'checked="checked"':''); ?> type="checkbox" value="1" />
- </td>
- <td class="wpsg_delcol">
- <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwstland" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwstland"></a>
- </td>
- </tr>
- <?php if ($i < sizeof($this->view['wpsg_mod_userpayment']['data'])) { ?>
- <tr class="wpsg_spacer"><td colspan="3"><hr /></td></tr>
- <?php } ?>
- <?php } ?>
- </table>
+
+<?php $i = 0; foreach ($this->view['wpsg_mod_userpayment']['data'] as $zv) { $i ++; ?>
+
+ <hr />
+ <div id="wpsg_mod_userpayment_row_<?php echo $zv['id']; ?>">
+
+ <?php echo wpsg_drawForm_TextStart(); ?>
+ <?php echo $zv['id']; ?><a data-id="<?php echo $zv['id']; ?>" class="wpsg_oc_removeLink" href="#"><span class="wpsg_glyphicon_right glyphicon glyphicon-trash"></span></a>
+ <?php echo wpsg_drawForm_TextEnd(__('ID', 'wpsg')); ?>
+
+ <?php echo wpsg_drawForm_TextStart(); ?>
+ <span id="zv_name_<?php echo $zv['id']; ?>"><?php echo $zv['name']; ?></span>
+ <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_name" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_name"></a>
+ <?php echo wpsg_drawForm_TextEnd(__('Bezeichnung', 'wpsg')); ?>
+ <script type="text/javascript">/* <![CDATA[ */
+ jQuery('#zv_name_<?php echo $zv['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_userpayment&do=inlinedit&noheader=1', {
+ submitdata: {
+ field: 'name',
+ zv_id: '<?php echo $zv['id']; ?>'
+ }
+ });
+ /* ]]> */</script>
+
+ <?php echo wpsg_drawForm_TextStart(); ?>
+ <input type="checkbox" value="1" <?php echo (($zv['aktiv'] == '1')?'checked="checked"':''); ?> id="zv_<?php echo $zv['id']; ?>_aktiv" />
+ <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_activ" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_activ"></a>
+ <?php echo wpsg_drawForm_TextEnd(__('Aktiv', 'wpsg')); ?>
+ <script type="text/javascript">/* <![CDATA[ */
+ jQuery('#zv_<?php echo $zv['id']; ?>_aktiv').bind('change', function() {
+
+ var value = 0;
+ if (jQuery(this).attr("checked") == "checked") value = 1;
+
+ jQuery.ajax( {
+ url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_userpayment&do=inlinedit&noheader=1',
+ data: {
+ field: 'aktiv',
+ zv_id: '<?php echo $zv['id']; ?>',
+ value: value
+ }
+ } );
+ } );
+ /* ]]> */</script>
+
+ <?php echo wpsg_drawForm_TextStart(); ?>
+ <span id="zv_hint_<?php echo $zv['id']; ?>"><?php echo wpsg_hspc($zv['hint']); ?></span>
+ <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_hint" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_hint"></a>
+ <?php echo wpsg_drawForm_TextEnd(__('Hinweistext', 'wpsg')); ?>
+ <script type="text/javascript">/* <![CDATA[ */
+ jQuery('#zv_hint_<?php echo $zv['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_userpayment&do=inlinedit&noheader=1', {
+ submitdata: {
+ field: 'hint',
+ zv_id: '<?php echo $zv['id']; ?>'
+ }
+ });
+ /* ]]> */</script>
+
+ <?php echo wpsg_drawForm_TextStart(); ?>
+ <span id="zv_rabgeb_<?php echo $zv['id']; ?>"><?php echo wpsg_hspc($zv['rabgeb']); ?></span>
+ <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_gebuehr" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_gebuehr"></a>
+ <?php echo wpsg_drawForm_TextEnd(__('Gebühr/Rabatt', 'wpsg')); ?>
+ <script type="text/javascript">/* <![CDATA[ */
+ jQuery('#zv_rabgeb_<?php echo $zv['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_userpayment&do=inlinedit&noheader=1', {
+ submitdata: {
+ field: 'rabgeb',
+ zv_id: '<?php echo $zv['id']; ?>'
+ }
+ });
+ /* ]]> */</script>
+
+ <?php echo wpsg_drawForm_TextStart(); ?>
+ <span id="zv_mwst_key_<?php echo $zv['id']; ?>"><?php
+ $tax_groups = wpsg_tax_groups();
+ echo wpsg_hspc($tax_groups[$zv['mwst_key']]);
+ ?></span>
+ <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst"></a>
+ <?php echo wpsg_drawForm_TextEnd(__('Steuersatz', 'wpsg')); ?>
+ <script type="text/javascript">/* <![CDATA[ */
+ jQuery('#zv_mwst_key_<?php echo $zv['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_userpayment&do=inlinedit&noheader=1', {
+ type: 'select',
+ data: <?php echo wpsg_prepare_for_inlineEdit(wpsg_tax_groups()); ?>,
+ submitdata: {
+ field: 'mwst_key',
+ zv_id: '<?php echo $zv['id']; ?>'
+ }
+ });
+ /* ]]> */</script>
+
+ <?php echo wpsg_drawForm_TextStart(); ?>
+ <input type="checkbox" value="1" <?php echo (($zv['mwst_laender'] == '1')?'checked="checked"':''); ?> id="zv_mwst_laender_<?php echo $zv['id']; ?>" />
+ <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwstland" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwstland"></a>
+ <?php echo wpsg_drawForm_TextEnd(__('Keine MwSt. wenn Land steuerfrei', 'wpsg')); ?>
+ <script type="text/javascript">/* <![CDATA[ */
+ jQuery('#zv_mwst_laender_<?php echo $zv['id']; ?>').bind('change', function() {
+
+ var value = 0;
+ if (jQuery(this).attr("checked") == "checked") value = 1;
+
+ jQuery.ajax( {
+ url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_userpayment&do=inlinedit&noheader=1',
+ data: {
+ field: 'mwst_laender',
+ zv_id: '<?php echo $zv['id']; ?>',
+ value: value
+ }
+ } );
+ } );
+ /* ]]> */</script>
+
+ </div>
+
+ <?php if ($i == sizeof($this->view['wpsg_mod_userpayment']['data'])) { ?><hr /><?php } ?>
+ <?php } ?>
+
+
<?php } ?>
\ No newline at end of file diff --git a/views/mods/mod_userpayment/settings_edit.phtml b/views/mods/mod_userpayment/settings_edit.phtml index 2ce84b3..d8e9e8e 100644 --- a/views/mods/mod_userpayment/settings_edit.phtml +++ b/views/mods/mod_userpayment/settings_edit.phtml @@ -69,7 +69,6 @@ <div class="title">
<div class="fulltab">
<?php echo __('Zahlvarianten', 'wpsg'); ?>
- <a title="<?php echo __('Neue Zahlvariante anlegen', 'wpsg'); ?>" href="" class="wpsg_glyphicon_right glyphicon glyphicon-plus-sign" onclick="return wpsg_addZV();"></a>
</div>
</div>
</div>
@@ -79,4 +78,7 @@ </div>
-<p class="wpsg_hinweis"><?php echo __('Um eine Zahlvariante zu bearbeiten klicken Sie einfach auf den Namen oder den Rabattwert.', 'wpsg'); ?></p>
\ No newline at end of file +<p class="wpsg_hinweis"><?php echo __('Um eine Zahlvariante zu bearbeiten klicken Sie einfach auf den Namen oder den Rabattwert.', 'wpsg'); ?></p>
+
+<br />
+<a href="#" onclick="return wpsg_addZV();"><span class="wpsg-glyphicon glyphicon glyphicon-plus"></span>Neue Zahlvariante anlegen</a>
diff --git a/views/mods/mod_versandarten/list.phtml b/views/mods/mod_versandarten/list.phtml index 98b80ea..173bac9 100644 --- a/views/mods/mod_versandarten/list.phtml +++ b/views/mods/mod_versandarten/list.phtml @@ -8,234 +8,177 @@ <?php if (!is_array($this->view['data']) || sizeof($this->view['data']) <= 0) { ?>
<?php echo __('Bisher keine Versandarten angelegt.', 'wpsg'); ?>
<?php } else { ?>
-<table class="va_table">
- <colgroup>
- <col class="wpsg_label" />
- <col class="wpsg_value" />
- <col class="wpsg_delcol" />
- </colgroup>
+
+ <?php foreach ($this->view['arVZ'] as $k=>$vz) { $arVzNamen[$k] = $vz['name']; } ?>
+
<?php $i = 0; foreach ($this->view['data'] as $va) { $i ++; ?>
- <tr>
- <td class="wpsg_label"><?php echo __('ID', 'wpsg'); ?>:</td>
- <td class="wpsg_value"><?php echo $va['id']; ?></td>
- <td class="wpsg_delcol">
- <a class="wpsg_glyphicon_right glyphicon glyphicon-minus-sign" href="#" title="<?php echo __('Versandart löschen', 'wpsg'); ?>" onclick="return wpsg_removeVA(<?php echo $va['id']; ?>);"></a>
- <?php foreach ($this->view['arVZ'] as $k=>$vz) { $arVzNamen[$k] = $vz['name']; } ?>
- <script type="text/javascript">
-
- jQuery(document).ready(function() {
-
- jQuery('#va_<?php echo $va['id']; ?>_name').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {
- submitdata: {
- field: 'name',
- va_id: '<?php echo $va['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('#va_<?php echo $va['id']; ?>_kosten').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {
- submitdata: {
- field: 'kosten',
- va_id: '<?php echo $va['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('#va_<?php echo $va['id']; ?>_hint').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {
- submitdata: {
- field: 'hint',
- va_id: '<?php echo $va['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('#va_<?php echo $va['id']; ?>_typ').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {
- submitdata: {
- field: 'typ',
- va_id: '<?php echo $va['id']; ?>'
- },
- submit : '<?php echo __('Speichern', 'wpsg'); ?>',
- data : <?php echo wpsg_prepare_for_inlineEdit($this->view['arTypen']); ?>,
- type : 'select',
- placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
- indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
- tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
- });
-
- jQuery('#va_<?php echo $va['id']; ?>_vz').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {
- submitdata: {
- field: 'vz',
- va_id: '<?php echo $va['id']; ?>'
- },
- submit: '<?php echo __('Speichern', 'wpsg'); ?>',
- data : <?php echo wpsg_prepare_for_inlineEdit($arVzNamen) ?>,
- type : 'select',
- placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
- indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
- tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
- callback: function(data)
- {
- location.reload();
- }
-
- } );
-
- jQuery('#va_<?php echo $va['id']; ?>_mwst').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {
- submitdata: {
- field: 'mwst_key',
- va_id: '<?php echo $va['id']; ?>'
- },
- submit: '<?php echo __('Speichern', 'wpsg'); ?>',
- data: <?php echo wpsg_prepare_for_inlineEdit(wpsg_tax_groups()); ?>,
- type: 'select',
- placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
- indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
- tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
- });
-
-
- jQuery('#va_<?php echo $va['id']; ?>_aktiv').bind('change', function() {
-
- var value = 0;
-
- if (jQuery(this).attr("checked") == "checked") value = 1;
-
- jQuery.ajax( {
- url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1',
- data: {
- field: 'aktiv',
- va_id: '<?php echo $va['id']; ?>',
- value: value
- }
- } );
-
- } );
-
+
+ <hr />
+ <div id="wpsg_mod_versandarten_row_<?php echo $va['id']; ?>">
+
+ <?php echo wpsg_drawForm_TextStart(); ?>
+ <?php echo $va['id']; ?>
+ <a data-id="<?php echo $va['id']; ?>" class="wpsg_oc_removeLink" href="#" onclick="return wpsg_removeVA(<?php echo $va['id']; ?>);" title="<?php echo __('Versandart löschen', 'wpsg'); ?>">
+ <span class="wpsg_glyphicon_right glyphicon glyphicon-trash"></span></a>
+ <?php echo wpsg_drawForm_TextEnd(__('ID', 'wpsg')); ?>
+
+ <?php echo wpsg_drawForm_TextStart(); ?>
+ <span id="va_name_<?php echo $va['id']; ?>"><?php echo $va['name']; ?></span>
+ <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_name" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_name"></a>
+ <?php echo wpsg_drawForm_TextEnd(__('Bezeichnung', 'wpsg')); ?>
+ <script type="text/javascript">/* <![CDATA[ */
+ jQuery('#va_name_<?php echo $va['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {
+ submitdata: {
+ field: 'name',
+ va_id: '<?php echo $va['id']; ?>'
+ }
+ });
+ /* ]]> */</script>
+
+ <?php echo wpsg_drawForm_TextStart(); ?>
+ <input type="checkbox" value="1" <?php echo (($va['aktiv'] == '1')?'checked="checked"':''); ?> id="va_<?php echo $va['id']; ?>_aktiv" />
+ <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_activ" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_activ"></a>
+ <?php echo wpsg_drawForm_TextEnd(__('Aktiv', 'wpsg')); ?>
+ <script type="text/javascript">/* <![CDATA[ */
+ jQuery('#va_<?php echo $va['id']; ?>_aktiv').bind('change', function() {
+
+ var value = 0;
+ if (jQuery(this).attr("checked") == "checked") value = 1;
+
+ jQuery.ajax( {
+ url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1',
+ data: {
+ field: 'aktiv',
+ va_id: '<?php echo $va['id']; ?>',
+ value: value
+ }
} );
-
- </script>
-
- </td>
- </tr>
- <tr>
- <td class="wpsg_label"><?php echo __('Bezeichnung', 'wpsg'); ?>:</td>
- <td class="wpsg_value wpsg_editable" id="va_<?php echo $va['id']; ?>_name"><?php echo wpsg_hspc($va['name']); ?></td>
- <td class="wpsg_delcol">
- <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_name" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_name"></a>
- </td>
- </tr>
- <tr>
- <td class="wpsg_label"><label for="va_<?php echo $va['id']; ?>_aktiv"><?php echo __('Aktiv', 'wpsg'); ?>:</label></td>
- <td class="wpsg_value">
- <input type="checkbox" value="1" <?php echo (($va['aktiv'] === '1')?'checked="checked"':''); ?> id="va_<?php echo $va['id']; ?>_aktiv" />
- </td>
- <td class="wpsg_delcol">
- <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_activ" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_activ"></a>
- </td>
- </tr>
- <tr>
- <td class="wpsg_label"><?php echo __('Hinweistext', 'wpsg'); ?>:</td>
- <td class="wpsg_value wpsg_editable" id="va_<?php echo $va['id']; ?>_hint" ><?php echo wpsg_hspc($va['hint']); ?></td>
- <td class="wpsg_delcol">
- <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_hint" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_hint"></a>
- </td>
- </tr>
- <tr>
- <td class="wpsg_label"><?php echo __('Grundlage', 'wpsg'); ?>:</td>
- <td id="va_<?php echo $va['id']; ?>_typ" class="wpsg_value wpsg_editable"><?php echo wpsg_hspc($this->view['arTypen'][$va['typ']]); ?></td>
- <td class="wpsg_delcol">
- <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_grundlage" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_grundlage"></a>
- </td>
- </tr>
- <tr>
- <td class="wpsg_label"><?php echo __('Versandzone', 'wpsg'); ?>:</td>
- <td id="va_<?php echo $va['id']; ?>_vz" class="wpsg_value wpsg_editable">
- <?php if ($va['vz'] > 0) { ?>
- <?php echo wpsg_hspc($this->view['arVZ'][$va['vz']]['name']); ?>
- <?php } else { ?>
- <?php echo __('Alle Versandzonen', 'wpsg'); ?>
- <?php } ?>
- </td>
- <td class="wpsg_delcol">
- <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_versandzone" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_versandzone"></a>
- </td>
- </tr>
- <tr>
- <td class="wpsg_label"><?php echo __('Kostenschlüssel', 'wpsg'); ?>:</td>
- <td class="wpsg_value wpsg_editable" id="va_<?php echo $va['id']; ?>_kosten"><?php echo wpsg_hspc($va['kosten']); ?></td>
- <td class="wpsg_delcol">
- <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_kostenschluessel" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_kostenschluessel"></a>
- </td>
- </tr>
- <?php if (wpsg_isSizedArray($this->view['arVZ'][$va['vz']]['arPLZ'])) { ?>
- <?php $index = 1; foreach ((array)$this->view['arVZ'][$va['vz']]['arPLZ'] as $plz_key => $plz) { ?>
- <tr>
- <td class="wpsg_label"><?php echo __('Kostenschlüssel PLZ', 'wpsg'); ?> [ <?php echo $plz ?> ]:</td>
- <td class="wpsg_value wpsg_editable" id="va_<?php echo $va['id'] ?>_plz_<?php echo $index ?>"><?php echo wpsg_hspc($va['kosten_plz'][$plz_key]); ?></td>
- <td class="wpsg_delcol">
- <script type="text/javascript">
-
- jQuery(document).ready(function() {
-
- jQuery('#va_<?php echo $va['id']; ?>_plz_<?php echo $index ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {
- submitdata: {
- field: 'kosten_plz',
- va_id: '<?php echo $va['id']; ?>',
- key: '<?php echo $index; ?>'
- },
- submit : '<?php echo __('Speichern', 'wpsg'); ?>',
- placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
- indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
- tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
- callback: function(data)
- {
- //location.reload();
- }
- } );
+ } );
+ /* ]]> */</script>
+
+ <?php echo wpsg_drawForm_TextStart(); ?>
+ <span id="va_hint_<?php echo $va['id']; ?>"><?php echo wpsg_hspc($va['hint']); ?></span>
+ <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_hint" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_hint"></a>
+ <?php echo wpsg_drawForm_TextEnd(__('Hinweistext', 'wpsg')); ?>
+ <script type="text/javascript">/* <![CDATA[ */
+ jQuery('#va_hint_<?php echo $va['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {
+ submitdata: {
+ field: 'hint',
+ va_id: '<?php echo $va['id']; ?>'
+ }
+ });
+ /* ]]> */</script>
+
+ <?php echo wpsg_drawForm_TextStart(); ?>
+ <span id="va_typ_<?php echo $va['id']; ?>"><?php
+ echo wpsg_hspc($this->view['arTypen'][$va['typ']]);
+ ?></span>
+ <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_grundlage" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_grundlage"></a>
+ <?php echo wpsg_drawForm_TextEnd(__('Grundlage', 'wpsg')); ?>
+ <script type="text/javascript">/* <![CDATA[ */
+ jQuery('#va_typ_<?php echo $va['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {
+ type: 'select',
+ data: <?php echo wpsg_prepare_for_inlineEdit($this->view['arTypen']); ?>,
+ submitdata: {
+ field: 'typ',
+ va_id: '<?php echo $va['id']; ?>'
+ }
+ });
+ /* ]]> */</script>
+
+ <?php echo wpsg_drawForm_TextStart(); ?>
+ <span id="va_vz_<?php echo $va['id']; ?>">
+ <?php if ($va['vz'] > 0) { ?>
+ <?php echo wpsg_hspc($this->view['arVZ'][$va['vz']]['name']); ?>
+ <?php } else { ?>
+ <?php echo __('Alle Versandzonen', 'wpsg'); ?>
+ <?php } ?>
+ </span>
+ <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_versandzone" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_versandzone"></a>
+ <?php echo wpsg_drawForm_TextEnd(__('Versandzone', 'wpsg')); ?>
+ <script type="text/javascript">/* <![CDATA[ */
+ jQuery('#va_vz_<?php echo $va['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {
+ type: 'select',
+ data : <?php echo wpsg_prepare_for_inlineEdit($arVzNamen) ?>,
+ submitdata: {
+ field: 'vz',
+ va_id: '<?php echo $va['id']; ?>'
+ }
+ });
+ /* ]]> */</script>
+
+ <?php echo wpsg_drawForm_TextStart(); ?>
+ <span id="va_kosten_<?php echo $va['id']; ?>"><?php echo wpsg_hspc($va['kosten']); ?></span>
+ <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_hint" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_kostenschluessel"></a>
+ <?php echo wpsg_drawForm_TextEnd(__('Kostenschlüssel', 'wpsg')); ?>
+ <script type="text/javascript">/* <![CDATA[ */
+ jQuery('#va_kosten_<?php echo $va['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {
+ submitdata: {
+ field: 'kosten',
+ va_id: '<?php echo $va['id']; ?>'
+ }
+ });
+ /* ]]> */</script>
+
+ <?php if (wpsg_isSizedArray($this->view['arVZ'][$va['vz']]['arPLZ'])) { ?>
+ <?php $index = 1; foreach ((array)$this->view['arVZ'][$va['vz']]['arPLZ'] as $plz_key => $plz) { ?>
+ <?php echo wpsg_drawForm_TextStart(); ?>
+ <span id="va_plz_<?php echo $va['id'].'_'.$index; ?>"><?php echo wpsg_hspc(wpsg_getStr($va['kosten_plz'][$plz_key])); ?></span>
+ <?php echo wpsg_drawForm_TextEnd(__('Kostenschlüssel PLZ', 'wpsg').' ['.$plz.']:'); ?> <?php /*echo $plz*/ ?>
+ <script type="text/javascript">/* <![CDATA[ */
+ jQuery('#va_plz_<?php echo $va['id'].'_'.$index; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {
+ submitdata: {
+ field: 'kosten_plz',
+ va_id: '<?php echo $va['id']; ?>',
+ key: '<?php echo $index; ?>'
+ }
+ });
+ /* ]]> */</script>
+
+ <?php $index++; } ?>
+ <?php } ?>
+
+ <?php echo wpsg_drawForm_TextStart(); ?>
+ <span id="va_mwst_key_<?php echo $va['id']; ?>"><?php
+ $tax_groups = wpsg_tax_groups();
+ echo wpsg_hspc($tax_groups[$va['mwst_key']]);
+ ?></span>
+ <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst"></a>
+ <?php echo wpsg_drawForm_TextEnd(__('Steuersatz', 'wpsg')); ?>
+ <script type="text/javascript">/* <![CDATA[ */
+ jQuery('#va_mwst_key_<?php echo $va['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {
+ type: 'select',
+ data: <?php echo wpsg_prepare_for_inlineEdit(wpsg_tax_groups()); ?>,
+ submitdata: {
+ field: 'mwst_key',
+ va_id: '<?php echo $va['id']; ?>'
+ }
+ });
+ /* ]]> */</script>
+
+ <?php echo wpsg_drawForm_TextStart(); ?>
+ <input type="checkbox" value="1" <?php echo (($va['mwst_laender'] == '1')?'checked="checked"':''); ?> id="va_mwst_laender_<?php echo $va['id']; ?>" />
+ <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwstland" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwstland"></a>
+ <?php echo wpsg_drawForm_TextEnd(__('Keine MwSt. wenn Land steuerfrei', 'wpsg')); ?>
+ <script type="text/javascript">/* <![CDATA[ */
+ jQuery('#va_mwst_laender_<?php echo $va['id']; ?>').bind('change', function() {
+
+ var value = 0;
+ if (jQuery(this).attr("checked") == "checked") value = 1;
+
+ jQuery.ajax( {
+ url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1',
+ data: {
+ field: 'mwst_laender',
+ va_id: '<?php echo $va['id']; ?>',
+ value: value
+ }
} );
-
- </script>
- </td>
- </tr>
- <?php $index++; } ?>
- <?php } ?>
- <tr>
- <td class="wpsg_label"><?php echo __('Steuersatz', 'wpsg'); ?>:</td>
- <td id="va_<?php echo $va['id']; ?>_mwst" class="wpsg_value wpsg_editable"><?php
-
- $tax_groups = wpsg_tax_groups();
- echo wpsg_hspc($tax_groups[$va['mwst_key']]);
-
- ?></td>
- <td class="wpsg_delcol">
- <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst"></a>
- </td>
- </tr>
- <tr>
- <td class="wpsg_label"><?php echo __('Keine MwSt. wenn Land steuerfrei', 'wpsg'); ?>:</td>
- <td class="wpsg_value">
- <input onchange="wpsg_saveVAMwSt(this, <?php echo $va['id']; ?>);" <?php echo (($va['mwst_laender'] == '1')?'checked="checked"':''); ?> type="checkbox" value="1" />
- </td>
- <td class="wpsg_delcol">
- <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwstland" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwstland"></a>
- </td>
- </tr>
+ } );
+ /* ]]> */</script>
+ </div>
+ <?php if ($i == sizeof($this->view['data'])) { ?><hr /><?php } ?>
-
- <?php $this->callMods('wpsg_mod_versandarten_listrow', array(&$va)); ?>
- <?php if ($i < sizeof($this->view['data'])) { ?>
- <tr class="wpsg_spacer"><td colspan="3"><hr /></td></tr>
- <?php } ?>
- <?php } ?>
-</table>
+<?php } ?>
<?php } ?>
\ No newline at end of file diff --git a/views/mods/mod_versandarten/settings_edit.phtml b/views/mods/mod_versandarten/settings_edit.phtml index 9553eee..adae7d5 100644 --- a/views/mods/mod_versandarten/settings_edit.phtml +++ b/views/mods/mod_versandarten/settings_edit.phtml @@ -89,12 +89,13 @@ <div class="title">
<div class="fulltab">
<?php echo __('Versandarten', 'wpsg'); ?>
- <a title="<?php echo __('Neue Versandart anlegen', 'wpsg'); ?>" href="" class="wpsg_glyphicon_right glyphicon glyphicon-plus-sign" onclick="return wpsg_addVA();"></a>
</div>
</div>
</div>
<div class="content" id="wpsg_va_list">
<?php echo $this->mod->va_list(); ?>
</div>
+
+ <a href="#" onclick="return wpsg_addVA();"><span class="wpsg-glyphicon glyphicon glyphicon-plus"></span>Neue Versandart anlegen</a>
</div>
diff --git a/views/mods/mod_voucherproduct/settings_edit.phtml b/views/mods/mod_voucherproduct/settings_edit.phtml index e4153f6..79b8528 100644 --- a/views/mods/mod_voucherproduct/settings_edit.phtml +++ b/views/mods/mod_voucherproduct/settings_edit.phtml @@ -18,39 +18,32 @@ <div class="tab-content">
<div role="tabpanel" class="tab-pane active" id="tab1" >
- <div class="wpsg_form_field">
- <div class="wpsg_form_left">
- <label><?php echo __('Briefpapier (PDF/JPG)', 'wpsg'); ?>:</label><br />
- <?php if (isset($this->view['bp']) && $this->view['bp'] !== false) { ?>
- <label>
- <input type="checkbox" name="wpsg_mod_voucherproduct_bp_del" value="1" /> <?php echo __('Löschen', 'wpsg'); ?>
- </label>
- <?php } ?>
- </div>
- <div class="wpsg_form_right">
- <?php if (!isset($this->view['bp']) || $this->view['bp'] === false) { ?>
- <p><?php echo __('Es wurde bisher kein Briefpapier hochgeladen', 'wpsg'); ?></p>
- <?php } else { ?>
- <a href="<?php echo $this->view['bp']; ?>" target="_blank"><?php echo __('Derzeitiges Briefpapier', 'wpsg'); ?></a>
- <?php } ?>
- <a style="float:right; position:relative;" class="glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_paper" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_paper"></a>
- <input type="file" name="wpsg_mod_voucherproduct_bp">
- </div>
- <div class="wpsg_clear"></div>
- </div>
- <?php echo wpsg_drawForm_Input('wpsg_voucherproduct_width', __('Breite des PDFs in mm', 'wpsg'), $this->get_option('wpsg_voucherproduct_width'), array ('help' => 'wpsg_voucherproduct_width')); ?>
- <?php echo wpsg_drawForm_Input('wpsg_voucherproduct_height', __('Höhe des PDFs in mm', 'wpsg'), $this->get_option('wpsg_voucherproduct_height'), array ('help' => 'wpsg_voucherproduct_height')); ?>
- <div class="wpsg_form_field">
- <div class="wpsg_form_left">
- <label><?php echo __('Gutscheinmail an Kunden', 'wpsg'); ?>:</label>
- </div>
- <div class="wpsg_form_right">
- <p><?php echo wpsg_translate(__('Kann <a href="#1#">hier</a> konfiguriert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf#gutscheinproductmail'); ?>
- <a style="float:right; position:relative;" class="glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_mail" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_mail"></a></p>
- </div>
- <div class="wpsg_clear"></div>
- </div>
-
+
+ <?php echo wpsg_drawForm_TextStart(); ?>
+ <?php if ($this->view['bp'] === false) { ?>
+ <p><?php echo __('Es wurde bisher kein Briefpapier hochgeladen', 'wpsg'); ?></p>
+ <?php } else { ?>
+ <a href="<?php echo $this->view['bp']; ?>" target="_blank"><?php echo __('Derzeitiges Briefpapier', 'wpsg'); ?></a>
+ <?php } ?>
+ <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_paper" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_paper"></a>
+ <input type="file" name="wpsg_mod_voucherproduct_bp">
+ <?php $strSuffix = ''; if ($this->view['bp'] !== false) { $strSuffix = '
+ <label>
+ <input type="checkbox" name="wpsg_mod_voucherproduct_bp_del" value="1" /> '.__('Löschen', 'wpsg').'
+ </label>';
+ echo __($strSuffix);
+ } ?>
+ <?php echo wpsg_drawForm_TextEnd(__('Briefpapier (PDF/JPG)', 'wpsg'), array('noP' => true, 'helps' => 'wpsg_mod_voucherproduct_bp')); ?>
+
+ <?php echo wpsg_drawForm_Input('wpsg_voucherproduct_width', __('Breite des PDFs in mm', 'wpsg'), $this->get_option('wpsg_voucherproduct_width'), array ('rAlign' => true, 'help' => 'wpsg_voucherproduct_width')); ?>
+ <?php echo wpsg_drawForm_Input('wpsg_voucherproduct_height', __('Höhe des PDFs in mm', 'wpsg'), $this->get_option('wpsg_voucherproduct_height'), array ('rAlign' => true, 'help' => 'wpsg_voucherproduct_height')); ?>
+
+ <?php echo wpsg_drawForm_TextStart(); ?>
+ <?php echo wpsg_translate(__('Kann <a href="#1#">hier</a> konfiguriert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf#gutscheinproductmail'); ?>
+ <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" style="float:right;" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_mail" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_mail"></a>
+
+ <?php echo wpsg_drawForm_TextEnd(__('Gutscheinmail an Kunden', 'wpsg'), array('noP' => true, 'helps' => 'wpsg_mod_voucherproduct_bp')); ?>
+
</div>
<div role="tabpanel" class="tab-pane" id="tab2" >
diff --git a/views/mods/mod_wirecard/settings_edit.phtml b/views/mods/mod_wirecard/settings_edit.phtml index bc8cf77..fa32f33 100644 --- a/views/mods/mod_wirecard/settings_edit.phtml +++ b/views/mods/mod_wirecard/settings_edit.phtml @@ -15,21 +15,8 @@ <?php echo wpsg_drawForm_Input('wpsg_mod_wirecard_secret', __('Geheimer Schlüssel', 'wpsg'), $this->get_option('wpsg_mod_wirecard_secret'), array('help' => 'wpsg_mod_wirecard_secret')); ?>
<br />
<?php echo wpsg_drawForm_Input('wpsg_mod_wirecard_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_wirecard_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_shippay_gebuehr')); ?>
-<div class="wpsg_form_field">
- <div class="wpsg_form_left">
- <label for="wpsg_mod_wirecard_mwst"><?php echo __('Steuersatz', 'wpsg'); ?>:</label>
- </div>
- <div class="wpsg_form_right">
- <select id="wpsg_mod_wirecard_mwst" name="wpsg_mod_wirecard_mwst">
- <option value="0"><?php echo __('anteilig', 'wpsg'); ?></option>
- <?php foreach ($this->view['mwst'] as $mwst) { ?>
- <option value="<?php echo $mwst['id']; ?>" <?php echo (($mwst['id'] == $this->get_option('wpsg_mod_wirecard_mwst'))?'selected="selected"':''); ?>><?php echo wpsg_ff($mwst['value']).'%'; ?></option>
- <?php } ?>
- </select>
- <a href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst" class="glyphicon glyphicon-question-sign"></a>
- </div>
- <div class="wpsg_clear"></div>
-</div>
+<?php echo wpsg_drawForm_Select('wpsg_mod_wirecard_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_wirecard_mwst'), array('help' => 'wpsg_mod_wirecard_mwst')); ?>
+
<?php echo wpsg_drawForm_Checkbox('wpsg_mod_wirecard_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_wirecard_mwstland'), array('help' => 'wpsg_shippay_mwstland')); ?>
<?php echo wpsg_drawForm_Select('wpsg_mod_wirecard_currency', __('Währung', 'wpsg'), array(
'EUR' => __('Euro', 'wpsg'),
|