Index: /changelog
===================================================================
--- /changelog	(revision 7238)
+++ /changelog	(revision 7239)
@@ -193,2 +193,5 @@
 - Feature: Bestellung im Backend anlegen
 - Feature: Anrede in Kundenmails wird jetzt angezeigt und ist ÃŒbersetzbar
+
+#4.1.1
+- Feature: Integration der Daten fÃŒr eine Zweigstelle (Shopinfo)
Index: /controller/wpsg_AdminController.class.php
===================================================================
--- /controller/wpsg_AdminController.class.php	(revision 7238)
+++ /controller/wpsg_AdminController.class.php	(revision 7239)
@@ -284,6 +284,14 @@
 				$this->shop->update_option('wpsg_shopdata_zip', $_REQUEST['wpsg_shopdata_zip'], false, true);
 				$this->shop->update_option('wpsg_shopdata_city', $_REQUEST['wpsg_shopdata_city'], false, true);
-				$this->shop->update_option('wpsg_shopdata_city', $_REQUEST['wpsg_shopdata_city'], false, true);
-
+
+				$this->shop->update_option('wpsg_shopdata_2', $_REQUEST['wpsg_shopdata_2'], false, true);
+				$this->shop->update_option('wpsg_shopdata_2_street', $_REQUEST['wpsg_shopdata_2_street'], false, true);
+				$this->shop->update_option('wpsg_shopdata_2_zip', $_REQUEST['wpsg_shopdata_2_zip'], false, true);
+				$this->shop->update_option('wpsg_shopdata_2_city', $_REQUEST['wpsg_shopdata_2_city'], false, true);
+				$this->shop->update_option('wpsg_shopdata_2_country', $_REQUEST['wpsg_shopdata_2_country'], false, true);
+				$this->shop->update_option('wpsg_shopdata_2_tel', $_REQUEST['wpsg_shopdata_2_tel'], false, true);
+				$this->shop->update_option('wpsg_shopdata_2_fax', $_REQUEST['wpsg_shopdata_2_fax'], false, true);
+				$this->shop->update_option('wpsg_shopdata_2_email', $_REQUEST['wpsg_shopdata_2_email'], false, true);
+				
 				$this->shop->update_option('wpsg_shopdata_eu', $_REQUEST['wpsg_shopdata_eu'], false, true);
 				$this->shop->update_option('wpsg_shopdata_eu_name', $_REQUEST['wpsg_shopdata_eu_name'], false, true);
Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 7238)
+++ /controller/wpsg_ShopController.class.php	(revision 7239)
@@ -3516,4 +3516,13 @@
 			$arReplace['/%shopinfo_city%/i'] = $this->get_option('wpsg_shopdata_city');		
 			$arReplace['/%shopinfo_country%/i'] = $this->get_option('wpsg_shopdata_country');
+			
+			$arReplace['/%shopinfo_2_street%/i'] = $this->get_option('wpsg_shopdata_2_street');
+			$arReplace['/%shopinfo_2_zip%/i'] = $this->get_option('wpsg_shopdata_2_zip');
+			$arReplace['/%shopinfo_2_city%/i'] = $this->get_option('wpsg_shopdata_2_city');
+			$arReplace['/%shopinfo_2_country%/i'] = $this->get_option('wpsg_shopdata_2_country');
+			$arReplace['/%shopinfo_2_tel%/i'] = $this->get_option('wpsg_shopdata_2_tel');
+			$arReplace['/%shopinfo_2_fax%/i'] = $this->get_option('wpsg_shopdata_2_fax');
+			$arReplace['/%shopinfo_2_email%/i'] = $this->get_option('wpsg_shopdata_2_email');
+			
 			$arReplace['/%shopinfo_eu_name%/i'] = $this->get_option('wpsg_shopdata_eu_name');
 			$arReplace['/%shopinfo_eu_tel%/i'] = $this->get_option('wpsg_shopdata_eu_tel');
@@ -3524,4 +3533,5 @@
 			$arReplace['/%shopinfo_eu_city%/i'] = $this->get_option('wpsg_shopdata_eu_city');
 			$arReplace['/%shopdata_eu_country%/i'] = $this->get_option('wpsg_shopdata_eu_country');
+			
 			$arReplace['/%shopinfo_bankname%/i'] = $this->get_option('wpsg_shopdata_bank_name');
 			$arReplace['/%shopinfo_accountowner%/i'] = $this->get_option('wpsg_shopdata_bank_owner');
Index: /views/admin/shopdata.phtml
===================================================================
--- /views/admin/shopdata.phtml	(revision 7238)
+++ /views/admin/shopdata.phtml	(revision 7239)
@@ -56,4 +56,22 @@
 		<div class="panel panel-default">
   			<div class="panel-heading clearfix">
+          		<h3 class="panel-title"><?php echo __('Zweigstelle', 'wpsg'); ?></h3>
+        	</div>
+  			<div class="panel-body">
+				<?php echo wpsg_drawForm_Checkbox('wpsg_shopdata_2', __('Zweigstelle vorhanden', 'wpsg'), $this->get_option('wpsg_shopdata_2')); ?>
+					<div class="wpsg_shopdata_2_activ" style="display:none;">
+        				<?php echo wpsg_drawForm_Input('wpsg_shopdata_2_street', __('Straße', 'wpsg'), $this->get_option('wpsg_shopdata_2_street'), array('help' => 'wpsg_shopdata_2_street')); ?>
+        				<?php echo wpsg_drawForm_Input('wpsg_shopdata_2_zip', __('Postleitzahl', 'wpsg'), $this->get_option('wpsg_shopdata_2_zip'), array('help' => 'wpsg_shopdata_2_zip')); ?>
+        				<?php echo wpsg_drawForm_Input('wpsg_shopdata_2_city', __('Ort', 'wpsg'), $this->get_option('wpsg_shopdata_2_city'), array('help' => 'wpsg_shopdata_2_city')); ?>		
+        				<?php echo wpsg_drawForm_Input('wpsg_shopdata_2_country', __('Land', 'wpsg'), $this->get_option('wpsg_shopdata_2_country'), array('help' => 'wpsg_shopdata_2_country')); ?>		
+        				<?php echo wpsg_drawForm_Input('wpsg_shopdata_2_tel', __('Telefon', 'wpsg'), $this->get_option('wpsg_shopdata_2_tel'), array('help' => 'wpsg_shopdata_2_tel')); ?>
+        				<?php echo wpsg_drawForm_Input('wpsg_shopdata_2_fax', __('Fax', 'wpsg'), $this->get_option('wpsg_shopdata_2_fax'), array('help' => 'wpsg_shopdata_2_fax')); ?>
+        				<?php echo wpsg_drawForm_Input('wpsg_shopdata_2_email', __('E-Mail', 'wpsg'), $this->get_option('wpsg_shopdata_2_email'), array('help' => 'wpsg_shopdata_2_email')); ?>		
+					</div>
+			</div>
+		</div>
+		
+		<div class="panel panel-default">
+  			<div class="panel-heading clearfix">
           		<h3 class="panel-title"><?php echo __('Bankdaten', 'wpsg'); ?></h3>
         	</div>
@@ -95,4 +113,11 @@
 			jQuery(document).ready(function() {
 
+				jQuery('#wpsg_shopdata_2').bind('change', function() {
+
+					if (jQuery(this).is(':checked')) jQuery('.wpsg_shopdata_2_activ').show();
+					else jQuery('.wpsg_shopdata_2_activ').hide();
+					
+				} ).change();
+				
 
 			} );