From 703a450908599b3ebc8018f41f54e510bb0dc255 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Fri, 4 Mar 2016 21:04:26 +0000
Subject: - Übernahme neuer Funktionen aus dem alten Zweig / Pfad /
 Einstellungen / Hilfe Icons / Berechnung - Neuer Modulfilter im neuen Backend
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5382 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_willcollect/settings_edit.phtml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'views/mods/mod_willcollect/settings_edit.phtml')

diff --git a/views/mods/mod_willcollect/settings_edit.phtml b/views/mods/mod_willcollect/settings_edit.phtml
index 1a5fd1b..2b55965 100644
--- a/views/mods/mod_willcollect/settings_edit.phtml
+++ b/views/mods/mod_willcollect/settings_edit.phtml
@@ -9,6 +9,7 @@
 <?php echo wpsg_drawForm_Input('wpsg_mod_willcollect_bezeichnung', __('Bezeichnung', 'wpsg'), $this->get_option('wpsg_mod_willcollect_bezeichnung'), array('help' => 'wpsg_mod_willcollect_bezeichnung')); ?>
 <?php echo wpsg_drawForm_Textarea('wpsg_mod_willcollect_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_willcollect_hint'), array('help' => 'wpsg_mod_willcollect_hint')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_willcollect_paymentneed', __('Selbstabholung erfordert Barzahlung', 'wpsg'), $this->get_option('wpsg_mod_willcollect_paymentneed'), array('help' => 'wpsg_mod_willcollect_paymentneed')); ?>
+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_willcollect_dontMerge', __('Selbstabholung nicht kombinieren', 'wpsg'), $this->get_option('wpsg_mod_willcollect_dontMerge'), array('help' => 'wpsg_mod_willcollect_dontMerge')); ?>
 <br />
 <?php echo wpsg_drawForm_Input('wpsg_mod_willcollect_adress', __('Anschrift', 'wpsg'), $this->get_option('wpsg_mod_willcollect_adress'), array('help' => 'wpsg_mod_willcollect_adress')); ?>
 <?php echo wpsg_drawForm_Input('wpsg_mod_willcollect_street', __('Straße', 'wpsg'), $this->get_option('wpsg_mod_willcollect_street'), array('help' => 'wpsg_mod_willcollect_street')); ?>
-- 
cgit v1.2.3