diff options
| -rw-r--r-- | views/css/frontend.css | 2 | ||||
| -rw-r--r-- | views/mods/mod_kundenkontakt/order_view.phtml | 128 | ||||
| -rw-r--r-- | views/order/product_table.phtml | 14 | ||||
| -rw-r--r-- | views/warenkorb/basket.phtml | 41 | ||||
| -rw-r--r-- | views/warenkorb/overview.phtml | 28 |
5 files changed, 108 insertions, 105 deletions
diff --git a/views/css/frontend.css b/views/css/frontend.css index bd0c414..66b5d7f 100644 --- a/views/css/frontend.css +++ b/views/css/frontend.css @@ -69,7 +69,7 @@ input.wpsg_error { border-color:red !important; } .basket_sum_wrap .wpsg_mod_basketteaser_row .valuer { width: 20%; display:inline-block; font-weight:normal; text-align:right; }
.basket_sum_wrap .wpsg_mod_basketteaser_row .valuel { width: 20%; display:inline-block; font-weight:normal; text-align:left; }
.basket_sum_wrap .wpsg_gutschein_add {padding:0.75em 1em;}
-.procent_payship { font-size:0.75em; line-height:0.75em; color:#666666; displaY:block; }
+.procent_payship { font-size:0.75em; line-height:0.75em; color:#666666; displaY:block; margin-bottom:10px; }
/* .glyphicon {width:20px !important; text-decoration:none; position:relative; display:inline-block; font-family:'Glyphicons Halflings'; line-height:1rem;} */
.wpsg_basket .wpsg_checkoutbutton { float:right; padding:0.75em 1em; }
diff --git a/views/mods/mod_kundenkontakt/order_view.phtml b/views/mods/mod_kundenkontakt/order_view.phtml index f1695f6..21902ee 100644 --- a/views/mods/mod_kundenkontakt/order_view.phtml +++ b/views/mods/mod_kundenkontakt/order_view.phtml @@ -175,80 +175,82 @@ <?php echo wpsg_drawForm_AdminboxEnd(); ?>
-<?php echo wpsg_drawForm_AdminboxStart(__('SMS Versand', 'wpsg'));?>
-
- <div class="inside">
- <div style="padding:5px;">
-
- <form id="sms_form" method="post" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_kundenkontakt&edit_id=<?php echo $this->view['data']['id']; ?>&do=sms_submit&noheader=1">
+<?php if ($this->get_option('wpsg_mod_kundenkontakt_smsflatrate_active') === '1') { ?>
+ <?php echo wpsg_drawForm_AdminboxStart(__('SMS Versand', 'wpsg'));?>
- <input type="hidden" name="_wpnonce" value="<?php echo \wp_create_nonce('wpsg_mod_kundenkontakt_sms_form_'.$this->view['data']['id']); ?>" />
-
- <p>Mit diesem Formular kann eine SMS an den Kunden versendet werden.</p>
-
- <br />
-
- <div id="numbercheck">
- <?php if ($this->view['valid'] === true) { ?>
+ <div class="inside">
+ <div style="padding:5px;">
+
+ <form id="sms_form" method="post" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_kundenkontakt&edit_id=<?php echo $this->view['data']['id']; ?>&do=sms_submit&noheader=1">
+
+ <input type="hidden" name="_wpnonce" value="<?php echo \wp_create_nonce('wpsg_mod_kundenkontakt_sms_form_'.$this->view['data']['id']); ?>" />
- <div class="alert alert-success">
- <?php echo wpsg_translate(__('Die Telefonnummer #1# ist gültig.', 'wpsg'), $this->view['phone']); ?>
- </div>
+ <p>Mit diesem Formular kann eine SMS an den Kunden versendet werden.</p>
+
+ <br />
+
+ <div id="numbercheck">
+ <?php if ($this->view['valid'] === true) { ?>
- <?php } else { ?>
+ <div class="alert alert-success">
+ <?php echo wpsg_translate(__('Die Telefonnummer #1# ist gültig.', 'wpsg'), $this->view['phone']); ?>
+ </div>
+
+ <?php } else { ?>
+
+ <div class="alert alert-danger">
+ <?php echo wpsg_translate(__('Die Telefonnummer #1# ist nicht gültig.', 'wpsg'), $this->view['phone']); ?>
+ </div>
+
+ <?php } ?>
+ </div>
- <div class="alert alert-danger">
- <?php echo wpsg_translate(__('Die Telefonnummer #1# ist nicht gültig.', 'wpsg'), $this->view['phone']); ?>
- </div>
+ <br />
- <?php } ?>
- </div>
-
- <br />
-
- <?php echo wpsg_drawForm_Input('phone', __('Empfänger', 'wpsg'), $this->view['phone']); ?>
-
- <br />
+ <?php echo wpsg_drawForm_Input('phone', __('Empfänger', 'wpsg'), $this->view['phone']); ?>
+
+ <br />
+
+ <textarea id="text" name="text" <?php echo (($this->view['valid'] === true)?'':'disabled="disabled"'); ?> style="width:100%; height:100px;"></textarea>
+
+ <input type="submit" id="sms_submit" <?php echo (($this->view['valid'] === true)?'':'disabled="disabled"'); ?> value="<?php echo __('SMS Senden', 'wpsg'); ?>" class="button" style="float:right; margin-top:15px;" />
+
+ <script>
+
+ jQuery('#phone').on('input', function() {
- <textarea id="text" name="text" <?php echo (($this->view['valid'] === true)?'':'disabled="disabled"'); ?> style="width:100%; height:100px;"></textarea>
+ jQuery('#numbercheck').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
+
+ jQuery('#text').prop('disabled', true);
+ jQuery('#sms_submit').prop('disabled', true);
+
+ jQuery.ajax( {
+ url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_kundenkontakt&noheader=1&edit_id=<?php echo $_REQUEST['edit_id']; ?>&do=validateNumber',
+ data: {
+ 'phone': jQuery('#phone').val()
+ },
+ success: function(data) {
- <input type="submit" id="sms_submit" <?php echo (($this->view['valid'] === true)?'':'disabled="disabled"'); ?> value="<?php echo __('SMS Senden', 'wpsg'); ?>" class="button" style="float:right; margin-top:15px;" />
+ if (data.valid) {
+
+ jQuery('#text').prop('disabled', false);
+ jQuery('#sms_submit').prop('disabled', false);
+
+ }
- <script>
-
- jQuery('#phone').on('input', function() {
-
- jQuery('#numbercheck').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
-
- jQuery('#text').prop('disabled', true);
- jQuery('#sms_submit').prop('disabled', true);
-
- jQuery.ajax( {
- url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_kundenkontakt&noheader=1&edit_id=<?php echo $_REQUEST['edit_id']; ?>&do=validateNumber',
- data: {
- 'phone': jQuery('#phone').val()
- },
- success: function(data) {
-
- if (data.valid) {
-
- jQuery('#text').prop('disabled', false);
- jQuery('#sms_submit').prop('disabled', false);
+ jQuery('#numbercheck').html(data.text);
}
-
- jQuery('#numbercheck').html(data.text);
-
- }
+ } );
+
} );
- } );
+ </script>
- </script>
-
- </form>
-
+ </form>
+
+ </div>
</div>
- </div>
-
-<?php echo wpsg_drawForm_AdminboxEnd(); ?>
\ No newline at end of file +
+ <?php echo wpsg_drawForm_AdminboxEnd(); ?>
+<?php } ?>
diff --git a/views/order/product_table.phtml b/views/order/product_table.phtml index abadd4a..88763c6 100644 --- a/views/order/product_table.phtml +++ b/views/order/product_table.phtml @@ -119,9 +119,17 @@ <td class="wpsg_cell_mwst"><?php echo $arTaxShort[$v['tax_key']]; ?></td>
<?php } ?>
<td>1</td>
- <td class="wpsg_cell_mwst_value wpsg_cell_gesamtpreis">
- <?php echo wpsg_ff($arCalculation['sum']['voucher_'.$display]); ?> <?php echo $this->get_option('wpsg_currency'); ?>
- </td>
+ <td class="wpsg_cell_mwst_value wpsg_cell_gesamtpreis"><?php
+
+ echo wpsg_ff($arCalculation['sum']['voucher_'.$display]); ?> <?php echo $this->get_option('wpsg_currency');
+
+ if (strpos($arCalculation['voucher'][0]['set'], '%') !== false) {
+
+ echo '<span class="procent_payship">('.wpsg_ff(wpsg_tf($arCalculation['voucher'][0]['set']), '%').')</span>';
+
+ }
+
+ ?></td>
</tr>
<?php } ?>
diff --git a/views/warenkorb/basket.phtml b/views/warenkorb/basket.phtml index 0f2c471..0d79675 100644 --- a/views/warenkorb/basket.phtml +++ b/views/warenkorb/basket.phtml @@ -141,32 +141,29 @@ <?php $bLine = false; ?>
<?php if (isset($this->view['basket']['gs'])) { $bLine = true; ?>
+
<div class="basket_sum_row">
- <div class="titlegs">
+ <div class="title">
+ <a class="wpsg_basket_removelink" href="<?php echo str_replace('&', '&', $this->getRemoveLinkURL('gs')); ?>" title="<?php echo __('Gutschein aus dem Warenkorb entfernen', 'wpsg'); ?>" onclick="return confirm('<?php echo __('Sind Sie sich sicher, dass sie den Gutschein aus dem Warenkorb entfernen möchten?', 'wpsg'); ?>');"><span class="glyphicon glyphicon-trash"></span></a>
<?php echo __('Gutschein', 'wpsg'); ?> <?php echo ($this->view['basket']['gs']['code'] != '')? '('.$this->view['basket']['gs']['code'].')':'' ?>
</div>
- <div class="wpsg_basket_removelink">
- <a class="wpsg_basket_removelink" href="<?php echo str_replace('&', '&', $this->getRemoveLinkURL('gs')); ?>" title="<?php echo __('Gutschein aus dem Warenkorb entfernen', 'wpsg'); ?>" onclick="return confirm('<?php echo __('Sind Sie sich sicher, dass sie den Gutschein aus dem Warenkorb entfernen möchten?', 'wpsg'); ?>');">
- <!-- <img src="<?php echo WPSG_URL; ?>views/gfx/bin_x.png" alt="<?php echo __('Löschen', 'wpsg'); ?>" /> -->
- <span class="glyphicon glyphicon-trash"></span>
- </a>
- </div>
+ <?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
+ <div class="colgsr"><?php echo __('anteilig', 'wpsg'); ?></div>
+ <?php } ?>
+ <div class="value"><?php
+
+ echo '-'.wpsg_ff($this->view['basket']['sum']['gs'], $this->get_option('wpsg_currency'));
+
+ if (strpos($this->view['basket']['arCalculation']['voucher'][0]['set'], '%') !== false) {
+
+ echo '<span class="procent_payship">('.wpsg_ff(wpsg_tf($this->view['basket']['arCalculation']['voucher'][0]['set']), '%').')</span>';
+
+ }
+
+ ?></div>
+
</div>
- <div class="basket_sum_row">
- <div class="delgs"> </div>
- <div class="colgsl">1</div>
- <div class="colgsl">
- <?php if ($this->view['basket']['gs']['calc'] == 'p') { ?>
- <?php echo '-'.wpsg_ff($this->view['basket']['gs']['value'], '%'); ?>
- <?php } else { ?>
- <?php echo '-'.wpsg_ff($this->view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?>
- <?php } ?>
- </div>
- <?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
- <div class="colgsr"><?php echo __('anteilig', 'wpsg'); ?></div>
- <?php } ?>
- <div class="colgsr"><?php echo '-'.wpsg_ff($this->view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?></div>
- </div>
+
<?php } ?>
<div class="basket_sum_row">
diff --git a/views/warenkorb/overview.phtml b/views/warenkorb/overview.phtml index a691164..4e5453c 100644 --- a/views/warenkorb/overview.phtml +++ b/views/warenkorb/overview.phtml @@ -269,25 +269,21 @@ <?php $bLine = false; ?>
<?php if (isset($this->view['basket']['gs'])) { $bLine = true; ?>
<div class="overview_sum_row">
- <div class="titlegs">
+ <div class="title">
<?php echo __('Gutschein', 'wpsg'); ?> <?php echo ($this->view['basket']['gs']['code'] != '')? '('.$this->view['basket']['gs']['code'].')':'' ?>
</div>
+ <div class="value"><?php
+
+ echo '-'.wpsg_ff($this->view['basket']['sum']['gs'], $this->get_option('wpsg_currency'));
+
+ if (strpos($this->view['basket']['arCalculation']['voucher'][0]['set'], '%') !== false) {
+
+ echo '<span class="procent_payship">('.wpsg_ff(wpsg_tf($this->view['basket']['arCalculation']['voucher'][0]['set']), '%').')</span>';
+
+ }
+
+ ?></div>
</div>
- <div class="overview_sum_row">
- <div class="delgs"> </div>
- <div class="colgsl">1</div>
- <div class="colgsl">
- <?php if ($this->view['basket']['gs']['calc'] == 'p') { ?>
- <?php echo '-'.wpsg_ff($this->view['basket']['gs']['value'], '%'); ?>
- <?php } else { ?>
- <?php echo '-'.wpsg_ff($this->view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?>
- <?php } ?>
- </div>
- <?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
- <div class="colgsr"><?php echo __('anteilig', 'wpsg'); ?></div>
- <?php } ?>
- <div class="colgsr"><?php echo '-'.wpsg_ff($this->view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?></div>
- </div>
<?php } ?>
<div class="overview_sum_row">
|