Korrekturen, Anpassungen

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6009 0d5edaf7-2b12-4e95-93f4-047927463d4b

4 files changed, 10 insertions, 13 deletions

diff --git a/views/mods/mod_customergroup/index.phtml b/views/mods/mod_customergroup/index.phtml
index 30ae59e..c1360e5 100644
--- a/views/mods/mod_customergroup/index.phtml
+++ b/views/mods/mod_customergroup/index.phtml
@@ -47,7 +47,7 @@
 

     </nav>

 

-    <?php if ($this->view['pages'] > 1) { ?>

+    <?php if ($this->view['pages'] > $this->get_option('wpsg_mod_kundenverwaltung_group_perpage')) { ?>

         <nav class="pagination_wrap">

             <ul class="pagination">

                 <?php if ($this->view['arFilter']['page'] > 1) { ?>

@@ -109,7 +109,7 @@
                 </tbody>

             </table>

 

-            <?php if ($this->view['pages'] > 1) { ?>

+            <?php if ($this->view['pages'] > $this->get_option('wpsg_mod_kundenverwaltung_group_perpage')) { ?>

                 <nav class="pagination_wrap pagination_wrap_bottom">

                     <ul class="pagination">

                         <?php if ($this->view['arFilter']['page'] > 1) { ?>

diff --git a/views/mods/mod_customergroup/settings_edit.phtml b/views/mods/mod_customergroup/settings_edit.phtml
index ae69c5c..291edb3 100644
--- a/views/mods/mod_customergroup/settings_edit.phtml
+++ b/views/mods/mod_customergroup/settings_edit.phtml
@@ -5,5 +5,7 @@
 	 */

 

 ?>

+<?php echo wpsg_drawForm_Input('wpsg_mod_kundenverwaltung_group_perpage', __('Kundengruppen pro Seite (Backend)', 'wpsg'), $this->get_option('wpsg_mod_kundenverwaltung_group_perpage'), array('help' => 'wpsg_mod_kundenverwaltung_group_perpage')); ?>

+

 <?php echo wpsg_drawForm_Select('wpsg_page_mod_kundenverwaltung_group_checkout', __('Kundengruppe bei Registrierung (Checkout)', 'wpsg'), $this->view['arCustomergroup'], $this->get_option('wpsg_page_mod_kundenverwaltung_group_checkout'), array('help' => 'wpsg_page_mod_kundenverwaltung_group_checkout')); ?>

 <?php echo wpsg_drawForm_Select('wpsg_page_mod_kundenverwaltung_group_register', __('Kundengruppe bei Registrierung (Registrierung)', 'wpsg'), $this->view['arCustomergroup'], $this->get_option('wpsg_page_mod_kundenverwaltung_group_register'), array('help' => 'wpsg_page_mod_kundenverwaltung_group_register')); ?>

diff --git a/views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml b/views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml
index f690203..2f9f40f 100644
--- a/views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml
+++ b/views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml
@@ -9,12 +9,12 @@
 <?php echo wpsg_drawForm_AdminboxStart(__('Lieferzeit', 'wpsg')); ?>

 

 	<?php if ($this->get_option('wpsg_mod_deliverytime_mode') == wpsg_mod_deliverytime::MODE_SELECT) { ?>

-		<?php echo wpsg_drawForm_Select('wpsg_mod_deliverytime[wpsg_mod_deliverytime_deliverytime]', __('Lieferzeit', 'wpsg'), $this->view['wpsg_mod_deliverytime']['arSelection'], $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_deliverytime'], array('noIndex' => true)); ?>

+		<?php echo wpsg_drawForm_Select('wpsg_mod_deliverytime[wpsg_mod_deliverytime_deliverytime]', __('Lieferzeit', 'wpsg'), $this->view['wpsg_mod_deliverytime']['arSelection'], $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_deliverytime'], array('noIndex' => true, 'help' => 'wpsg_mod_deliverytime_select')); ?>

 	<?php } else if ($this->get_option('wpsg_mod_deliverytime_mode') == wpsg_mod_deliverytime::MODE_DAYS) { ?>

-		<?php echo wpsg_drawForm_Input('wpsg_mod_deliverytime[wpsg_mod_deliverytime_deliverytime]', __('Lieferzeit', 'wpsg'), $this->view['wpsg_mod_deliverytime']['deliverytime'], array('unit' => __('Tage', 'wpsg'))); ?>

+		<?php echo wpsg_drawForm_Input('wpsg_mod_deliverytime[wpsg_mod_deliverytime_deliverytime]', __('Lieferzeit', 'wpsg'), wpsg_getStr($this->view['wpsg_mod_deliverytime']['deliverytime']), array('unit' => __('Tage', 'wpsg'), 'help' => 'wpsg_mod_deliverytime_input')); ?>

 	<?php } ?>

 	<?php if (wpsg_isSizedInt($this->get_option('wpsg_mod_deliverytime_store'))) {?>

-		<?php echo wpsg_drawForm_Checkbox('wpsg_mod_deliverytime[wpsg_mod_deliverytime_storeproduct]', __('Als Offlineprodukt anzeigen', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct']);?>

+		<?php echo wpsg_drawForm_Checkbox('wpsg_mod_deliverytime[wpsg_mod_deliverytime_storeproduct]', __('Als Offlineprodukt anzeigen', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct'], array('help' => 'wpsg_mod_deliverytime_store'));?>

 	<?php } ?>

 	

 	<br />

diff --git a/views/mods/mod_discount/customergroup_edit.phtml b/views/mods/mod_discount/customergroup_edit.phtml
index f826a2e..69a6f39 100644
--- a/views/mods/mod_discount/customergroup_edit.phtml
+++ b/views/mods/mod_discount/customergroup_edit.phtml
@@ -5,12 +5,7 @@
 	 */

 

 ?>

-<div id="wpsg_customerpasswd" class="postbox">

-	<div class="handlediv" title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>"><br /></div>

-	<h3 class="wpsg_handlediv">

-		<span><?php echo __('Kundengruppenrabatt', 'wpsg'); ?></span>

-	</h3>

-	<div class="inside">

-		<?php echo wpsg_drawForm_Input('wpsg_mod_discount[discount]', __('Rabatt', 'wpsg'), wpsg_ff($this->view['wpsg_mod_discount']['discount'])); ?>

-	</div>

+<div id="wpsg_customerpasswd" >

+	<?php echo wpsg_drawForm_Input('wpsg_mod_discount[discount]', __('Rabatt', 'wpsg'), wpsg_ff($this->view['wpsg_mod_discount']['discount'])); ?>

+

 </div>
\ No newline at end of file