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

2 files changed, 37 insertions, 16 deletions

diff --git a/views/admin/dataprotection.phtml b/views/admin/dataprotection.phtml
index 5352dbd..c67433b 100644
--- a/views/admin/dataprotection.phtml
+++ b/views/admin/dataprotection.phtml
@@ -38,22 +38,38 @@
 	  			</div>

   			 			

   			</div>

-		</div>

-		<?php /* ?>

-		<div class="panel panel-default">

-  			<div class="panel-heading clearfix">

-          		<h3 class="panel-title"><?php echo __('Hinweistexte zur DSGVO', 'wpsg'); ?></h3>

-        	</div>

-  			<div class="panel-body">

-	  			<?php echo wpsg_drawForm_Checkbox('dataprotectioncommissioner_texts', __('zusätzliche Hinweistexte integrieren', 'wpsg'), $this->get_option('dataprotectioncommissioner_texts')); ?>

-	  			<div class="dataprotectioncommissioner_textsactiv" style="display:none;">	  				

-					<?php echo wpsg_drawForm_Textarea('dataprotectioncommissioner_baskettext', __('Hinweis oberhalb des Buttons "zahlungspflichtig bestellen"', 'wpsg'), $this->get_option('dataprotectioncommissioner_baskettext'), array(

-					'hint' => 'nohspc_'.__('Dieser Text wird in die Bestellabschlussseite (oberhalb des Buttons "zahlungspflichtig bestellen" integriert.', 'wpsg')

-					)); ?>  	

-				</div>	  			  			 			

-  			</div>

-		</div>

-		<?php */ ?>			

+  			

+  			<hr>

+  			

+  			<?php /* Datenschutzhinweis an alle bestehenden Kunden versenden - Upload und Versendebutton */ ?>

+			<?php echo wpsg_drawForm_Upload('wpsg_tom', __('Technisch-Organisatorische Maßnahmen (TOM)', 'wpsg')); ?>

+			

+			<br />

+			

+			<?php /* Datenschutzhinweis an neue Kunden mittels Bestellbestätigung versenden (Checkbox) */ ?>

+			<?php echo wpsg_drawForm_Checkbox('wpsg_tom_kundenmail', __('Anhang an Bestellbestätigung', 'wpsg'), $this->get_option('wpsg_tom_kundenmail')); ?>

+			

+			<?php /* Datenschutzhinweis an neue Kunden mit Rechnungsversand versenden (Checkbox) */ ?>

+			<?php if ($this->hasMod('wpsg_mod_rechnungen')) { ?>

+				<?php echo wpsg_drawForm_Checkbox('wpsg_tom_invoice', __('Anhang an Rechnung', 'wpsg'), $this->get_option('wpsg_tom_invoice')); ?>

+			<?php } ?>

+			

+			<?php /* Datenschutzhinweis an neue Kunden mit Auftragsbestätigung versenden (Checkbox) */ ?>

+			<?php if ($this->hasMod('wpsg_mod_auftragsbestaetigung')) { ?>

+				<?php echo wpsg_drawForm_Checkbox('wpsg_tom_orderconfirm', __('Anhang an Auftragsbestätigung', 'wpsg'), $this->get_option('wpsg_tom_orderconfirm')); ?>

+			<?php } ?>

+			

+			<br />

+			

+			<?php echo wpsg_drawForm_TextStart(); ?>

+				<div role="presentation">

+				

+					<a target="_blank" href="<?php echo WPSG_URL_UPLOADS.'wpsg_toms/'.$this->get_option('wpsg_toms'); ?>"><span class="glyphicon glyphicon-export"></span><?php echo __('gespeichertes PDF-Dokument', 'wpsg');?></a>			

+				

+				</div>

+			<?php echo wpsg_drawForm_TextEnd(); ?>

+

+		</div>		

 		<p class="submit"><input type="submit" value="<?php echo __('Einstellungen speichern', 'wpsg'); ?>" class="button-primary" id="submit" name="submit" /></p>

 		

 		<script type="text/javascript">/* <![CDATA[ */

diff --git a/views/css/frontend.css b/views/css/frontend.css
index ada3331..3c2af4c 100644
--- a/views/css/frontend.css
+++ b/views/css/frontend.css
@@ -376,6 +376,11 @@ input.wpsg_error { border-color:red !important; }
 .wpsg_progress span.done:after { content:" "; background-color:#C5C5C5; width:100%; height:10px; display:block; top:0px; position:absolute; }

 .wpsg_progress span.current:after { width:50%; }  

   

+/* Modul "EinSeitenCheckout */  

+.onepagecheckout_customer_guest_activ .wpsg_mod_shippingadress h2, 

+.onepagecheckout_customer_guest_activ .wpsg_mod_shippingadress .wpsg_spacer { display:none; }  

+.onepagecheckout_customer_guest_activ .wpsg_mod_shippingadress .wpsg_inner { margin-bottom:20px; }

+ 

 /* Modul "CrowdFunding" */

 .wpsg_mod_funding_progress .wpsg_mod_funding_state { border:1px solid #C5C5C5; margin-bottom:1rem; box-sizing:border-box; width:100%; height:25px; line-height:25px; }

 .wpsg_mod_funding_progress .wpsg_mod_funding_state > .bar {  width:90%; float:left; height:100%; display:table; }