diff options
| author | hartmut <noreply@maennchen1.de> | 2016-12-01 14:30:44 +0000 |
|---|---|---|
| committer | hartmut <noreply@maennchen1.de> | 2016-12-01 14:30:44 +0000 |
| commit | 9b4baec1311ee5a28e00e4fdd4c6c166d005d5ba (patch) | |
| tree | 697bb07a851eaf7a566788a5c37f47c70173e17d | |
| parent | 1c1be43f6a7ecc4e6338c0fa02d1404ba9b0cb25 (diff) | |
Bestellungen OK, Versand- und Zahlungsarten teilweise,
wspg_editable geändert in wpsg_editable
git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5934 0d5edaf7-2b12-4e95-93f4-047927463d4b
33 files changed, 745 insertions, 215 deletions
diff --git a/views/admin/form/text.phtml b/views/admin/form/text.phtml index 1cfd831..cd52dde 100644 --- a/views/admin/form/text.phtml +++ b/views/admin/form/text.phtml @@ -22,7 +22,7 @@ jQuery(document).ready(function() {
- jQuery('#<?php echo $this->view['field_id']; ?>').wspg_editable('<?php echo $this->view['field_config']['inlineEdit_url']; ?>', {
+ jQuery('#<?php echo $this->view['field_id']; ?>').wpsg_editable('<?php echo $this->view['field_config']['inlineEdit_url']; ?>', {
'placement': 'bottom'
<?php if (wpsg_isSizedString($this->view['field_config']['inlineEdit_type'])) { ?>
,'type': '<?php echo $this->view['field_config']['inlineEdit_type']; ?>'
diff --git a/views/admin/kundendaten_tab2.phtml b/views/admin/kundendaten_tab2.phtml index a01c7df..57c8cc7 100644 --- a/views/admin/kundendaten_tab2.phtml +++ b/views/admin/kundendaten_tab2.phtml @@ -47,7 +47,7 @@ <script type="text/javascript">/* <![CDATA[ */
- jQuery('#kundenvariable_name_<?php echo $c_id; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=kundendaten&do=inlinedit&noheader=1', {
+ jQuery('#kundenvariable_name_<?php echo $c_id; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=kundendaten&do=inlinedit&noheader=1', {
submitdata: {
field: 'name',
field_id: '<?php echo $c_id; ?>'
diff --git a/views/admin/versandzonen_list.phtml b/views/admin/versandzonen_list.phtml index 16bb1e0..9b9d096 100644 --- a/views/admin/versandzonen_list.phtml +++ b/views/admin/versandzonen_list.phtml @@ -34,7 +34,7 @@ <script type="text/javascript">/* <![CDATA[ */
- jQuery('#vz_<?php echo $vz['id']; ?>_name').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=vz&do=inlinedit&noheader=1', {
+ jQuery('#vz_<?php echo $vz['id']; ?>_name').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=vz&do=inlinedit&noheader=1', {
submitdata: {
field: 'name',
vz_id: '<?php echo $vz['id']; ?>'
@@ -45,7 +45,7 @@ tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
});
- jQuery('#vz_<?php echo $vz['id']; ?>_value').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=vz&do=inlinedit&noheader=1', {
+ jQuery('#vz_<?php echo $vz['id']; ?>_value').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=vz&do=inlinedit&noheader=1', {
submitdata: {
field: 'value',
vz_id: '<?php echo $vz['id']; ?>'
diff --git a/views/css/admin.css b/views/css/admin.css index f6719a7..3135c1e 100644 --- a/views/css/admin.css +++ b/views/css/admin.css @@ -28,6 +28,7 @@ #wpsg-bs .form-horizontal .editable { padding-top:0px; display:inline; }
#wpsg-bs .editableform textarea { width:500px; height:250px; }
#wpsg-bs .wpsg-glyphicon { margin-right:10px; }
+#wpsg-bs .wpsg_glyphicon_right { float:right; }
#wpsg-bs .wpsg-glyphlink-td > span { margin-left:5px; margin-top:5px; }
#wpsg-bs .wpsg-glyphlink-td:hover { text-decoration:none; }
#wpsg-bs .wpsg_error { color:red; }
diff --git a/views/js/editable.js b/views/js/editable.js index e4eb68f..82edaa3 100644 --- a/views/js/editable.js +++ b/views/js/editable.js @@ -2,7 +2,7 @@ /**
* Wrapper, um die Editierfunktion austauschbarer zu machen
*/
- jQuery.fn.wspg_editable = function(url, options) {
+ jQuery.fn.wpsg_editable = function(url, options) {
return this.each(function() {
diff --git a/views/mods/mod_deliverynote/foottext_list.phtml b/views/mods/mod_deliverynote/foottext_list.phtml index 36ad7fb..7282441 100644 --- a/views/mods/mod_deliverynote/foottext_list.phtml +++ b/views/mods/mod_deliverynote/foottext_list.phtml @@ -33,7 +33,7 @@ jQuery(document).ready(function() {
- jQuery('#wpsg_foottext_0_<?php echo $key; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_deliverynote&do=inlineEdit&noheader=1', {
+ jQuery('#wpsg_foottext_0_<?php echo $key; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_deliverynote&do=inlineEdit&noheader=1', {
submitdata: {
field: '0',
field_id: '<?php echo $key; ?>'
@@ -44,7 +44,7 @@ tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
});
- jQuery('#wpsg_foottext_1_<?php echo $key; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_deliverynote&do=inlineEdit&noheader=1', {
+ jQuery('#wpsg_foottext_1_<?php echo $key; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_deliverynote&do=inlineEdit&noheader=1', {
submitdata: {
field: '1',
field_id: '<?php echo $key; ?>'
diff --git a/views/mods/mod_export/fields.phtml b/views/mods/mod_export/fields.phtml index 08f19f7..4282954 100644 --- a/views/mods/mod_export/fields.phtml +++ b/views/mods/mod_export/fields.phtml @@ -90,14 +90,14 @@ jQuery(document).ready(function() {
- jQuery('#field_name_<?php echo $f_id; ?>').wspg_editable('<?php echo $inlineEdit_url; ?>', { } );
+ jQuery('#field_name_<?php echo $f_id; ?>').wpsg_editable('<?php echo $inlineEdit_url; ?>', { } );
- jQuery('#field_typ_<?php echo $f_id; ?>').wspg_editable('<?php echo $inlineEdit_url; ?>', {
+ jQuery('#field_typ_<?php echo $f_id; ?>').wpsg_editable('<?php echo $inlineEdit_url; ?>', {
'type': 'multiarray',
'data': '<?php echo json_encode($this->view['fields']); ?>'
} );
- jQuery('#field_format_<?php echo $f_id; ?>').wspg_editable('<?php echo $inlineEdit_url; ?>', {
+ jQuery('#field_format_<?php echo $f_id; ?>').wpsg_editable('<?php echo $inlineEdit_url; ?>', {
'type': 'select',
'data': <?php echo wpsg_prepare_for_inlineEdit($this->view['arFieldFormats']); ?>,
'callback': function(response, newValue) {
@@ -108,7 +108,7 @@ }
} );
- jQuery('#field_userformat_<?php echo $f_id; ?>').wspg_editable('<?php echo $inlineEdit_url; ?>', { } );
+ jQuery('#field_userformat_<?php echo $f_id; ?>').wpsg_editable('<?php echo $inlineEdit_url; ?>', { } );
} );
diff --git a/views/mods/mod_export/profil.phtml b/views/mods/mod_export/profil.phtml index 9bcf04d..ec34844 100644 --- a/views/mods/mod_export/profil.phtml +++ b/views/mods/mod_export/profil.phtml @@ -110,7 +110,7 @@ jQuery(document).ready(function() {
- jQuery('#orderfilter_cdate_m').wspg_editable('<?php echo $inlineEdit_url; ?>', {
+ jQuery('#orderfilter_cdate_m').wpsg_editable('<?php echo $inlineEdit_url; ?>', {
'test': '1', 'placement': 'bottom', 'type': 'select', 'data': <?php echo wpsg_prepare_for_inlineEdit($arMonth); ?>
} );
@@ -124,7 +124,7 @@ jQuery(document).ready(function() {
- jQuery('#orderfilter_cdate_y').wspg_editable('<?php echo $inlineEdit_url; ?>', {
+ jQuery('#orderfilter_cdate_y').wpsg_editable('<?php echo $inlineEdit_url; ?>', {
'placement': 'bottom', 'type': 'select', 'data': <?php echo wpsg_prepare_for_inlineEdit($arYearCdate); ?>
} );
@@ -144,7 +144,7 @@ jQuery(document).ready(function() {
- jQuery('#orderfilter_invoicedate_m').wspg_editable('<?php echo $inlineEdit_url; ?>', {
+ jQuery('#orderfilter_invoicedate_m').wpsg_editable('<?php echo $inlineEdit_url; ?>', {
'placement': 'bottom', 'type': 'select', 'data': <?php echo wpsg_prepare_for_inlineEdit($arMonth); ?>
} );
@@ -158,7 +158,7 @@ jQuery(document).ready(function() {
- jQuery('#orderfilter_invoicedate_y').wspg_editable('<?php echo $inlineEdit_url; ?>', {
+ jQuery('#orderfilter_invoicedate_y').wpsg_editable('<?php echo $inlineEdit_url; ?>', {
'placement': 'bottom', 'type': 'select', 'data': <?php echo wpsg_prepare_for_inlineEdit($arYearInvoice); ?>
} );
diff --git a/views/mods/mod_kundenverwaltung/checkout_customer_inner.phtml b/views/mods/mod_kundenverwaltung/checkout_customer_inner.phtml index 2c743ae..e66d3bc 100644 --- a/views/mods/mod_kundenverwaltung/checkout_customer_inner.phtml +++ b/views/mods/mod_kundenverwaltung/checkout_customer_inner.phtml @@ -16,16 +16,16 @@ <div id="checkout_login_fields" style="display:<?php echo ((in_array("mod_kundenverwaltung_pwd1", (array)$this->view['error']))?'block':'none'); ?>;">
<div class="wpsg_checkoutblock">
<label for="wpsg_mod_kundenverwaltung_pwd1"><?php echo __("Passwort", "wpsg"); ?>
- <?php if ($this->get_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwand') == '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+ <?php if ($this->get_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwang') == '1') { ?><span class="wpsg_required">*</span><?php } ?>:
</label>
- <input class="wpsg_checkout <?php echo (($this->get_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwand') == '1')?'validate[required]':''); ?> <?php echo ((in_array("mod_kundenverwaltung_pwd1", (array)$this->view['error']))?'wpsg_error':''); ?>" type="password" id="mod_kundenverwaltung_pwd1" name="wpsg[mod_kundenverwaltung][pwd1]" value="" />
+ <input class="wpsg_checkout <?php echo (($this->get_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwang') == '1')?'validate[required]':''); ?> <?php echo ((in_array("mod_kundenverwaltung_pwd1", (array)$this->view['error']))?'wpsg_error':''); ?>" type="password" id="mod_kundenverwaltung_pwd1" name="wpsg[mod_kundenverwaltung][pwd1]" value="" />
</div>
<div class="wpsg_checkoutblock">
<label for="wpsg_mod_kundenverwaltung_pwd2"><?php echo __("Passwort wiederholen", "wpsg"); ?>
- <?php if ($this->get_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwand') == '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+ <?php if ($this->get_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwang') == '1') { ?><span class="wpsg_required">*</span><?php } ?>:
</label>
- <input class="wpsg_checkout <?php echo (($this->get_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwand') == '1')?'validate[required]':''); ?> <?php echo ((in_array("mod_kundenverwaltung_pwd2", (array)$this->view['error']))?'wpsg_error':''); ?>" type="password" id="wpsg_mod_kundenverwaltung_pwd2" name="wpsg[mod_kundenverwaltung][pwd2]" value="" />
+ <input class="wpsg_checkout <?php echo (($this->get_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwang') == '1')?'validate[required]':''); ?> <?php echo ((in_array("mod_kundenverwaltung_pwd2", (array)$this->view['error']))?'wpsg_error':''); ?>" type="password" id="wpsg_mod_kundenverwaltung_pwd2" name="wpsg[mod_kundenverwaltung][pwd2]" value="" />
</div>
<div class="wpsg_clear"></div>
diff --git a/views/mods/mod_kundenverwaltung/index.phtml b/views/mods/mod_kundenverwaltung/index.phtml index 4090dc8..332515f 100644 --- a/views/mods/mod_kundenverwaltung/index.phtml +++ b/views/mods/mod_kundenverwaltung/index.phtml @@ -100,7 +100,7 @@ |
<span class="del"><a onclick="if (!confirm('<?php echo __("Sind Sie sicher, dass Sie den Kunden löschen wollen?", "wpsg"); ?>')) return false;" title="<?php echo __("Diesen Kunden löschen", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=del&edit_id=<?php echo $c->id; ?>&noheader=1"><?php echo __("Löschen", "wpsg"); ?></a></span>
|
- <span class="order"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&filter%5Bk_id%5D=<?php echo $k['id']; ?>"><?php echo __('Bestellungen einsehen', 'wpsg'); ?></a></span>
+ <span class="order"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&filter%5Bk_id%5D=<?php echo $c->id; ?>"><?php echo __('Bestellungen einsehen', 'wpsg'); ?></a></span>
</div>
</td>
<td class="col_adress">
diff --git a/views/mods/mod_kundenverwaltung/profil.phtml b/views/mods/mod_kundenverwaltung/profil.phtml index 7576e4d..d2e135c 100644 --- a/views/mods/mod_kundenverwaltung/profil.phtml +++ b/views/mods/mod_kundenverwaltung/profil.phtml @@ -263,14 +263,14 @@ <div class="wpsg_checkoutblock">
<label for="wpsg_mod_kundenverwaltung_pwd1"><?php echo __("Passwort", "wpsg"); ?>
- <?php if ($this->get_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwand') == '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+ <?php if ($this->get_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwang') == '1') { ?><span class="wpsg_required">*</span><?php } ?>:
</label>
<input class="wpsg_checkout <?php echo ((in_array("mod_kundenverwaltung_pwd1", (array)$this->view['error']))?'wpsg_error':''); ?>" type="password" id="wpsg_mod_kundenverwaltung_pw1" name="wpsg[mod_kundenverwaltung][register_pwd1]" value="" /><span id="wpsg_mod_kundenverwaltung_password_result"></span>
</div>
<div class="wpsg_checkoutblock">
<label for="wpsg_mod_kundenverwaltung_pwd2"><?php echo __("Passwort wiederholen", "wpsg"); ?>
- <?php if ($this->get_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwand') == '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+ <?php if ($this->get_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwang') == '1') { ?><span class="wpsg_required">*</span><?php } ?>:
</label>
<input class="wpsg_checkout <?php echo ((in_array("mod_kundenverwaltung_pwd2", (array)$this->view['error']))?'wpsg_error':''); ?>" type="password" id="wpsg_mod_kundenverwaltung_pwd2" name="wpsg[mod_kundenverwaltung][register_pwd2]" value="" />
</div>
diff --git a/views/mods/mod_kundenverwaltung/settings_edit.phtml b/views/mods/mod_kundenverwaltung/settings_edit.phtml index 89aa549..0a99404 100644 --- a/views/mods/mod_kundenverwaltung/settings_edit.phtml +++ b/views/mods/mod_kundenverwaltung/settings_edit.phtml @@ -11,7 +11,7 @@ <?php echo wpsg_drawForm_Checkbox('wpsg_mod_kundenverwaltung_showCheckoutLogin', __('Login in Checkout integrieren', 'wpsg'), $this->get_option('wpsg_mod_kundenverwaltung_showCheckoutLogin'), array('help' => 'wpsg_mod_kundenverwaltung_showCheckoutLogin')); ?>
<?php echo wpsg_drawForm_Checkbox('wpsg_mod_kundenverwaltung_showCheckoutRegister', __('Registrierung im Checkout', 'wpsg'), $this->get_option('wpsg_mod_kundenverwaltung_showCheckoutRegister'), array('help' => 'wpsg_mod_kundenverwaltung_showCheckoutRegister')); ?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwand', __('Registrierungzwang im Checkout', 'wpsg'), $this->get_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwand'), array('help' => 'wpsg_mod_kundenverwaltung_showCheckoutRegisterzwand')); ?>
+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwang', __('Registrierungzwang im Checkout', 'wpsg'), $this->get_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwang'), array('help' => 'wpsg_mod_kundenverwaltung_showCheckoutRegisterzwang')); ?>
<?php echo wpsg_drawForm_Checkbox('wpsg_mod_kundenverwaltung_loginZwang', __('E-Mail darf nur einmal registriert werden', 'wpsg'), $this->get_option('wpsg_mod_kundenverwaltung_loginZwang'), array('help' => 'wpsg_mod_kundenverwaltung_loginZwang')); ?>
<?php echo wpsg_drawForm_Checkbox('wpsg_mod_kundenverwaltung_preisAnzeige', __('Bestellung nur für eingeloggte Benutzer', 'wpsg'), $this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige'), array('help' => 'wpsg_mod_kundenverwaltung_preisAnzeige')); ?>
diff --git a/views/mods/mod_ordercondition/list.phtml b/views/mods/mod_ordercondition/list.phtml index e254e93..d2abc92 100644 --- a/views/mods/mod_ordercondition/list.phtml +++ b/views/mods/mod_ordercondition/list.phtml @@ -13,7 +13,7 @@ var oc_id = jQuery(this).attr("id").replace(/wpsg_mod_ordercondition_name_/, '');
- jQuery(this).wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordercondition&do=inlinedit&noheader=1', {
+ jQuery(this).wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordercondition&do=inlinedit&noheader=1', {
submitdata: {
field: 'name',
oc_id: oc_id
@@ -85,7 +85,7 @@ <?php echo wpsg_drawForm_TextEnd(__('Bezeichnung', 'wpsg')); ?>
<script type="text/javascript">/* <![CDATA[ */
- jQuery('#oc_name_<?php echo $oc['id']; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordercondition&do=inlinedit&noheader=1', {
+ jQuery('#oc_name_<?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', {
submitdata: {
field: 'name',
oc_id: '<?php echo $oc['id']; ?>'
@@ -105,7 +105,7 @@ <?php echo wpsg_drawForm_TextEnd(__('Wirkungsbereich', 'wpsg')); ?>
<script type="text/javascript">/* <![CDATA[ */
- jQuery('#oc_typ_<?php echo $oc['id']; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordercondition&do=inlinedit&noheader=1', {
+ 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'))); ?>',
submitdata: {
@@ -121,7 +121,7 @@ <?php echo wpsg_drawForm_TextEnd(__('Bedingungstext', 'wpsg')); ?>
<script type="text/javascript">/* <![CDATA[ */
- jQuery('#oc_text_<?php echo $oc['id']; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordercondition&do=inlinedit&noheader=1', {
+ jQuery('#oc_text_<?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', {
submitdata: {
field: 'text',
oc_id: '<?php echo $oc['id']; ?>'
@@ -136,7 +136,7 @@ <?php echo wpsg_drawForm_TextEnd(__('Fehlertext', 'wpsg')); ?>
<script type="text/javascript">/* <![CDATA[ */
- jQuery('#oc_errortext_<?php echo $oc['id']; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordercondition&do=inlinedit&noheader=1', {
+ jQuery('#oc_errortext_<?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', {
submitdata: {
field: 'errortext',
oc_id: '<?php echo $oc['id']; ?>'
diff --git a/views/mods/mod_ordervars/order_view_sidebar.phtml b/views/mods/mod_ordervars/order_view_sidebar.phtml index 3b06b22..4f11976 100644 --- a/views/mods/mod_ordervars/order_view_sidebar.phtml +++ b/views/mods/mod_ordervars/order_view_sidebar.phtml @@ -18,7 +18,7 @@ <script type="text/javascript">/* <![CDATA[ */
<?php if ($ov['typ'] == '1') { /* Auswahl */ ?>
- jQuery('#wpsg_ordervar_<?php echo $ov_id; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_ordervars&do=inlinedit&noheader=1', {
+ jQuery('#wpsg_ordervar_<?php echo $ov_id; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_ordervars&do=inlinedit&noheader=1', {
submitdata: {
order_id: <?php echo $_REQUEST['edit_id']; ?>,
ov_id: '<?php echo $ov['id']; ?>'
@@ -31,7 +31,7 @@ tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
});
<?php } else if ($ov['typ'] == '2') { /* Text */ ?>
- jQuery('#wpsg_ordervar_<?php echo $ov_id; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_ordervars&do=inlinedit&noheader=1', {
+ jQuery('#wpsg_ordervar_<?php echo $ov_id; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_ordervars&do=inlinedit&noheader=1', {
submitdata: {
order_id: <?php echo $_REQUEST['edit_id']; ?>,
ov_id: '<?php echo $ov['id']; ?>'
@@ -42,7 +42,7 @@ tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
});
<?php } else if ($ov['typ'] == '3') { /* Checkbox */ ?>
- jQuery('#wpsg_ordervar_<?php echo $ov_id; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_ordervars&do=inlinedit&noheader=1', {
+ jQuery('#wpsg_ordervar_<?php echo $ov_id; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_ordervars&do=inlinedit&noheader=1', {
submitdata: {
order_id: <?php echo $_REQUEST['edit_id']; ?>,
ov_id: '<?php echo $ov['id']; ?>'
diff --git a/views/mods/mod_ordervars/ov_list.phtml b/views/mods/mod_ordervars/ov_list.phtml index 6224066..b8cb5c3 100644 --- a/views/mods/mod_ordervars/ov_list.phtml +++ b/views/mods/mod_ordervars/ov_list.phtml @@ -31,7 +31,7 @@ <script type="text/javascript">
- jQuery('#wpsg_ov_name_<?php echo $ov['id']; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordervars&do=inlinedit&noheader=1', {
+ jQuery('#wpsg_ov_name_<?php echo $ov['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordervars&do=inlinedit&noheader=1', {
submitdata: {
field: 'name',
ov_id: '<?php echo $ov['id']; ?>'
@@ -55,7 +55,7 @@ } );
- jQuery('#wpsg_ov_typ_<?php echo $ov['id']; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordervars&do=inlinedit&noheader=1', {
+ jQuery('#wpsg_ov_typ_<?php echo $ov['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordervars&do=inlinedit&noheader=1', {
submitdata: {
field: 'typ',
ov_id: '<?php echo $ov['id']; ?>'
@@ -112,7 +112,7 @@ <span class="wpsg_editable" id="wpsg_ov_auswahl_<?php echo $ov['id']; ?>"><?php echo wpsg_hspc($ov['auswahl']); ?></span>
<script type="text/javascript">
- jQuery('#wpsg_ov_auswahl_<?php echo $ov['id']; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordervars&do=inlinedit&noheader=1', {
+ jQuery('#wpsg_ov_auswahl_<?php echo $ov['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordervars&do=inlinedit&noheader=1', {
submitdata: {
field: 'auswahl',
ov_id: '<?php echo $ov['id']; ?>'
diff --git a/views/mods/mod_packagetracking/settings_edit_list.phtml b/views/mods/mod_packagetracking/settings_edit_list.phtml index 8313e22..bfb4080 100644 --- a/views/mods/mod_packagetracking/settings_edit_list.phtml +++ b/views/mods/mod_packagetracking/settings_edit_list.phtml @@ -40,7 +40,7 @@ jQuery(document).ready(function() {
- jQuery('#tp_<?php echo $p['id']; ?>_name').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_packagetracking&do=inlinedit&noheader=1', {
+ jQuery('#tp_<?php echo $p['id']; ?>_name').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_packagetracking&do=inlinedit&noheader=1', {
submitdata: {
field: 'name',
trackingprovider_id: '<?php echo $p['id']; ?>'
@@ -51,7 +51,7 @@ tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
} );
- jQuery('#tp_<?php echo $p['id']; ?>_url').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_packagetracking&do=inlinedit&noheader=1', {
+ jQuery('#tp_<?php echo $p['id']; ?>_url').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_packagetracking&do=inlinedit&noheader=1', {
submitdata: {
field: 'url',
trackingprovider_id: '<?php echo $p['id']; ?>'
diff --git a/views/mods/mod_productvariants/admin_edit.phtml b/views/mods/mod_productvariants/admin_edit.phtml index b307c4e..11a8825 100644 --- a/views/mods/mod_productvariants/admin_edit.phtml +++ b/views/mods/mod_productvariants/admin_edit.phtml @@ -50,14 +50,14 @@ <script type="text/javascript">/* <![CDATA[ */
<?php if (!wpsg_isSizedInt($this->view['product_id']) || wpsg_isSizedInt($this->view['variant']['product_id'])) { ?>
- jQuery('#productvariation_name_<?php echo $vari['id']; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productvariants&subaction=admin_inlineEdit&noheader=1', {
+ jQuery('#productvariation_name_<?php echo $vari['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productvariants&subaction=admin_inlineEdit&noheader=1', {
submitdata: {
field: 'vari_name',
field_id: '<?php echo $vari['id']; ?>'
}
});
- jQuery('#productvariation_shortname_<?php echo $vari['id']; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productvariants&subaction=admin_inlineEdit&noheader=1', {
+ jQuery('#productvariation_shortname_<?php echo $vari['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productvariants&subaction=admin_inlineEdit&noheader=1', {
submitdata: {
field: 'vari_shortname',
field_id: '<?php echo $vari['id']; ?>'
@@ -82,7 +82,7 @@ } );
- jQuery('#productvariation_anr_<?php echo $vari['id']; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productvariants&subaction=admin_inlineEdit&noheader=1', {
+ jQuery('#productvariation_anr_<?php echo $vari['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productvariants&subaction=admin_inlineEdit&noheader=1', {
submitdata: {
field: 'vari_anr',
product_id: jQuery('#wpsg_mod_productvariants_product_id').val(),
@@ -90,7 +90,7 @@ }
});
- jQuery('#productvariation_price_<?php echo $vari['id']; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productvariants&subaction=admin_inlineEdit&noheader=1', {
+ jQuery('#productvariation_price_<?php echo $vari['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productvariants&subaction=admin_inlineEdit&noheader=1', {
submitdata: {
field: 'vari_price',
product_id: jQuery('#wpsg_mod_productvariants_product_id').val(),
@@ -98,7 +98,7 @@ }
});
- jQuery('#productvariation_stock_<?php echo $vari['id']; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productvariants&subaction=admin_inlineEdit&noheader=1', {
+ jQuery('#productvariation_stock_<?php echo $vari['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productvariants&subaction=admin_inlineEdit&noheader=1', {
submitdata: {
field: 'vari_stock',
product_id: jQuery('#wpsg_mod_productvariants_product_id').val(),
diff --git a/views/mods/mod_productvariants/admin_show.phtml b/views/mods/mod_productvariants/admin_show.phtml index 780dc53..986c2d5 100644 --- a/views/mods/mod_productvariants/admin_show.phtml +++ b/views/mods/mod_productvariants/admin_show.phtml @@ -51,14 +51,14 @@ <?php if ((wpsg_isSizedInt($this->view['product_id']) && $this->view['product_id'] == $var['product_id']) || (!wpsg_isSizedInt($var['product_id']) && !wpsg_isSizedInt($this->view['product_id']))) { ?>
- jQuery('#productvariants_name_<?php echo $var['id']; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productvariants&subaction=admin_inlineEdit&noheader=1', {
+ jQuery('#productvariants_name_<?php echo $var['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productvariants&subaction=admin_inlineEdit&noheader=1', {
submitdata: {
field: 'name',
field_id: '<?php echo $var['id']; ?>'
}
});
- jQuery('#productvariants_type_<?php echo $var['id']; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productvariants&subaction=admin_inlineEdit&noheader=1', {
+ jQuery('#productvariants_type_<?php echo $var['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productvariants&subaction=admin_inlineEdit&noheader=1', {
submitdata: {
field: 'type',
field_id: '<?php echo $var['id']; ?>'
diff --git a/views/mods/mod_productvars/order_view_row.phtml b/views/mods/mod_productvars/order_view_row.phtml index b584de6..a835fc1 100644 --- a/views/mods/mod_productvars/order_view_row.phtml +++ b/views/mods/mod_productvars/order_view_row.phtml @@ -17,7 +17,7 @@ <script type="text/javascript">/* <![CDATA[ */ <?php if ($pv['typ'] == 2) { /* Textfeld */ ?>
- jQuery('#wpsg_productvar_<?php echo $k.'_'.$product_index; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_productvars&do=inlinedit&noheader=1', {
+ jQuery('#wpsg_productvar_<?php echo $k.'_'.$product_index; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_productvars&do=inlinedit&noheader=1', {
submitdata: {
order_id: <?php echo $_REQUEST['edit_id']; ?>,
pv_id: '<?php echo $k; ?>',
@@ -29,7 +29,7 @@ tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
});
<?php } else if ($pv['typ'] == 1) { /* Auswahl */ ?>
- jQuery('#wpsg_productvar_<?php echo $k.'_'.$product_index; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_productvars&do=inlinedit&noheader=1', {
+ jQuery('#wpsg_productvar_<?php echo $k.'_'.$product_index; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_productvars&do=inlinedit&noheader=1', {
submitdata: {
order_id: <?php echo $_REQUEST['edit_id']; ?>,
pv_id: '<?php echo $k; ?>',
@@ -43,7 +43,7 @@ tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
});
<?php } else if ($pv['typ'] == 3) { /* Checkbox */ ?>
- jQuery('#wpsg_productvar_<?php echo $k.'_'.$product_index; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_productvars&do=inlinedit&noheader=1', {
+ jQuery('#wpsg_productvar_<?php echo $k.'_'.$product_index; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_productvars&do=inlinedit&noheader=1', {
submitdata: {
order_id: <?php echo $_REQUEST['edit_id']; ?>,
pv_id: '<?php echo $k; ?>',
diff --git a/views/mods/mod_productvars/pv_list.phtml b/views/mods/mod_productvars/pv_list.phtml index 5cc2c59..3dba9ad 100644 --- a/views/mods/mod_productvars/pv_list.phtml +++ b/views/mods/mod_productvars/pv_list.phtml @@ -24,7 +24,7 @@ <span class="wpsg_editable" id="wpsg_pv_auswahl_<?php echo $pv['id']; ?>"><?php echo wpsg_hspc($pv['auswahl']); ?></span>
<script type="text/javascript">/* <![CDATA[ */
- jQuery('#wpsg_pv_auswahl_<?php echo $pv['id']; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productvars&do=inlinedit&noheader=1', {
+ jQuery('#wpsg_pv_auswahl_<?php echo $pv['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productvars&do=inlinedit&noheader=1', {
submitdata: {
field: 'auswahl',
pv_id: '<?php echo $pv['id']; ?>'
@@ -46,7 +46,7 @@ <script type="text/javascript">/* <![CDATA[ */
- jQuery('#wpsg_pv_name_<?php echo $pv['id']; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productvars&do=inlinedit&noheader=1', {
+ jQuery('#wpsg_pv_name_<?php echo $pv['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productvars&do=inlinedit&noheader=1', {
submitdata: {
field: 'name',
pv_id: '<?php echo $pv['id']; ?>'
@@ -70,7 +70,7 @@ } );
- jQuery('#wpsg_pv_typ_<?php echo $pv['id']; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productvars&do=inlinedit&noheader=1', {
+ jQuery('#wpsg_pv_typ_<?php echo $pv['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productvars&do=inlinedit&noheader=1', {
submitdata: {
field: 'typ',
pv_id: '<?php echo $pv['id']; ?>'
diff --git a/views/mods/mod_produktattribute/list.phtml b/views/mods/mod_produktattribute/list.phtml index f90b6ee..c0363f3 100644 --- a/views/mods/mod_produktattribute/list.phtml +++ b/views/mods/mod_produktattribute/list.phtml @@ -83,7 +83,7 @@ } );
- jQuery('#pa_<?php echo $pa['id']; ?>_name').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=module&modul=wpsg_mod_produktattribute&do=inlinedit&noheader=1', {
+ jQuery('#pa_<?php echo $pa['id']; ?>_name').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=module&modul=wpsg_mod_produktattribute&do=inlinedit&noheader=1', {
submitdata: {
field: 'name',
pa_id: '<?php echo $pa['id']; ?>'
@@ -106,7 +106,7 @@ jQuery(document).ready(function() {
- jQuery('#pa_<?php echo $pa['id']; ?>_auswahl').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=module&modul=wpsg_mod_produktattribute&do=inlinedit&noheader=1', {
+ jQuery('#pa_<?php echo $pa['id']; ?>_auswahl').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=module&modul=wpsg_mod_produktattribute&do=inlinedit&noheader=1', {
submitdata: {
field: 'auswahl',
pa_id: '<?php echo $pa['id']; ?>'
diff --git a/views/mods/mod_rechnungen/foottext_list.phtml b/views/mods/mod_rechnungen/foottext_list.phtml index 44ba902..90dea61 100644 --- a/views/mods/mod_rechnungen/foottext_list.phtml +++ b/views/mods/mod_rechnungen/foottext_list.phtml @@ -28,7 +28,7 @@ jQuery(document).ready(function() {
- jQuery('#wpsg_foottext_0_<?php echo $key; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_rechnungen&do=inlinedit&noheader=1', {
+ jQuery('#wpsg_foottext_0_<?php echo $key; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_rechnungen&do=inlinedit&noheader=1', {
submitdata: {
field: '0',
field_id: '<?php echo $key; ?>'
@@ -39,7 +39,7 @@ tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
});
- jQuery('#wpsg_foottext_1_<?php echo $key; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_rechnungen&do=inlinedit&noheader=1', {
+ jQuery('#wpsg_foottext_1_<?php echo $key; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_rechnungen&do=inlinedit&noheader=1', {
submitdata: {
field: '1',
field_id: '<?php echo $key; ?>'
diff --git a/views/mods/mod_rechnungen/rechnung_pdf.phtml b/views/mods/mod_rechnungen/rechnung_pdf.phtml index 31fe336..25cbfdb 100644 --- a/views/mods/mod_rechnungen/rechnung_pdf.phtml +++ b/views/mods/mod_rechnungen/rechnung_pdf.phtml @@ -18,7 +18,7 @@ $adress_left = 25;
$adress_top = 55;
- // Positionierund des Rechnungskopfes
+ // Positionierung des Rechnungskopfes
$rdata_left = 25;
$rdata_top = 90;
@@ -47,31 +47,31 @@ $pdf->AddPage();
- if (file_exists($shop->callMod('wpsg_mod_rechnungen', getFilePath, array(''))."wpsg_rechnungen_bp.pdf"))
+ if (file_exists($shop->callMod('wpsg_mod_rechnungen', 'getFilePath', array(''))."wpsg_rechnungen_bp.pdf"))
{
- $pagecount = $pdf->setSourceFile($shop->callMod('wpsg_mod_rechnungen', getFilePath, array(''))."wpsg_rechnungen_bp.pdf");
+ $pagecount = $pdf->setSourceFile($shop->callMod('wpsg_mod_rechnungen', 'getFilePath', array(''))."wpsg_rechnungen_bp.pdf");
$tplidx = $pdf->importPage(1, '/MediaBox');
$pdf->useTemplate($tplidx, 0, 0, 210);
}
- if (file_exists($shop->callMod('wpsg_mod_rechnungen', getFilePath, array(''))."wpsg_rechnungen_bp.jpg"))
+ if (file_exists($shop->callMod('wpsg_mod_rechnungen', 'getFilePath', array(''))."wpsg_rechnungen_bp.jpg"))
{
- $pdf->image($shop->callMod('wpsg_mod_rechnungen', getFilePath, array(''))."wpsg_rechnungen_bp.jpg", 0, 0, 210, 297, 'jpg');
+ $pdf->image($shop->callMod('wpsg_mod_rechnungen', 'getFilePath', array(''))."wpsg_rechnungen_bp.jpg", 0, 0, 210, 297, 'jpg');
}
- if (file_exists($shop->callMod('wpsg_mod_rechnungen', getFilePath, array(''))."wpsg_rechnungen_logo.jpg"))
+ if (file_exists($shop->callMod('wpsg_mod_rechnungen', 'getFilePath', array(''))."wpsg_rechnungen_logo.jpg"))
{
- list($width, $height, $type, $attr) = getimagesize($shop->callMod('wpsg_mod_rechnungen', getFilePath, array(''))."wpsg_rechnungen_logo.jpg");
+ list($width, $height, $type, $attr) = getimagesize($shop->callMod('wpsg_mod_rechnungen', 'getFilePath', array(''))."wpsg_rechnungen_logo.jpg");
//wpsg_debug($width.":".$height);
$wPix = (25.4 * $width) / 96;
$hPix = (25.4 * $height) / 96;
- $pdf->image($shop->callMod('wpsg_mod_rechnungen', getFilePath, array(''))."wpsg_rechnungen_logo.jpg", 210 - $wPix, 0, $wPix, $hPix);
+ $pdf->image($shop->callMod('wpsg_mod_rechnungen', 'getFilePath', array(''))."wpsg_rechnungen_logo.jpg", 210 - $wPix, 0, $wPix, $hPix);
}
@@ -79,13 +79,13 @@ $pdf->SetFont('Arial', '', 6);
$pdf->Text($absender_left, $absender_top, $shop->replaceUniversalPlatzhalter(__($shop->get_option("wpsg_rechnungen_adresszeile"), 'wpsg'), $shop->view['data']['id']));
- if ($shop->view['kunde']['kuerzel'] != "") $shop->view['kunde']['kuerzel'] = $shop->view['kunde']['kuerzel'].'-';
+ if (wpsg_getStr($shop->view['kunde']['kuerzel']) != "") $shop->view['kunde']['kuerzel'] = $shop->view['kunde']['kuerzel'].'-';
// Adresse des Kunden
$pdf->SetFont('Arial', '', 12);
$pdf->Text($adress_left, $adress_top, $shop->view['kunde']['firma']);
$pdf->Text($adress_left, $adress_top + 5, $shop->view['kunde']['vname'].' '.$shop->view['kunde']['name']);
- $pdf->Text($adress_left, $adress_top + 10, $shop->view['kunde']['strasse'].' '.$shop->view['kunde']['hausnr']);
+ $pdf->Text($adress_left, $adress_top + 10, $shop->view['kunde']['strasse'].' '.wpsg_getStr($shop->view['kunde']['hausnr']));
$pdf->Text($adress_left, $adress_top + 15, $shop->view['kunde']['plz'].' '.$shop->view['kunde']['ort']);
$pdf->Text($adress_left, $adress_top + 20, strtoupper($shop->view['oOrder']->getInvoiceCountryName()));
@@ -285,7 +285,16 @@ $pdf->setXY($prod_left + 112, $prod_top + $offset);
$pdf->Cell(15, 8, $p['menge'], 0, 0, 'C');
- $preis = $p['preis'];
+ if (wpsg_ShopController::get_option('wpsg_preisangaben') == WPSG_NETTO)
+ {
+ $preis = $p['preis_netto'];
+
+ //TODO
+ }
+ else
+ {
+ $preis = $p['preis_brutto'];
+ }
$pdf->setXY($prod_left + 127, $prod_top + $offset);
$pdf->Cell(25, 8, wpsg_ff($preis, $this->get_option('wpsg_currency')), 0, 0, 'R');
@@ -404,7 +413,7 @@ } // produkte
// Gutschein
- if (isset($this->view['basket']['gs']))
+ if ((isset($this->view['basket']['gs'])) && ($this->view['basket']['gs_value'] > 0))
{
$pdf->SetFont('Arial', '', 9);
@@ -639,7 +648,7 @@ }
// Gebühr
- if (wpsg_tf($this->view['storno_fee']) > 0)
+ if (wpsg_tf(wpsg_getStr($this->view['storno_fee'])) > 0)
{
$pdf->SetFont('Arial', '', 9);
diff --git a/views/mods/mod_scaleprice/scaleList.phtml b/views/mods/mod_scaleprice/scaleList.phtml index 06e8173..acd930c 100644 --- a/views/mods/mod_scaleprice/scaleList.phtml +++ b/views/mods/mod_scaleprice/scaleList.phtml @@ -31,7 +31,7 @@ jQuery(document).ready(function() {
- jQuery('#wpsg_mod_scaleprice_<?php echo $scale['id']; ?>_scale').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_scaleprice&edit_id=<?php echo $this->view['wpsg_mod_scaleprice']['product']['id']; ?>&noheader=1&cmd=inlineEdit', {
+ jQuery('#wpsg_mod_scaleprice_<?php echo $scale['id']; ?>_scale').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_scaleprice&edit_id=<?php echo $this->view['wpsg_mod_scaleprice']['product']['id']; ?>&noheader=1&cmd=inlineEdit', {
submitdata: {
field: 'scale',
scale_id: '<?php echo $scale['id']; ?>'
@@ -42,7 +42,7 @@ tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
});
- jQuery('#wpsg_mod_scaleprice_<?php echo $scale['id']; ?>_value').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_scaleprice&edit_id=<?php echo $this->view['wpsg_mod_scaleprice']['product']['id']; ?>&noheader=1&cmd=inlineEdit', {
+ jQuery('#wpsg_mod_scaleprice_<?php echo $scale['id']; ?>_value').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_scaleprice&edit_id=<?php echo $this->view['wpsg_mod_scaleprice']['product']['id']; ?>&noheader=1&cmd=inlineEdit', {
submitdata: {
field: 'value',
scale_id: '<?php echo $scale['id']; ?>'
diff --git a/views/mods/mod_spconditions/conditionList.phtml b/views/mods/mod_spconditions/conditionList.phtml index 262ef90..38c49b4 100644 --- a/views/mods/mod_spconditions/conditionList.phtml +++ b/views/mods/mod_spconditions/conditionList.phtml @@ -10,7 +10,7 @@ <?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'), $this->view['arShipping'], $v['shipping_id']); ?>
+ <?php echo wpsg_drawForm_Select('shipping_id', __('Versandart', 'wpsg'), wpsg_getArray($this->view['arShipping']), $v['shipping_id']); ?>
<hr />
<?php } ?>
diff --git a/views/mods/mod_spconditions/settings_edit.phtml b/views/mods/mod_spconditions/settings_edit.phtml index b83401b..b256e2f 100644 --- a/views/mods/mod_spconditions/settings_edit.phtml +++ b/views/mods/mod_spconditions/settings_edit.phtml @@ -11,7 +11,7 @@ <div class="title">
<div class="fulltab">
<?php echo __('Versand- und Zahlungsbedingungen', 'wpsg'); ?>
- <a title="<?php echo __('Neue Versand- und Zahlungsbedingung anlegen', 'wpsg'); ?>" href="" class="wpsg_icon wpsg_icon_right wpsg_icon_add" onclick="return wpsg_addSPCondition();"></a>
+ <a title="<?php echo __('Neue Versand- und Zahlungsbedingung anlegen', 'wpsg'); ?>" href="" class="wpsg_glyphicon_right glyphicon glyphicon-plus-sign" onclick="return wpsg_addSPCondition();"></a>
</div>
</div>
</div>
diff --git a/views/mods/mod_userpayment/list.phtml b/views/mods/mod_userpayment/list.phtml index 933fd9e..2ef1fb2 100644 --- a/views/mods/mod_userpayment/list.phtml +++ b/views/mods/mod_userpayment/list.phtml @@ -19,13 +19,13 @@ <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_icon wpsg_icon_remove" href="#" title="<?php echo __('Zahlvariante löschen', 'wpsg'); ?>" onclick="return wpsg_removeZV(<?php echo $zv['id']; ?>);"></a>
+ <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').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_userpayment&do=inlinedit&noheader=1', {
+ 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']; ?>'
@@ -36,7 +36,7 @@ tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
} );
- jQuery('#zv_<?php echo $zv['id']; ?>_hint').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_userpayment&do=inlinedit&noheader=1', {
+ 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']; ?>'
@@ -47,7 +47,7 @@ tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
} );
- jQuery('#zv_<?php echo $zv['id']; ?>_rabgeb').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_userpayment&do=inlinedit&noheader=1', {
+ 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']; ?>'
@@ -58,7 +58,7 @@ tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
} );
- jQuery('#zv_<?php echo $zv['id']; ?>_mwst').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_userpayment&do=inlinedit&noheader=1', {
+ 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']; ?>'
@@ -97,7 +97,7 @@ <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_form_help" 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>
+ <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>
@@ -106,14 +106,14 @@ <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_form_help" 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>
+ <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_form_help" 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>
+ <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>
@@ -123,7 +123,7 @@ <div style="float:right;"><?php echo $this->get_option('wpsg_currency'); ?> / %</div>
</td>
<td class="wpsg_delcol">
- <a class="wpsg_form_help" 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>
+ <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>
@@ -135,7 +135,7 @@ ?></td>
<td class="wpsg_delcol">
- <a class="wpsg_form_help" 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>
+ <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>
@@ -144,7 +144,7 @@ <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_form_help" 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>
+ <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'])) { ?>
diff --git a/views/mods/mod_userpayment/settings_edit.phtml b/views/mods/mod_userpayment/settings_edit.phtml index 93b21f6..2ce84b3 100644 --- a/views/mods/mod_userpayment/settings_edit.phtml +++ b/views/mods/mod_userpayment/settings_edit.phtml @@ -69,7 +69,7 @@ <div class="title">
<div class="fulltab">
<?php echo __('Zahlvarianten', 'wpsg'); ?>
- <a title="<?php echo __('Neue Zahlvariante anlegen', 'wpsg'); ?>" href="" class="wpsg_icon wpsg_icon_right wpsg_icon_add" onclick="return wpsg_addZV();"></a>
+ <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>
diff --git a/views/mods/mod_varianten/drawVarianten.phtml b/views/mods/mod_varianten/drawVarianten.phtml index c5a556d..ca9cbc4 100644 --- a/views/mods/mod_varianten/drawVarianten.phtml +++ b/views/mods/mod_varianten/drawVarianten.phtml @@ -47,7 +47,7 @@ <script type="text/javascript">
- jQuery("#varname_<?php echo $k; ?>").wspg_editable("<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_vari_inlineEdit&noheader=1", {
+ jQuery("#varname_<?php echo $k; ?>").wpsg_editable("<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_vari_inlineEdit&noheader=1", {
submitdata: {
typ: "var_name",
var_id: <?php echo $k; ?>,
@@ -153,7 +153,7 @@ <?php if (!wpsg_isSizedString($_REQUEST['wpsg_lang'])) { ?>
<script type="text/javascript">
- jQuery("#variartnr_<?php echo $k; ?>").wspg_editable("<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_vari_inlineEdit&noheader=1", {
+ jQuery("#variartnr_<?php echo $k; ?>").wpsg_editable("<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_vari_inlineEdit&noheader=1", {
submitdata: {
typ: "var_artnr",
edit_id: <?php echo $this->view['data']['id']; ?>,
@@ -168,7 +168,7 @@ tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
});
- jQuery("#varpreis_<?php echo $k; ?>").wspg_editable("<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_vari_inlineEdit&noheader=1", {
+ jQuery("#varpreis_<?php echo $k; ?>").wpsg_editable("<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_vari_inlineEdit&noheader=1", {
submitdata: {
typ: "var_preis",
edit_id: <?php echo $this->view['data']['id']; ?>,
@@ -182,7 +182,7 @@ <?php if ($this->hasMod('wpsg_mod_weight')) { ?>
- jQuery("#varweight_<?php echo $k; ?>").wspg_editable("<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_vari_inlineEdit&noheader=1", {
+ jQuery("#varweight_<?php echo $k; ?>").wpsg_editable("<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_vari_inlineEdit&noheader=1", {
submitdata: {
typ: "var_weight",
edit_id: <?php echo $this->view['data']['id']; ?>,
@@ -198,7 +198,7 @@ <?php if ($this->hasMod('wpsg_mod_stock') && $var['typ'] != 'checkbox') { ?>
- jQuery("#varstock_<?php echo $k; ?>").wspg_editable("<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_vari_inlineEdit&noheader=1", {
+ jQuery("#varstock_<?php echo $k; ?>").wpsg_editable("<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_vari_inlineEdit&noheader=1", {
submitdata: {
typ: "var_stock",
edit_id: <?php echo $this->view['data']['id']; ?>,
@@ -269,7 +269,7 @@ <script type="text/javascript">
- jQuery("#variname_<?php echo $k; ?>_<?php echo $kv; ?>").wspg_editable("<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_vari_inlineEdit&noheader=1", {
+ jQuery("#variname_<?php echo $k; ?>_<?php echo $kv; ?>").wpsg_editable("<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_vari_inlineEdit&noheader=1", {
submitdata: {
typ: "vari_name",
edit_id: <?php echo $this->view['data']['id']; ?>,
@@ -286,7 +286,7 @@ });
<?php if (!wpsg_isSizedString($_REQUEST['wpsg_lang'])) { ?>
- jQuery("#variartnr_<?php echo $k; ?>_<?php echo $kv; ?>").wspg_editable("<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_vari_inlineEdit&noheader=1", {
+ jQuery("#variartnr_<?php echo $k; ?>_<?php echo $kv; ?>").wpsg_editable("<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_vari_inlineEdit&noheader=1", {
submitdata: {
typ: "vari_artnr",
edit_id: <?php echo $this->view['data']['id']; ?>,
@@ -302,7 +302,7 @@ tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
});
- jQuery("#varipreis_<?php echo $k; ?>_<?php echo $kv; ?>").wspg_editable("<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_vari_inlineEdit&noheader=1", {
+ jQuery("#varipreis_<?php echo $k; ?>_<?php echo $kv; ?>").wpsg_editable("<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_vari_inlineEdit&noheader=1", {
submitdata: {
typ: "vari_preis",
edit_id: <?php echo $this->view['data']['id']; ?>,
@@ -316,7 +316,7 @@ });
<?php if ($this->hasMod('wpsg_mod_fuellmenge')) { ?>
- jQuery("#varifmenge_<?php echo $k; ?>_<?php echo $kv; ?>").wspg_editable("<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_vari_inlineEdit&noheader=1", {
+ jQuery("#varifmenge_<?php echo $k; ?>_<?php echo $kv; ?>").wpsg_editable("<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_vari_inlineEdit&noheader=1", {
submitdata: {
typ: "vari_fmenge",
edit_id: <?php echo $this->view['data']['id']; ?>,
@@ -332,7 +332,7 @@ <?php if ($this->hasMod('wpsg_mod_weight')) { ?>
- jQuery("#variweight_<?php echo $k; ?>_<?php echo $kv; ?>").wspg_editable("<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_vari_inlineEdit&noheader=1", {
+ jQuery("#variweight_<?php echo $k; ?>_<?php echo $kv; ?>").wpsg_editable("<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_vari_inlineEdit&noheader=1", {
submitdata: {
typ: "vari_weight",
edit_id: <?php echo $this->view['data']['id']; ?>,
@@ -347,7 +347,7 @@ <?php if ($this->hasMod('wpsg_mod_stock')) { ?>
- jQuery("#varistock_<?php echo $k; ?>_<?php echo $kv; ?>").wspg_editable("<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_vari_inlineEdit&noheader=1", {
+ jQuery("#varistock_<?php echo $k; ?>_<?php echo $kv; ?>").wpsg_editable("<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_varianten&cmd=wpsg_vp_vari_inlineEdit&noheader=1", {
submitdata: {
typ: "vari_stock",
edit_id: <?php echo $this->view['data']['id']; ?>,
diff --git a/views/mods/mod_versandarten/list.phtml b/views/mods/mod_versandarten/list.phtml index 73bc700..6aeb712 100644 --- a/views/mods/mod_versandarten/list.phtml +++ b/views/mods/mod_versandarten/list.phtml @@ -19,13 +19,13 @@ <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_icon wpsg_icon_remove" href="#" title="<?php echo __('Versandart löschen', 'wpsg'); ?>" onclick="return wpsg_removeVA(<?php echo $va['id']; ?>);"></a>
+ <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').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {
+ 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']; ?>'
@@ -36,7 +36,7 @@ tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
});
- jQuery('#va_<?php echo $va['id']; ?>_kosten').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {
+ 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']; ?>'
@@ -47,7 +47,7 @@ tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
});
- jQuery('#va_<?php echo $va['id']; ?>_hint').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {
+ 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']; ?>'
@@ -58,7 +58,7 @@ tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
});
- jQuery('#va_<?php echo $va['id']; ?>_typ').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {
+ 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']; ?>'
@@ -71,7 +71,7 @@ tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
});
- jQuery('#va_<?php echo $va['id']; ?>_vz').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {
+ 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']; ?>'
@@ -89,7 +89,7 @@ } );
- jQuery('#va_<?php echo $va['id']; ?>_mwst').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {
+ 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']; ?>'
@@ -102,6 +102,19 @@ tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
});
+ jQuery('#va2_<?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: '{"value":0,"text":"anteilig"},{"value":"a","text":"A"}',
+ 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;
@@ -129,7 +142,7 @@ <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_form_help" 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>
+ <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>
@@ -138,21 +151,21 @@ <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_form_help" 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>
+ <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_form_help" 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>
+ <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_form_help" 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>
+ <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>
@@ -165,14 +178,14 @@ <?php } ?>
</td>
<td class="wpsg_delcol">
- <a class="wpsg_form_help" 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>
+ <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_form_help" 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>
+ <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'])) { ?>
@@ -185,7 +198,7 @@ jQuery(document).ready(function() {
- jQuery('#va_<?php echo $va['id']; ?>_plz_<?php echo $index ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {
+ 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']; ?>',
@@ -217,7 +230,7 @@ ?></td>
<td class="wpsg_delcol">
- <a class="wpsg_form_help" 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>
+ <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>
@@ -226,9 +239,26 @@ <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_form_help" 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>
+ <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>
+
+ <tr>
+ <td class="wpsg_label"><?php echo __('Steuersatz', 'wpsg'); ?>:</td>
+ <td id="va2_<?php echo $va['id']; ?>_mwst" class="wpsg_value wpsg_editable"><?php
+
+ $tax_groups = wpsg_tax_groups();
+ //echo wpsg_hspc($tax_groups[$va['mwst_key']]);
+ echo $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>
+
+
+
<?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>
diff --git a/views/mods/mod_versandarten/settings_edit.phtml b/views/mods/mod_versandarten/settings_edit.phtml index bfe95c3..9553eee 100644 --- a/views/mods/mod_versandarten/settings_edit.phtml +++ b/views/mods/mod_versandarten/settings_edit.phtml @@ -89,7 +89,7 @@ <div class="title">
<div class="fulltab">
<?php echo __('Versandarten', 'wpsg'); ?>
- <a title="<?php echo __('Neue Versandart anlegen', 'wpsg'); ?>" href="" class="wpsg_icon wpsg_icon_right wpsg_icon_add" onclick="return wpsg_addVA();"></a>
+ <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>
diff --git a/views/order/view.phtml b/views/order/view.phtml index 8df88e7..55e8386 100644 --- a/views/order/view.phtml +++ b/views/order/view.phtml @@ -37,11 +37,15 @@ <?php } ?>
</div>
+ <a href="" id="LinkProduktNeu" onclick="return WPSG_BE_Product.addProduct(<?php echo $_REQUEST['edit_id']; ?>, 0);"><span class="glyphicon glyphicon-plus"></span>
+ <?php echo __("Neues Produkt", "wpsg"); ?>
+ </a><br />
+
<br />
<?php if ($this->hasMod('wpsg_mod_gutschein')) { ?>
<?php //if (((array_key_exists('gs', $this->view['basket'])) && ($this->view['basket']['gs']['value'] == 0))) { ?>
<a href="" id="LinkGutscheinNeu" onclick="return wpsg_addVoucher(<?php echo $_REQUEST['edit_id']; ?>);"><span class="glyphicon glyphicon-plus"></span>
- <?php echo __("Neuer Gutschein.", "wpsg"); ?>
+ <?php echo __("Neuer Gutschein", "wpsg"); ?>
</a><br />
<?php //} ?>
<?php } ?>
@@ -49,7 +53,7 @@ <?php if ($this->hasMod('wpsg_mod_discount')) { ?>
<?php //if (((array_key_exists('preis_rabatt', $this->view['basket']['sum'])) && ($this->view['basket']['sum']['preis_rabatt'] == 0))) { ?>
<a href="" id="LinkRabattNeu" onclick="return wpsg_addDiscount(<?php echo $_REQUEST['edit_id']; ?>);"><span class="glyphicon glyphicon-plus"></span>
- <?php echo __("Neuer Rabatt.", "wpsg"); ?>
+ <?php echo __("Neuer Rabatt", "wpsg"); ?>
</a><br />
<?php //} ?>
<?php } ?>
@@ -118,6 +122,7 @@ } // function wpsg_addVoucher()
+
jQuery(document).ready(function() {
diff --git a/views/order/view_orderdata.phtml b/views/order/view_orderdata.phtml index c031b35..14968dc 100644 --- a/views/order/view_orderdata.phtml +++ b/views/order/view_orderdata.phtml @@ -25,6 +25,8 @@ <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id=<?php echo $this->getProduktID($p['id']); ?>" title="<?php echo __('Zum Produkt', 'wpsg'); ?>">
<?php echo wpsg_hspc($this->getProductName($this->getProduktID($p['id']))); ?>
</a>
+ <a href="#" class="wpsg-glyphlink-td" title="<?php echo __('Produkt bearbeiten', 'wpsg'); ?>" onclick="return WPSG_BE_Product.editProduct(<?php echo $p['order_product_id']; ?>, <?php echo $p['product_id']; ?>, <?php echo $_REQUEST['edit_id']; ?>);"><span class="glyphicon glyphicon-pencil"></span></a>
+ <a href="#" class="wpsg-glyphlink-td" title="<?php echo __('Produkt löschen', 'wpsg'); ?>" onclick="return WPSG_BE_Product.removeProduct(<?php echo $p['order_product_id']; ?>, <?php echo $_REQUEST['edit_id']; ?>);"><span class="glyphicon glyphicon-trash"></span></a>
</td>
<td class="wpsg_cell_preis"><?php echo wpsg_ff($p['preis']); ?> <?php echo $this->get_option('wpsg_currency'); ?></td>
<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
@@ -99,7 +101,8 @@ <?php echo wpsg_translate(__('Summe (zzgl. #1#)', 'wpsg'), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'" target="_blank">'.__('Versandkosten', 'wpsg').'</a>'); ?>
<?php } else { ?>
<?php //if ($this->getFrontendTaxview() == WPSG_NETTO)
- if ($this->view['basket']['price_frontend'] == WPSG_NETTO)
+ //if ($this->view['basket']['price_frontend'] == WPSG_NETTO)
+ if ($this->get_option('wpsg_preisangaben') == WPSG_NETTO)
{ ?>
<?php echo wpsg_translate(__('Summe (zzgl. #1#, zzgl. MwSt.)', 'wpsg'), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'" target="_blank">'.__('Versandkosten', 'wpsg').'</a>'); ?>
<?php } else { ?>
@@ -115,9 +118,19 @@ <tr class="wpsg_row_shipping">
<td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_shipping_label">
<a href="<?php echo $this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN); ?>" target="_blank"><?php echo __('Versandkosten', 'wpsg'); ?></a>
+ <?php
+ //$order = $this->view['oOrder'];
+ $o_id = $_REQUEST['edit_id'];
+ $oOrder = wpsg_order::getInstance($o_id);
+ $sid = $oOrder->getShippingID();
+ echo __(' ('.$this->arShipping[$sid]['name'].')', 'wpsg');
+ ?>
+ <a href="#" class="wpsg-glyphlink-td" title="<?php echo __('Versandart ändern', 'wpsg'); ?>"
+ onclick="return WPSG_BE_Pay_Ship.changeShipping('<?php echo $sid; ?>', <?php echo $o_id; ?>);"><span class="glyphicon glyphicon-pencil"></span></a>
</td>
<td class="wpsg_cell_shipping_value wpsg_cell_gesamtpreis">
- <?php echo wpsg_ff($this->view['basket']['sum']['preis_shipping']); ?> <?php echo $this->get_option('wpsg_currency'); ?>
+ <span id="wpsg_cell_shipping_value"><?php echo wpsg_ff($this->view['basket']['sum']['preis_shipping']); ?> </span>
+ <?php echo $this->get_option('wpsg_currency'); ?>
</td>
</tr>
<?php } ?>
@@ -130,10 +143,13 @@ $pid = $oOrder->getPaymentID();
echo __(' ('.$this->arPayment[$pid]['name'].')', 'wpsg');
?>
- <a href="#" class="wpsg-glyphlink-td" title="<?php echo __('Zahlungsart ändern', 'wpsg'); ?>" onclick="return WPSG_BE_Payment.changePayment(<?php echo $pid; ?>, <?php echo $o_id; ?>);"><span class="glyphicon glyphicon-modal-window"></span></a>
+ <!-- <a href="#" class="wpsg-glyphlink-td" title="<?php echo __('Zahlungsart löschen', 'wpsg'); ?>" onclick="return WPSG_BE_Pay_Ship.deletePayment('"<?php echo $pid; ?>"'", <?php echo $o_id; ?>);"><span class="glyphicon glyphicon-trash"></span></a> -->
+ <a href="#" class="wpsg-glyphlink-td" title="<?php echo __('Zahlungsart ändern', 'wpsg'); ?>"
+ onclick="return WPSG_BE_Pay_Ship.changePayment('<?php echo $pid; ?>', <?php echo $o_id; ?>);"><span class="glyphicon glyphicon-pencil"></span></a>
</td>
- <td class="wpsg_cell_payment_value wpsg_cell_gesamtpreis">
- <?php echo wpsg_ff($this->view['basket']['sum']['preis_payment']); ?> <?php echo $this->get_option('wpsg_currency'); ?>
+ <td class="wpsg_cell_payment_value wpsg_cell_gesamtpreis" >
+ <span id="wpsg_cell_payment_value"><?php echo wpsg_ff($this->view['basket']['sum']['preis_payment']); ?> </span>
+ <?php echo $this->get_option('wpsg_currency'); ?>
</td>
</tr>
<?php } ?>
@@ -157,14 +173,16 @@ <strong><?php echo wpsg_ff($this->view['basket']['sum']['preis_gesamt']); ?> <?php echo $this->get_option('wpsg_currency'); ?></strong>
</td>
</tr>
- <?php if ($this->get_option('wpsg_kleinunternehmer') == '1' || $this->get_option('wpsg_preisangaben') != '1') { ?>
+ <?php if ($this->get_option('wpsg_kleinunternehmer') == '1' || $this->get_option('wpsg_preisangaben') != WPSG_NETTO) { ?>
<?php foreach ($this->view['basket']['mwst'] as $mwst_id => $mwst) { ?>
<tr class="wpsg_row_mwst">
<td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_mwst_label">
<?php if ($this->get_option('wpsg_kleinunternehmer') == '1') { ?>
<?php echo $this->get_option('wpsg_kleinunternehmer_text'); ?>
<?php } else { ?>
- <?php if ($this->view['basket']['price_frontend'] == WPSG_NETTO) {
+ <?php
+ //if ($this->view['basket']['price_frontend'] == WPSG_NETTO) {
+ if ($this->get_option('wpsg_preisangaben') == WPSG_NETTO) {
echo wpsg_translate(__('zuzüglich MwSt. (#1#)', 'wpsg'), $mwst['name']);
} else {
echo wpsg_translate(__('darin enthaltene MwSt. (#1#)', 'wpsg'), $mwst['name']); ?>
@@ -185,7 +203,7 @@ <?php if ($this->hasMod('wpsg_mod_gutschein')) { ?>
<?php if ((array_key_exists('gs', $this->view['basket'])) && ($this->view['basket']['gs']['value'] > 0)) { ?>
- jQuery('#gsname_<?php echo $gs_id; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=voucherData&do=editname&noheader=1', {
+ jQuery('#gsname_<?php echo $gs_id; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=voucherData&do=editname&noheader=1', {
submitdata: {
field: 'code',
gs_id: '<?php echo $gs_id; ?>',
@@ -200,7 +218,7 @@ }
});
- jQuery('#gsvalue_<?php echo $gs_id; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=voucherData&do=editvalue&noheader=1', {
+ jQuery('#gsvalue_<?php echo $gs_id; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=voucherData&do=editvalue&noheader=1', {
submitdata: {
field: 'value',
gs_id: '<?php echo $gs_id; ?>',
@@ -224,7 +242,7 @@ <?php if ($this->hasMod('wpsg_mod_discount')) { ?>
<?php if (isset($this->view['basket']['sum']['preis_rabatt']) && $this->view['basket']['sum']['preis_rabatt'] > 0) { ?>
- jQuery('#discountvalue_<?php echo $o_id; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=discountData&do=editvalue&noheader=1', {
+ jQuery('#discountvalue_<?php echo $o_id; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=discountData&do=editvalue&noheader=1', {
submitdata: {
field: 'value',
edit_id: '<?php echo $o_id; ?>',
@@ -307,131 +325,598 @@ //Modul2.methode();
- var WPSG_BE_Payment = {
+ var WPSG_BE_Pay_Ship = {
+
+ paymentinfos: 0,
+ shippinginfos: 0,
+ pidold: 0,
+ sidold: 0,
+ preisold: 0.0,
+ oid: 0,
+
+ changePayment: function (id, oid) {
+ var
+ i,
+ n;
+ //jQuery('#wpsg_payment_dialog .modal-body').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
+
+ jQuery('#wpsg_payment_dialog').modal( { } );
+
+ this.paymentinfos = <?php echo json_encode($this->arPayment, JSON_FORCE_OBJECT); ?>;
+ this.oid = oid;
+ this.pidold = id;
+
+ jQuery('#zahlungsartid').empty();
+ jQuery.each(this.paymentinfos, function(i,n) {
+ console.log('element: ', n.name);
+ if (id == n.id) {
+ jQuery('#zahlungsartid').append("<option value=" + n.id + ' "selected"="selected">' + n.name + "</option>");
+ } else {
+ jQuery('#zahlungsartid').append("<option value=" + n.id + ">" + n.name + "</option>");
+ }
+ });
+ jQuery('#zahlungsartid').val(id);
+
+ //this.preis = this.paymentinfos[id].preis;
+ //this.preis = jQuery('#wpsg_cell_payment_value').val();
+ this.preis = jQuery('#wpsg_cell_payment_value').html();
+ this.preisold = this.preis;
+ if (this.preis == false) { this.preis = '0,00'; }
+ jQuery('#zahlungsartvalue').val(this.preis);
+
+ return false;
+
+ }, // function changePayment(id, oid)
+
+ /**
+ * Löschen der Zahlungsdaten im Backend
+ */
+ deletePayment: function(id, oid) {
+ var
+ pid,
+ url1;
+
+ pid = jQuery('#zahlungsartid').val();
+ pval = jQuery('#zahlungsartvalue').val();
+ //alert('delete : ' + pid + ' / ' + pval);
+
+ url1 = 'wp-admin/admin.php?page=wpsg-Admin&subaction=paymentData&do=delete&edit_id=' + this.oid + '&p_id=' + pid + '&noheader=1';
+ jQuery.ajax( {
+ url: '<?php echo WPSG_URL_WP; ?>' + url1,
+ success: function(data) {
+ //jQuery('#wpsg_payment_dialog').modal('hide');
+ //jQuery('#wpsg_payment_dialog').hide();
+ //jQuery('#wpsg_payment_dialog').modal( { } ).modal('hide');
+ jQuery('#wpsg_produkte_table').replaceWith(data);
+ }
+ } );
+
+ return false;
+
+ }, // function deletePayment()
+
+ /**
+ * Ändern der Zahlungsdaten im Backend
+ */
+ dialogPaymentOK: function() {
+ var
+ pid,
+ pval,
+ url1;
+
+ pid = jQuery('#zahlungsartid').val();
+ pval = jQuery('#zahlungsartvalue').val();
+ //alert('OK neu: ' + this.pidold + ' / ' + pid + ' / ' + pval);
+ if ((this.pidold == pid) && (this.preisold == pval)) {
+ jQuery('#wpsg_payment_dialog').modal('hide');
+ //jQuery('#wpsg_payment_dialog').modal('close');
+ return false;
+ }
+ //alert('OK neu: ' + pid + ' / ' + pval);
+
+ url1 = 'wp-admin/admin.php?page=wpsg-Admin&subaction=paymentData&do=change&edit_id=' + this.oid + '&p_id=' + pid + '&p_value=' + pval + '&noheader=1';
+ jQuery.ajax( {
+ url: '<?php echo WPSG_URL_WP; ?>' + url1,
+ data: {
+ price_frontend: '<?php echo $this->view['basket']['price_frontend']; ?>',
+ mwst: '<?php reset($this->view['basket']['mwst']); echo key($this->view['basket']['mwst']); ?>',
+ noMwSt: '<?php echo $this->view['basket']['noMwSt']; ?>' },
+ success: function(data) {
+ //jQuery('#wpsg_payment_dialog').modal('hide');
+ //jQuery('#wpsg_payment_dialog').hide();
+ //jQuery('#wpsg_payment_dialog').modal( { } ).modal('hide');
+ jQuery('#wpsg_produkte_table').replaceWith(data);
+ }
+ } );
+
+ return false;
+
+ }, // function dialogPaymentOK()
+
+ /**
+ * Ändern der Zahlungsdaten im Backend
+ */
+ dialogPaymentChange: function() {
+ var
+ pid,
+ pval;
+ pid = jQuery('#zahlungsartid').val();
+ pval = this.paymentinfos[pid].preis;
+ jQuery('#zahlungsartvalue').val(pval);
+
+
+ }, // dialogPaymentChange()
+
+
+ changeShipping: function (id, oid) {
+ var
+ i,
+ n;
+ //jQuery('#wpsg_shipping_dialog .modal-body').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
+
+ jQuery('#wpsg_shipping_dialog').modal( { } );
+
+ this.shippinginfos = <?php echo json_encode($this->arShipping, JSON_FORCE_OBJECT); ?>;
+ this.oid = oid;
+ this.sidold = id;
+
+ jQuery('#versandartid').empty();
+ jQuery.each(this.shippinginfos, function(i,n) {
+ console.log('element: ', n.name);
+ if (id == n.id) {
+ jQuery('#versandartid').append("<option value=" + n.id + ' "selected"="selected">' + n.name + "</option>");
+ } else {
+ jQuery('#versandartid').append("<option value=" + n.id + ">" + n.name + "</option>");
+ }
+ });
+ jQuery('#versandartid').val(id);
+
+ this.preis = jQuery('#wpsg_cell_shipping_value').html();
+ this.preisold = this.preis;
+ if (this.preis == false) { this.preis = '0,00'; }
+ jQuery('#versandartvalue').val(this.preis);
+
+ return false;
+
+ }, // function changeShipping(id, oid)
+
+ /**
+ * Löschen der Versanddaten im Backend
+ */
+ deleteShipping: function(id, oid) {
+ var
+ sid,
+ url1;
+
+ sid = jQuery('#versandartid').val();
+ sval = jQuery('#versandartvalue').val();
+ //alert('delete : ' + sid + ' / ' + sval);
+
+ url1 = 'wp-admin/admin.php?page=wpsg-Admin&subaction=shippingData&do=delete&edit_id=' + this.oid + '&s_id=' + sid + '&noheader=1';
+ jQuery.ajax( {
+ url: '<?php echo WPSG_URL_WP; ?>' + url1,
+ success: function(data) {
+ //jQuery('#wpsg_payment_dialog').modal('hide');
+ //jQuery('#wpsg_payment_dialog').hide();
+ //jQuery('#wpsg_payment_dialog').modal( { } ).modal('hide');
+ jQuery('#wpsg_produkte_table').replaceWith(data);
+ }
+ } );
+
+ return false;
+
+ }, // function deleteShipping()
+
+ /**
+ * Ändern der Versanddaten im Backend
+ */
+ dialogShippingOK: function() {
+ var
+ sid,
+ sval,
+ url1;
+
+ sid = jQuery('#versandartid').val();
+ sval = jQuery('#versandartvalue').val();
+ //alert('OK neu: ' + this.sidold + ' / ' + sid + ' / ' + sval);
+ if ((this.sidold == sid) && (this.preisold == sval)) {
+ jQuery('#wpsg_shipping_dialog').modal('hide');
+ //jQuery('#wpsg_shipping_dialog').modal('close');
+ return false;
+ }
+ //alert('OK neu: ' + sid + ' / ' + sval);
+
+ url1 = 'wp-admin/admin.php?page=wpsg-Admin&subaction=shippingData&do=change&edit_id=' + this.oid + '&s_id=' + sid + '&s_value=' + sval + '&noheader=1';
+ jQuery.ajax( {
+ url: '<?php echo WPSG_URL_WP; ?>' + url1,
+ data: {
+ price_frontend: '<?php echo $this->view['basket']['price_frontend']; ?>',
+ mwst: '<?php reset($this->view['basket']['mwst']); echo key($this->view['basket']['mwst']); ?>',
+ noMwSt: '<?php echo $this->view['basket']['noMwSt']; ?>' },
+ success: function(data) {
+ //jQuery('#wpsg_payment_dialog').modal('hide');
+ //jQuery('#wpsg_payment_dialog').hide();
+ //jQuery('#wpsg_payment_dialog').modal( { } ).modal('hide');
+ jQuery('#wpsg_produkte_table').replaceWith(data);
+ }
+ } );
+
+ return false;
+
+ }, // function dialogShippingOK()
+
+ /**
+ * Ändern der Versanddaten im Backend
+ */
+ dialogShippingChange: function() {
+ var
+ sid,
+ sval;
+ sid = jQuery('#versandartid').val();
+ sval = this.shippinginfos[pid].preis;
+ jQuery('#versandartvalue').val(sval);
+
+
+ }, // dialogShippingChange()
+
+ changePayment2: function (id, oid) {
- paymentinfos: 0,
- pidold: 0,
- oid: 0,
+ alert('TEST OK neu2');
- changePayment: function (id, oid) {
+ } // function changePayment2(id, oid)
+
+ }; // WPSG_BE_Pay_Ship
+ //WPSG_BE_Pay_Ship.changePayment2(1, 2);
+
+
+ var WPSG_BE_Product = {
- //alert('TEST OK neu');
+ pidold: 0,
+ preisold: 0.0,
+ o_id: 0,
+ p_id: 0,
+ op_id: 0,
+ modus: 0,
- //jQuery('#wpsg_payment_dialog .modal-body').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
+ productinfos : <?php echo json_encode($this->view['basket']['produkte'], JSON_FORCE_OBJECT); ?>,
+ mwstinfos : <?php echo json_encode(wpsg_tax_groups(true), JSON_FORCE_OBJECT); ?>,
+ allproductinfos : <?php echo json_encode($this->db->fetchAssoc("SELECT * FROM `".wpsg_q(WPSG_TBL_PRODUCTS)."` WHERE `deleted` != '1'"), JSON_FORCE_OBJECT); ?>,
+ mwst1 : <?php echo json_encode($this->view['basket']['mwst'], JSON_FORCE_OBJECT); ?>,
+ noMwSt: '<?php echo $this->view['basket']['noMwSt']; ?>',
+ mwst2: '<?php reset($this->view['basket']['mwst']); echo key($this->view['basket']['mwst']); ?>',
+
+ /**
+ * Wird aufgerufen wenn ein Produkt gelöscht werden soll
+ */
+ removeProduct: function (op_id, o_id)
+ {
+
+ if (!confirm('<?php echo __("Sind Sie sich sicher, dass Sie dieses Produkt löschen möchten?", "wpsg"); ?>')) return false;
+
+ jQuery('#wpsg_produkte_table').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
+
+ jQuery.ajax( {
+ url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=productData&do=remove&edit_id=' + o_id + '&op_id=' + op_id + '&noheader=1',
+ success: function (data) {
+ jQuery('#wpsg_produkte_table').replaceWith(data);
+ }
+ } );
+
+ return false;
+ }, // function removeProduct
+
+ /**
+ * Wird aufgerufen wenn ein Produkt hinzugefügt werden soll
+ */
+ addProduct: function (o_id, p_id) {
+ //jQuery('#wpsg_produkte_table').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
+ this.op_id = 0;
+ this.p_id = p_id;
+ this.o_id = o_id;
+
+ //alert('TEST');
+ jQuery('#wpsg_product_dialog').modal( { } );
+
+ this.modus = 1; // neues Produkt
+ jQuery('#wpsg_product_data').hide();
+
+ jQuery('#productid').empty();
+ jQuery.each(this.allproductinfos, function (i,n) {
+ jQuery('#productid').append("<option value=" + n.id + ">" + n.name + "</option>");
+ });
+ jQuery('#productid').val(p_id);
+
+
+ return false;
+ }, // function addProduct
+
+ /**
+ * Ändern der Produktdaten im Backend
+ */
+ dialogProductOK: function () {
+ var
+ pid,
+ pval,
+ pme,
+ pmwst,
+ url1;
+
+ pid = jQuery('#productid').val();
+ pval = jQuery('#productvalue').val();
+ pme = jQuery('#productmenge').val();
+ pmwst = jQuery('#productmwst').val();
+ //alert('OK neu: ' + this.pidold + ' / ' + pid + ' / ' + pval);
+ //if ((this.pidold == pid) && (this.preisold == pval)) {
+ if ((pid == null)) {
+ jQuery('#wpsg_product_dialog').modal('hide');
+ return false;
+ }
+ //alert('OK neu: ' + pid + ' / ' + pval);
- jQuery('#wpsg_payment_dialog').modal( { } )
+ if (this.modus == 0) {
+ url1 = 'wp-admin/admin.php?page=wpsg-Admin&subaction=productData&do=change&edit_id=' + this.o_id + '&op_id=' + this.op_id + '&p_id=' + pid + '&noheader=1';
+ jQuery.ajax( {
+ url: '<?php echo WPSG_URL_WP; ?>' + url1,
+ data: {
+ p_val: pval,
+ p_me: pme,
+ pidold: this.pidold,
+ mwst: this.mwst1,
+ noMwSt: this.noMwSt,
+ p_mwst: pmwst},
+ success: function(data) {
+ //jQuery('#wpsg_payment_dialog').modal('hide');
+ //jQuery('#wpsg_payment_dialog').hide();
+ //jQuery('#wpsg_payment_dialog').modal( { } ).modal('hide');
+ jQuery('#wpsg_produkte_table').replaceWith(data);
+ }
+ } );
+ } else {
+ // Neues Produkt hinzufügen
+ jQuery.ajax( {
+ url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=productData&do=add&edit_id=' + this.o_id + '&p_id=' + pid + '&noheader=1',
+ data: {
+ p_val: pval,
+ p_me: pme,
+ pidold: this.pidold,
+ mwst: this.mwst1,
+ noMwSt: this.noMwSt,
+ p_mwst: pmwst},
+ success: function(data) {
+ jQuery('#wpsg_produkte_table').replaceWith(data);
+ //jQuery('#LinkRabattNeu').hide();
+ }
+ } );
+ }
+ return false;
- /*
- jQuery.ajax({
- url: 'admin.php?page=wpsg-Admin&subaction=kundendaten&noheader=1&show=code',
- data: { 'kv_id': index },
- success: function(data) { jQuery('#wpsg_payment_dialog .modal-body').html(data); }
- });
- */
-
- this.paymentinfos = <?php echo json_encode($this->arPayment, JSON_FORCE_OBJECT); ?>;
- this.oid = oid;
- this.pidold = id;
-
- jQuery('#zahlungsartid').empty();
- jQuery.each(this.paymentinfos, function(i,n) {
- console.log('element: ', n.name);
- if (id == n.id) {
- jQuery('#zahlungsartid').append('<option value=' + n.id + ' "selected"="selected">' + n.name + '</option>');
- } else {
- jQuery('#zahlungsartid').append('<option value=' + n.id + '>' + n.name + '</option>');
- }
- });
+ }, // function dialogProduktOK()
+
+ /**
+ * Bearbeiten der Produkt-Daten
+ */
+ editProduct: function (op_id, p_id, o_id)
+ {
+ var
+ i,
+ id,
+ menge,
+ key,
+ mid,
+ n;
+
+ this.modus = 0; // bearbeiten
+ this.op_id = op_id;
+ this.p_id = p_id;
+ this.o_id = o_id;
+ //jQuery('#wpsg_produkte_table').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
- preis = this.paymentinfos[id].preis;
- if (preis == false) { preis = '0,00'; }
- jQuery('#zahlungsartvalue').val(preis);
-
- return false;
+ jQuery('#wpsg_product_dialog').modal( { } );
+ jQuery('#wpsg_product_data').show();
+
+ this.pidold = p_id;
+
+ jQuery('#productid').empty();
+ jQuery.each(this.allproductinfos, function (i,n) {
+ console.log('element: ', n.name);
+ if (p_id == n.id) {
+ jQuery('#productid').append("<option value=" + n.id + ' "selected"="selected">' + n.name + "</option>");
+ mid = n.mwst_key;
+ } else {
+ jQuery('#productid').append("<option value=" + n.id + ">" + n.name + "</option>");
+ }
+ });
+ jQuery('#productid').val(p_id);
+
+ jQuery('#productmwst').empty();
+ for (key in this.mwstinfos) {
+ if (p_id == key) {
+ jQuery('#productmwst').append("<option value=" + key + ' "selected"="selected">' + this.mwstinfos[key] + "</option>");
+ } else {
+ jQuery('#productmwst').append("<option value=" + key + ">" + this.mwstinfos[key] + "</option>");
+ }
+ }
+ jQuery('#productmwst').val(mid);
- }, // function changePayment(id, oid)
+ id = this.findIndex(op_id);
+ this.preis = this.productinfos[id].preis;
+
+ this.preisold = this.preis;
+ if (this.preis == false) { this.preis = '0,00'; }
+ jQuery('#productvalue').val(this.preis);
+ menge = this.productinfos[id].menge;
+ jQuery('#productmenge').val(menge);
+
+ return false;
+
+ }, // function editProduct()
/**
- * Ändern der Zahlungsdaten im Backend
+ * Ändern des Produktes im Backend
*/
- dialog_OK: function() {
+ dialogProductChange: function() {
var
pid,
+ id,
+ aid,
pval;
-
- pid = jQuery('#zahlungsartid').val();
- pval = jQuery('#zahlungsartvalue').val();
- alert('OK neu: ' + this.pidold + ' / ' + pid + ' / ' + pval);
- //TODO vergleichen oder nicht
- if (this.pidold == pid) {
- jQuery('#wpsg_payment_dialog').modal('hide');
- return false;
- }
- alert('OK neu: ' + pid + ' / ' + pval);
- //TODO price_frontend
- //TODO Frontend-Rabatt/Frontend-Gutschein bei Firmenkunde in Netto oder Brutto in der Datenbank?
-
- //TODO
- //field: 'value',
- //gs_id: '<?php echo $gs_id; ?>',
- //edit_id: '<?php echo $o_id; ?>',
- //noMwSt: '<?php echo $this->view['basket']['noMwSt']; ?>',
- //mwst: '<?php reset($this->view['basket']['mwst']); echo key($this->view['basket']['mwst']); ?>',
- //price_frontend: '<?php echo $this->view['basket']['price_frontend']; ?>'
- //data: { name: "John", location: "Boston" }
-
- data1: {
- //price_frontend: '<?php echo $this->view['basket']['price_frontend']; ?>',
- //noMwSt: '<?php echo $this->view['basket']['noMwSt']; ?>'
+ pid = jQuery('#productid').val();
+ aid = this.findAllIndex(pid);
+ if (aid !== false) {
+ pval = this.allproductinfos[aid].name;
+ id = this.findIndex(this.op_id);
+ pval = this.allproductinfos[aid].preis;
+ jQuery('#productvalue').val(pval);
+ jQuery('#productmenge').val(1);
+ pval = this.allproductinfos[aid].mwst_key;
+ jQuery('#productmwst').val(pval);
}
-
- url1 = 'wp-admin/admin.php?page=wpsg-Admin&subaction=paymentData&do=change&edit_id=' + this.oid + '&p_id=' + pid + '&p_value=' + pval + '&noheader=1';
- jQuery.ajax( {
- url: '<?php echo WPSG_URL_WP; ?>' + url1,
- dataType: 'json',
- data: {
- price_frontend: '<?php echo $this->view['basket']['price_frontend']; ?>',
- noMwSt: '<?php echo $this->view['basket']['noMwSt']; ?>' },
- method: 'POST',
- success: function(data) {
- jQuery('#wpsg_produkte_table').replaceWith(data);
+
+ }, // dialogProductChange()
+
+ /**
+ * Suchen des Indexes in allproductinfos an Hand der id
+ */
+ findAllIndex: function(id) {
+ var
+ pid,
+ pval;
+ for (key in this.allproductinfos) {
+ if (id == this.allproductinfos[key].id) {
+ return key;
}
- } );
-
+ }
return false;
-
- }, // function dialog_OK()
+ }, // findAllIndex()
+
/**
- * Ändern der Zahlungsdaten im Backend
+ * Suchen des Indexes in productinfos an Hand der order_product_id
*/
- dialog_change: function() {
+ findIndex: function(id) {
var
pid,
pval;
- pid = jQuery('#zahlungsartid').val();
- pval = this.paymentinfos[pid].preis;
- jQuery('#zahlungsartvalue').val(pval);
-
-
- }, // dialog_change()
+ for (key in this.productinfos) {
+ if (id == this.productinfos[key].order_product_id) {
+ return key;
+ }
+ }
+ return false;
+ }, // findIndex()
- changePayment2: function (id, oid) {
+ changeProduct2: function (id, oid) {
alert('TEST OK neu2');
- } // function wpsg_changePayment2(id, oid)
+ } // function changeProduct2(id, oid)
- }; // WPSG_BE_Payment
- //WPSG_BE_Payment.changePayment2(1, 2);
-
+ }; // WPSG_BE_Product
+ //WPSG_BE_Product.changeProduct2(1, 2);
/* ]]> */</script>
-
</div>
+
+<!-- Modaldialog für Produkte -->
+<div class="modal fade" id="wpsg_product_dialog" tabindex="-1" role="dialog">
+ <div class="modal-dialog" role="document">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+ <h4 class="modal-title" id="myModalLabel"><?php echo __('Produkt', 'wpsg'); ?></h4>
+ </div>
+ <div class="modal-body">
+ <br />
+ <div class="row">
+ <div class="col-md-3 col-sm-6 control_label"><label for="productid" ><?php echo _("Produkt"); ?></label></div>
+ <div class="col-md-3">
+ <select name="productid" id="productid" onchange="return WPSG_BE_Product.dialogProductChange();" class="form-control input-sm" size="1" class="select">
+ <option value=0>"[unbekannt]"</option>
+ </select>
+ </div>
+ </div>
+ <div class="clearfix wpsg_clear"></div>
+ <div class="clearfix wpsg_clear"></div>
+
+ <div id="wpsg_product_data">
+ <div class="row">
+ <div class="col-md-3 col-sm-6 control_label"><label for="productvalue"><?php echo _("Preis"); ?></label></div>
+ <div class="col-md-3">
+ <input type="text" name="productvalue" id="productvalue" class="form-control input-sm" size="1" class="select">
+ </div>
+ </div>
+ <div class="clearfix wpsg_clear"></div>
+ <div class="row">
+ <div class="col-md-3 col-sm-6 control_label"><label for="productmenge"><?php echo _("Menge"); ?></label></div>
+ <div class="col-md-3">
+ <input type="text" name="productmenge" id="productmenge" class="form-control input-sm" size="1" class="select">
+ </div>
+ </div>
+ <div class="clearfix wpsg_clear"></div>
+ <div class="row">
+ <div class="col-md-3 col-sm-6 control_label"><label for="productid" ><?php echo _("MwSt:"); ?></label></div>
+ <div class="col-md-3">
+ <select name="productmwst" id="productmwst" class="form-control input-sm" size="1" class="select">
+ <option value=0>"[unbekannt]"</option>
+ </select>
+ </div>
+ </div>
+ <div class="clearfix wpsg_clear"></div>
+
+ </div>
+
+ </div>
+ <div class="modal-footer">
+ <button type="button" class="btn btn-default" data-dismiss="modal">Abbrechen</button>
+ <button type="button" class="btn btn-primary" data-dismiss="modal" onclick="return WPSG_BE_Product.dialogProductOK();">OK</button>
+ </div>
+ </div>
+ </div>
+</div>
+
+
+<!-- Modaldialog für Versandart -->
+<div class="modal fade" id="wpsg_shipping_dialog" tabindex="-1" role="dialog">
+ <div class="modal-dialog" role="document">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+ <h4 class="modal-title" id="myModalLabel"><?php echo __('Versandart', 'wpsg'); ?></h4>
+ </div>
+ <div class="modal-body">
+ <br />
+ <div class="row">
+ <div class="col-md-3 col-sm-6 control_label"><label for="versandartid" ><?php echo _("Versandart"); ?></label></div>
+ <div class="col-md-3">
+ <select name="versandartid" id="versandartid" onchange="return WPSG_BE_Pay_Ship.dialogShippingChange();" class="form-control input-sm" size="1" class="select">
+ <option value=0>"[unbekannt]"</option>
+ </select>
+ </div>
+ </div>
+ <div class="clearfix wpsg_clear"></div>
+ <div class="clearfix wpsg_clear"></div>
+ <br />
+ <div class="row">
+ <div class="col-md-3 col-sm-6 control_label"><label for="versandartvalue"><?php echo _("Gebühr/Kosten"); ?></label></div>
+ <div class="col-md-3">
+ <input type="text" name="versandartvalue" id="versandartvalue" class="form-control input-sm" size="1" class="select">
+ </div>
+ </div>
+ <div class="clearfix wpsg_clear"></div>
+
+ </div>
+ <div class="modal-footer">
+ <button type="button" class="btn btn-default" data-dismiss="modal">Abbrechen</button>
+ <button type="button" class="btn btn-primary" data-dismiss="modal" onclick="return WPSG_BE_Pay_Ship.dialogShippingOK();">OK</button>
+ </div>
+ </div>
+ </div>
+</div>
+
+
<!-- Modaldialog für Zahlungsart -->
<div class="modal fade" id="wpsg_payment_dialog" tabindex="-1" role="dialog">
<div class="modal-dialog" role="document">
@@ -445,7 +930,7 @@ <div class="row">
<div class="col-md-3 col-sm-6 control_label"><label for="zahlungsartid" ><?php echo _("Zahlungsart"); ?></label></div>
<div class="col-md-3">
- <select name="zahlungsartid" id="zahlungsartid" onchange="return WPSG_BE_Payment.dialog_change();" class="form-control input-sm" size="1" class="select">
+ <select name="zahlungsartid" id="zahlungsartid" onchange="return WPSG_BE_Pay_Ship.dialogPaymentChange();" class="form-control input-sm" size="1" class="select">
<option value=0>"[unbekannt]"</option>
</select>
</div>
@@ -464,7 +949,7 @@ </div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Abbrechen</button>
- <button type="button" class="btn btn-primary" onclick="return WPSG_BE_Payment.dialog_OK();">OK</button>
+ <button type="button" class="btn btn-primary" data-dismiss="modal" onclick="return WPSG_BE_Pay_Ship.dialogPaymentOK();">OK</button>
</div>
</div>
</div>
|