From f4d68ae74cdcd77e40de63fdbe5ee8ab4c63920c Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Sat, 13 Aug 2016 13:40:36 +0000
Subject: - Bestellansicht Umbau der Moduleinbindung in Reiter

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5720 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_export/profil.phtml                 |   2 +-
 views/mods/mod_ordervars/ov_list.phtml             | 220 ++++++------
 views/mods/mod_rechnungen/order_view.phtml         | 399 ++++++++++-----------
 .../wpsg_order_view_customerdata.phtml             | 121 ++++---
 4 files changed, 373 insertions(+), 369 deletions(-)

(limited to 'views/mods')

diff --git a/views/mods/mod_export/profil.phtml b/views/mods/mod_export/profil.phtml
index 0d525b1..c07daed 100644
--- a/views/mods/mod_export/profil.phtml
+++ b/views/mods/mod_export/profil.phtml
@@ -258,7 +258,7 @@
                     },
                     submit: '<?php echo __('Speichern', 'wpsg'); ?>',
                     data: '<?php echo json_encode($this->view['fields']); ?>',
-                    type: 'select',
+                    type: 'multiarray',
                     placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
                     indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
                     tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
diff --git a/views/mods/mod_ordervars/ov_list.phtml b/views/mods/mod_ordervars/ov_list.phtml
index 8ce1830..1cd4655 100644
--- a/views/mods/mod_ordervars/ov_list.phtml
+++ b/views/mods/mod_ordervars/ov_list.phtml
@@ -6,114 +6,118 @@
 
 ?>
 <?php if (is_array($this->view['data']) && sizeof($this->view['data']) > 0) { ?>
-<table class="wpsg_ov_table">
-	 <tr>
-	 	<th><?php echo __('ID', 'wpsg'); ?></th>
-    	<th class="wpsg_label"><?php echo __('Name', 'wpsg'); ?></th>
-    	<th class="wpsg_typ"><?php echo __('Typ', 'wpsg'); ?></th>
-    	<th class="wpsg_pflicht"><?php echo __('Pflicht', 'wpsg'); ?></th>
-    	<th class="wpsg_delcol"></th>
-  	</tr>
+<table class="wpsg_ov_table table table-body-striped">
+    <thead>
+        <tr>
+            <th><?php echo __('ID', 'wpsg'); ?></th>
+            <th class="wpsg_label"><?php echo __('Name', 'wpsg'); ?></th>
+            <th class="wpsg_typ"><?php echo __('Typ', 'wpsg'); ?></th>
+            <th class="wpsg_pflicht"><?php echo __('Pflicht', 'wpsg'); ?></th>
+            <th class="wpsg_delcol"></th>
+        </tr>
+    </thead>
   	<?php $i = 0; foreach ($this->view['data'] as $ov) { $i ++; ?>
-	<tr class="wpsg_table wpsg_tablerow <?php echo (($i % 2 == 0)?'odd':'even'); ?>" id="ov_<?php echo $ov['id']; ?>">
-		<td class="wpsg_id"><?php echo $ov['id']; ?></td>
-		<td id="wpsg_ov_name_<?php echo $ov['id']; ?>" class="wpsg_label wpsg_editable"><?php echo wpsg_hspc(__($ov['name'], 'wpsg')); ?></td>
-		<td id="wpsg_ov_typ_<?php echo $ov['id']; ?>" class="wpsg_typ wpsg_editable"><?php echo $this->mod->arTypen[$ov['typ']]; ?></td>
-		<td class="wpsg_pflicht"><input type="checkbox" <?php echo (($ov['pflicht'] == '1')?'checked="checked"':''); ?> id="wpsg_ov_pflicht_<?php echo $ov['id']; ?>" /></td>
-		<td class="wpsg_delcol">
-		
-			<a class="wpsg_icon wpsg_icon_remove" href="#" title="<?php echo __('Bestellvariable löschen', 'wpsg'); ?>" onclick="return wpsg_removeOV(<?php echo $ov['id']; ?>);"></a>
-		
-			<script type="text/javascript">
-
-				jQuery('#wpsg_ov_name_<?php echo $ov['id']; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordervars&do=inlinedit&noheader=1', {
-					submitdata: {
-						field: 'name',
-						ov_id: '<?php echo $ov['id']; ?>'
-					},
-					submit: '<?php echo __('Speichern', 'wpsg'); ?>',
-					placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
-					indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
-			    	tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
-				});
-
-				jQuery('#wpsg_ov_pflicht_<?php echo $ov['id']; ?>').bind('change', function() {
-
-					jQuery.ajax( {
-						url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordervars&noheader=1&do=inlinedit',
-						data: {
-							field: 'pflicht',
-							ov_id: '<?php echo $ov['id']; ?>',
-							value: ((jQuery(this).attr("checked") == "checked")?'1':'0')
-						}
-					} );
-
-				} );
-
-				jQuery('#wpsg_ov_typ_<?php echo $ov['id']; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordervars&do=inlinedit&noheader=1', { 
-					submitdata: {
-						field: 'typ',
-						ov_id: '<?php echo $ov['id']; ?>'						
-					},
-					submit: '<?php echo __('Speichern', 'wpsg'); ?>',					
-					data: '<?php echo json_encode($this->mod->arTypen); ?>',
-					type: 'select',
-					placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
-					indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
-			    	tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
-			    	callback: function(el) {  
-				    	if (el == '<?php echo __('Auswahl', 'wpsg'); ?>')
-				    	{
-					    	jQuery('#wpsg_ov_auswahlrow_<?php echo $ov['id']; ?>').show();
-				    	}
-				    	else
-				    	{
-				    		jQuery('#wpsg_ov_auswahlrow_<?php echo $ov['id']; ?>').hide();
-				    	}	    	
-			    	}
-				});
-
-				function wpsg_removeOV(id)
-				{
-					jQuery.ajax({
-						url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordervars&noheader=1&do=del',
-						data: {
-							ov_id: id
-						},
-						success: function(data){
-							if (data == 1)
-							{
-								location.reload();
-							}
-						}
-					});
-				}
-			
-			</script>
-			
-		</td>
-	</tr> 
-	<tr class="wpsg_tablerow <?php echo (($i % 2 == 0)?'odd':'even'); ?>" id="wpsg_ov_auswahlrow_<?php echo $ov['id']; ?>" style="<?php echo (($ov['typ'] != '1')?'display:none;':''); ?>">
-		<td	class="wpsg_id"></td>
-		<td class="wpsg_select" colspan="4">
-			<?php echo __('Auswahl', 'wpsg'); ?>:
-			<span class="wpsg_editable" id="wpsg_ov_auswahl_<?php echo $ov['id']; ?>"><?php echo wpsg_hspc($ov['auswahl']); ?></span>
-			<script type="text/javascript">
-
-				jQuery('#wpsg_ov_auswahl_<?php echo $ov['id']; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordervars&do=inlinedit&noheader=1', {
-					submitdata: {
-						field: 'auswahl',
-						ov_id: '<?php echo $ov['id']; ?>'
-					},
-					submit: '<?php echo __('Speichern', 'wpsg'); ?>',
-					placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
-					indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
-			    	tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
-				});
-			
-			</script>			
-		</td>
-	</tr>
+    <tbody id="ov_<?php echo $ov['id']; ?>">
+        <tr class="wpsg_table wpsg_tablerow <?php echo (($i % 2 == 0)?'odd':'even'); ?>">
+            <td class="wpsg_id"><?php echo $ov['id']; ?></td>
+            <td><span id="wpsg_ov_name_<?php echo $ov['id']; ?>"><?php echo wpsg_hspc(__($ov['name'], 'wpsg')); ?></span></td>
+            <td><span id="wpsg_ov_typ_<?php echo $ov['id']; ?>"><?php echo $this->mod->arTypen[$ov['typ']]; ?></span></td>
+            <td class="wpsg_pflicht"><input type="checkbox" <?php echo (($ov['pflicht'] == '1')?'checked="checked"':''); ?> id="wpsg_ov_pflicht_<?php echo $ov['id']; ?>" /></td>
+            <td class="wpsg_delcol">
+
+                <a class="wpsg_icon wpsg_icon_remove" href="#" title="<?php echo __('Bestellvariable löschen', 'wpsg'); ?>" onclick="return wpsg_removeOV(<?php echo $ov['id']; ?>);"></a>
+
+                <script type="text/javascript">
+
+                    jQuery('#wpsg_ov_name_<?php echo $ov['id']; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordervars&do=inlinedit&noheader=1', {
+                        submitdata: {
+                            field: 'name',
+                            ov_id: '<?php echo $ov['id']; ?>'
+                        },
+                        submit: '<?php echo __('Speichern', 'wpsg'); ?>',
+                        placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
+                        indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
+                        tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
+                    });
+
+                    jQuery('#wpsg_ov_pflicht_<?php echo $ov['id']; ?>').bind('change', function() {
+
+                        jQuery.ajax( {
+                            url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordervars&noheader=1&do=inlinedit',
+                            data: {
+                                field: 'pflicht',
+                                ov_id: '<?php echo $ov['id']; ?>',
+                                value: ((jQuery(this).attr("checked") == "checked")?'1':'0')
+                            }
+                        } );
+
+                    } );
+
+                    jQuery('#wpsg_ov_typ_<?php echo $ov['id']; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordervars&do=inlinedit&noheader=1', {
+                        submitdata: {
+                            field: 'typ',
+                            ov_id: '<?php echo $ov['id']; ?>'
+                        },
+                        submit: '<?php echo __('Speichern', 'wpsg'); ?>',
+                        data: '<?php echo json_encode($this->mod->arTypen); ?>',
+                        type: 'select',
+                        placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
+                        indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
+                        tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
+                        callback: function(el) {
+                            if (el == '<?php echo __('Auswahl', 'wpsg'); ?>')
+                            {
+                                jQuery('#wpsg_ov_auswahlrow_<?php echo $ov['id']; ?>').show();
+                            }
+                            else
+                            {
+                                jQuery('#wpsg_ov_auswahlrow_<?php echo $ov['id']; ?>').hide();
+                            }
+                        }
+                    });
+
+                    function wpsg_removeOV(id)
+                    {
+                        jQuery.ajax({
+                            url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordervars&noheader=1&do=del',
+                            data: {
+                                ov_id: id
+                            },
+                            success: function(data){
+                                if (data == 1)
+                                {
+                                    location.reload();
+                                }
+                            }
+                        });
+                    }
+
+                </script>
+
+            </td>
+        </tr>
+        <tr class="wpsg_tablerow <?php echo (($i % 2 == 0)?'odd':'even'); ?>" id="wpsg_ov_auswahlrow_<?php echo $ov['id']; ?>" style="<?php echo (($ov['typ'] != '1')?'display:none;':''); ?>">
+            <td	class="wpsg_id"></td>
+            <td class="wpsg_select" colspan="4">
+                <?php echo __('Auswahl', 'wpsg'); ?>:
+                <span class="wpsg_editable" id="wpsg_ov_auswahl_<?php echo $ov['id']; ?>"><?php echo wpsg_hspc($ov['auswahl']); ?></span>
+                <script type="text/javascript">
+
+                    jQuery('#wpsg_ov_auswahl_<?php echo $ov['id']; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordervars&do=inlinedit&noheader=1', {
+                        submitdata: {
+                            field: 'auswahl',
+                            ov_id: '<?php echo $ov['id']; ?>'
+                        },
+                        submit: '<?php echo __('Speichern', 'wpsg'); ?>',
+                        placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
+                        indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
+                        tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
+                    });
+
+                </script>
+            </td>
+        </tr>
+    </tbody>
 	<?php } ?>
 </table>
 <p class="wpsg_hinweis"><?php echo __('Die Reihenfolge lässt sich mittels Drag&Drop verändern.', 'wpsg'); ?>
@@ -124,7 +128,7 @@
 
 		jQuery('.wpsg_ov_table').sortable( {
 			helper: wpsg_Tablefix,
-			items: 'tr.wpsg_tablerow',
+			items: 'tbody',
 			handler: '.wpsg_id',
 			update: function(event, ui) {
 
diff --git a/views/mods/mod_rechnungen/order_view.phtml b/views/mods/mod_rechnungen/order_view.phtml
index 9551099..3b68a39 100644
--- a/views/mods/mod_rechnungen/order_view.phtml
+++ b/views/mods/mod_rechnungen/order_view.phtml
@@ -74,205 +74,200 @@
 
 </script>
 
-<div class="postbox" id="wpsg_rechnungen">		
-	<h3 class="wpsg_handlediv">
-		<span title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>" class="handlediv"><br /></span>
-		<span><?php echo __('Rechnungen', 'wpsg'); ?></span>
-	</h3>
-	<div class="inside">
-		
-		<?php if (sizeof($this->view['mod_rechnungen']['arRechnungen']) == 0 && sizeof($this->view['mod_rechnungen']['arRechnungen_storno']) == 0) { ?>
-			<p><?php echo __('Bisher keine Rechnungen geschrieben.', 'wpsg'); ?></p>
-		<?php } else { ?>
-			<table>
-				<?php foreach ($this->view['mod_rechnungen']['arRechnungen_gesamt'] as $r) { ?>	
-				<tr>
-					<td>#<?php echo (($r['rnr'] != '')?$r['rnr']:$r['gnr']); ?>
-					
-						<?php if ($r['storno'] == "0000-00-00 00:00:00") { ?>
-							<?php if ($r['gnr'] != "") { ?>
-								<?php echo wpsg_translate(__('Rechnungskorrektur vom #1#', 'wpsg'), date("d.m.Y", $r['ts_datum'])); ?>	
-							<?php } else { ?>
-								<?php echo wpsg_translate(__('Rechnung geschrieben am #1#', 'wpsg'), date("d.m.Y", $r['ts_datum'])); ?>	
-							<?php } ?>
-						<?php } else { ?>
-							<?php echo wpsg_translate(__("Rechnung storniert am #1#", "wpsg"), date("d.m.Y", $r['ts_storno'])); ?>
-						<?php } ?> 
-					
-					</td>
-					<td style="text-align:right;">
-					
-						<?php
-						 
-							if ($r['rnr'] != "") 
-							{ 
-								$rfile = $this->callMod('wpsg_mod_rechnungen', 'getFilePath', array($this->view['data']['id'], true)).'R'.$r['rnr'].'.pdf';								
-							}
-							else if ($r['gnr'] != "")
-							{
-								$rfile = $this->callMod('wpsg_mod_rechnungen', 'getFilePath', array($this->view['data']['id'], true)).'G'.$r['gnr'].'.pdf';
-							}
-							
-						?>
-					
-						<a target="_blank" onclick="if (!confirm('<?php echo __('Sind Sie sicher, dass Sie eine Kopie dieser Rechnung/Rechnungskorrektur erneut an den Kunden senden möchten?', 'wpsg'); ?>')) return false;" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&mod=wpsg_mod_rechnungen&noheader=1&action=ajax&edit_id=<?php echo $this->view['data']['id']; ?>&r_id=<?php echo $r['id']; ?>&do=copy"><?php echo __("Kopie senden", "wpsg"); ?></a>&nbsp;
-						<a target="_blank" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&noheader=1&mod=wpsg_mod_rechnungen&do=getRechnung&edit_id=<?php echo $this->view['data']['id']; ?>&r_id=<?php echo $r['id']; ?>"><?php echo __("Ansehen", "wpsg"); ?></a>
-					
-					</td>
-				</tr>
-				<?php } ?>
-			</table>
-			<br />
-		<?php } ?>
-		
-		<?php if (sizeof($this->view['mod_rechnungen']['arRechnungen']) > 0 && sizeof($this->view['mod_rechnungen']['arRechnungen_gesamt']) != sizeof($this->view['mod_rechnungen']['arRechnungen_storno'])) { ?>
-			<fieldset style="border:1px solid #999999; width:100%;">
-				<legend style="margin-left:7px; margin-right:10px;"><?php echo __("Bestellstorno: Rechnungskorrektur erstellen", "wpsg"); ?></legend>
-				<div style="padding:10px;">
-					<form id="storno_form" target="_blank" method="post" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&noheader=1&action=ajax&mod=wpsg_mod_rechnungen&edit_id=<?php echo $this->view['data']['id']; ?>&do=storno">
-
-						<input type="hidden" name="send" value="1" />
-						
-						<label><input onclick="jQuery.cookie('wpsg_rechnungen_stornoradio', '0');" type="radio" value="0" class="wpsg_rechnungen_gutschrift" id="wpsg_rechnungen_gutschrift0" name="wpsg_rechnungen_gutschrift" />&nbsp;<?php echo __("Rechnung komplett stornieren und keine Rechnungskorrektur erstellen.", "wpsg"); ?></label><br />
-						<label><input onclick="jQuery.cookie('wpsg_rechnungen_stornoradio', '1');" type="radio" value="1" class="wpsg_rechnungen_gutschrift" id="wpsg_rechnungen_gutschrift1" name="wpsg_rechnungen_gutschrift" />&nbsp;<?php echo __("Rechnungskorrektur erstellen.", "wpsg"); ?></label><br />
-						<label><input onclick="jQuery.cookie('wpsg_rechnungen_stornoradio', '2');" type="radio" value="2" class="wpsg_rechnungen_gutschrift" id="wpsg_rechnungen_gutschrift2" name="wpsg_rechnungen_gutschrift" />&nbsp;<?php echo __("Rechnungskorrektur erstellen und an Kunden senden.", "wpsg"); ?></label><br />
-
-						<div id="wpsg_mod_rechnungen_fee_layer" style="display:none;">							
-							<?php echo wpsg_drawForm_Input('wpsg_mod_rechnungen_fee', __('Gebühr für Rechnungskorrektur', 'wpsg'), ''); ?>
-						</div>
-												 
-						<div class="wpsg_clear"></div><br />						
-
-						<input onclick="return wpsg_mod_rechnungen_storno();" id="wpsg_rechnungen_stornobutton" class="button" type="submit" name="form_submit" value="<?php echo __("Stornieren", "wpsg"); ?>" style="float:right;" />							
-						<input id="wpsg_mod_rechnungen_stornopreview" class="button" type="submit" name="form_submit_preview" value="<?php echo __('Vorschau', 'wpsg'); ?>" style="float:right; margin-right:10px;" />
-							
-						<script type="text/javascript">
- 
-							jQuery(document).ready(function() {									
-																
-								jQuery("[name=wpsg_rechnungen_gutschrift]").filter("[value=" + jQuery.cookie("wpsg_rechnungen_stornoradio") + "]").attr("checked","checked");
-										
-								jQuery("#wpsg_rechnungen_stornobutton").bind("click", function() {
-										  
-									if (jQuery("#wpsg_rechnungen_gutschrift1").attr("checked") || jQuery("#wpsg_rechnungen_gutschrift2").attr("checked"))
-									{
-											
-										//jQuery("#storno_form").attr("action", "<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&noheader=1&action=ajax&mod=wpsg_mod_rechnungen&edit_id=<?php echo $this->view['data']['id']; ?>&do=storno");
-										jQuery("#storno_form").attr("target", "_blank");
-
-										window.setTimeout(function() {
-											location.href = "<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&edit_id=<?php echo $this->view['data']['id']; ?>";
-										}, 1500);
-											
-									}
-									else
-									{
-										
-										//jQuery("#storno_form").attr("action", "<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_rechnungen&edit_id=<?php echo $this->view['data']['id']; ?>&do=storno");
-										jQuery("#storno_form").attr("target", "");
-											
-									}
-																			
-								});	 
-								
-							});
-									
-						</script>
-							
-					</form>
-					<div class="wpsg_hinweis"><?php echo __("Eine neue Rechnung kann erst geschrieben werden wenn alle bestehenden Rechnungen zu dieser Bestellung storniert wurden.", "wpsg"); ?></div>
-					<div class="wpsg_clear"></div>
-				</div>
-			</fieldset>
-		<?php } else { ?>
-		
-			<fieldset style="border:1px solid #999999; width:100%;">
-				<legend style="margin-left:10px; margin-right:10px;"><?php echo __("Neue Rechnung", "wpsg"); ?></legend>
-				<div style="padding:5px;">
-	
-					<form target="_blank" method="post" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_rechnungen&cmd=rechnung&noheader=1&edit_id=<?php echo $this->view['data']['id']; ?>">
-						
-						<input type="hidden" name="send" value="1" />
-									
-						<label style="height:25px; width:240px; float:left; margin-top:10px;">	
-							<input onchange="if (this.checked) jQuery('#wpsg_rechnungen_email').show(); else jQuery('#wpsg_rechnungen_email').hide();" type="checkbox" checked="checked" value="1" name="wpsg_rechnungen_sendmail" />
-							&nbsp;<?php echo __("E-Mail an Kunden senden.", "wpsg"); ?>
-						</label>
-						<input type="text" style="display:block; width:300px; float:right;" id="wpsg_rechnungen_email" name="wpsg_rechnungen_email" value="<?php echo wpsg_hspc($this->view['data']['email']); ?>" />
-						<div style="clear:both; width:100%; height:5px;"></div>
-										
-						<label style="height:25px; width:240px; float:left;">	
-							<input checked="checked"  onchange="if (this.checked) jQuery('#wpsg_rechnungen_faelligkeitsdatum').show(); else jQuery('#wpsg_rechnungen_faelligkeitsdatum').hide();" type="checkbox" value="1" name="wpsg_rechnungen_faelligkeit" />
-							&nbsp;<?php echo __("Fälligkeit anzeigen.", "wpsg"); ?>
-						</label>
-						<input type="text" style="display:block; width:300px; float:right;" id="wpsg_rechnungen_faelligkeitsdatum" name="wpsg_rechnungen_faelligkeitsdatum" value="<?php echo date("d.m.Y", time() + ($this->get_option("wpsg_rechnungen_faelligkeit") * 86400)); ?>" />
-						<div style="clear:both; width:100%; height:5px;"></div>
-		
-						<label style="height:25px; width:220px; float:left;">									
-							<input checked="checked" onchange="if (this.checked) jQuery('#wpsg_rechnungen_status').show(); else jQuery('#wpsg_rechnungen_status').hide();" type="checkbox" value="1" name="wpsg_rechnungen_status" />
-							&nbsp;<?php echo __("Neuer Status:", "wpsg"); ?>										
-						</label>
-						<select style="width:300px; float:right;" id="wpsg_rechnungen_status_neu" name="wpsg_rechnungen_status_neu">
-							<?php foreach ($this->arStatus as $k => $v) { ?>
-							<option value="<?php echo $k; ?>" <?php echo (($k == 110)?'selected="selected"':''); ?>><?php echo $v; ?></option>
-							<?php } ?>
-						</select>
-						<div style="clear:both; width:100%; height:5px;"></div>				
-
-						<label style="height:25px; width:240px; float:left;">
-							<input <?php echo (($this->get_option("wpsg_rechnungen_url_std") === "1")?'checked="checked"':''); ?> type="checkbox" value="1" name="wpsg_rechnungen_url" />
-							&nbsp;<?php echo __("URL Benachrichtigung", "wpsg"); ?>
-						</label>
-						<div style="clear:both; width:100%; height:5px;"></div>
-									
-						<label style="height:25px; width:240px; float:left; padding-left:22px;">
-							<?php echo __("Rechnungsdatum", "wpsg"); ?>:											
-						</label>
-						<input style="display:block;float:right; width:300px;" type="text" name="wpsg_rechnungen_datum" value="<?php echo date("d.m.Y", time()); ?>" />
-						<div style="clear:both; width:100%; height:5px;"></div>
-																		
-						<label for="wpsg_rechnungen_fusstext" style="height:25px; width:220px; padding-left:22px; float:left">
-							<?php echo __("Fußtext", "wpsg"); ?>
-						</label>
-				
-						<?php 
-											
-							$wpsg_rechnungen_footer = $this->get_option("wpsg_rechnungen_footer");
- 							if (!is_array($wpsg_rechnungen_footer)) $wpsg_rechnungen_footer = unserialize($this->get_option("wpsg_rechnungen_footer"));
-							if (!is_array($wpsg_rechnungen_footer)) $wpsg_rechnungen_footer = Array();
-
-						?>
-												
-						<?php if (sizeof($wpsg_rechnungen_footer) > 0) { ?>				
-						<select style="width:300px; float:right;" id="wpsg_rechnungen_select" onchange="jQuery('#wpsg_rechnungen_fusstext').val(this.value);">
-							<?php foreach ($wpsg_rechnungen_footer as $k => $v) { ?>
-							<option value="<?php echo wpsg_hspc($v[1]); ?>"><?php echo wpsg_hspc($v[0]); ?></option>
-							<?php } ?>
-						</select>
-						<?php } ?>
-
-						<div style="clear:both; width:100%; height:5px;"></div>															
-						<div style="padding-left:25px;"><input style="width:100%;" type="text" name="wpsg_rechnungen_fusstext" id="wpsg_rechnungen_fusstext" value="" /></div>								
-						<div style="clear:both; width:100%; height:15px;"></div>
-										
-						<script type="text/javascript">
-		
-							jQuery(document).ready(function() {
-								jQuery('#wpsg_rechnungen_fusstext').val(jQuery("#wpsg_rechnungen_select").val());
-							});
-											
-						</script>
-										
-						<input class="button" style="float:right;" onclick="window.setTimeout(function() { location.href = '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&edit_id=<?php echo $this->view['data']['id']; ?>'; }, 1000);" name="wpsg_rechnungen_write" type="submit" value="<?php echo __("Rechnung schreiben", "wpsg"); ?>" />
-						<input class="button" style="float:right; margin-right:10px;" name="wpsg_rechnungen_preview" type="submit" value="<?php echo __("Vorschau", "wpsg"); ?>" />
-										
-						<div style="clear:both; width:100%; height:5px;"></div>
-								 
-					</form>
-				</div>
-			</fieldset> 
-		
-		<?php } ?>
-				
-	</div>					
-</div>
\ No newline at end of file
+<?php echo wpsg_drawForm_AdminboxStart(__('Rechnungen', 'wpsg'));  ?>
+
+    <?php if (sizeof($this->view['mod_rechnungen']['arRechnungen']) == 0 && sizeof($this->view['mod_rechnungen']['arRechnungen_storno']) == 0) { ?>
+        <p><?php echo __('Bisher keine Rechnungen geschrieben.', 'wpsg'); ?></p>
+    <?php } else { ?>
+        <table>
+            <?php foreach ($this->view['mod_rechnungen']['arRechnungen_gesamt'] as $r) { ?>
+            <tr>
+                <td>#<?php echo (($r['rnr'] != '')?$r['rnr']:$r['gnr']); ?>
+
+                    <?php if ($r['storno'] == "0000-00-00 00:00:00") { ?>
+                        <?php if ($r['gnr'] != "") { ?>
+                            <?php echo wpsg_translate(__('Rechnungskorrektur vom #1#', 'wpsg'), date("d.m.Y", $r['ts_datum'])); ?>
+                        <?php } else { ?>
+                            <?php echo wpsg_translate(__('Rechnung geschrieben am #1#', 'wpsg'), date("d.m.Y", $r['ts_datum'])); ?>
+                        <?php } ?>
+                    <?php } else { ?>
+                        <?php echo wpsg_translate(__("Rechnung storniert am #1#", "wpsg"), date("d.m.Y", $r['ts_storno'])); ?>
+                    <?php } ?>
+
+                </td>
+                <td style="text-align:right;">
+
+                    <?php
+
+                        if ($r['rnr'] != "")
+                        {
+                            $rfile = $this->callMod('wpsg_mod_rechnungen', 'getFilePath', array($this->view['data']['id'], true)).'R'.$r['rnr'].'.pdf';
+                        }
+                        else if ($r['gnr'] != "")
+                        {
+                            $rfile = $this->callMod('wpsg_mod_rechnungen', 'getFilePath', array($this->view['data']['id'], true)).'G'.$r['gnr'].'.pdf';
+                        }
+
+                    ?>
+
+                    <a target="_blank" onclick="if (!confirm('<?php echo __('Sind Sie sicher, dass Sie eine Kopie dieser Rechnung/Rechnungskorrektur erneut an den Kunden senden möchten?', 'wpsg'); ?>')) return false;" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&mod=wpsg_mod_rechnungen&noheader=1&action=ajax&edit_id=<?php echo $this->view['data']['id']; ?>&r_id=<?php echo $r['id']; ?>&do=copy"><?php echo __("Kopie senden", "wpsg"); ?></a>&nbsp;
+                    <a target="_blank" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&noheader=1&mod=wpsg_mod_rechnungen&do=getRechnung&edit_id=<?php echo $this->view['data']['id']; ?>&r_id=<?php echo $r['id']; ?>"><?php echo __("Ansehen", "wpsg"); ?></a>
+
+                </td>
+            </tr>
+            <?php } ?>
+        </table>
+        <br />
+    <?php } ?>
+
+    <?php if (sizeof($this->view['mod_rechnungen']['arRechnungen']) > 0 && sizeof($this->view['mod_rechnungen']['arRechnungen_gesamt']) != sizeof($this->view['mod_rechnungen']['arRechnungen_storno'])) { ?>
+        <fieldset style="border:1px solid #999999; width:100%;">
+            <legend style="margin-left:7px; margin-right:10px;"><?php echo __("Bestellstorno: Rechnungskorrektur erstellen", "wpsg"); ?></legend>
+            <div style="padding:10px;">
+                <form id="storno_form" target="_blank" method="post" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&noheader=1&action=ajax&mod=wpsg_mod_rechnungen&edit_id=<?php echo $this->view['data']['id']; ?>&do=storno">
+
+                    <input type="hidden" name="send" value="1" />
+
+                    <label><input onclick="jQuery.cookie('wpsg_rechnungen_stornoradio', '0');" type="radio" value="0" class="wpsg_rechnungen_gutschrift" id="wpsg_rechnungen_gutschrift0" name="wpsg_rechnungen_gutschrift" />&nbsp;<?php echo __("Rechnung komplett stornieren und keine Rechnungskorrektur erstellen.", "wpsg"); ?></label><br />
+                    <label><input onclick="jQuery.cookie('wpsg_rechnungen_stornoradio', '1');" type="radio" value="1" class="wpsg_rechnungen_gutschrift" id="wpsg_rechnungen_gutschrift1" name="wpsg_rechnungen_gutschrift" />&nbsp;<?php echo __("Rechnungskorrektur erstellen.", "wpsg"); ?></label><br />
+                    <label><input onclick="jQuery.cookie('wpsg_rechnungen_stornoradio', '2');" type="radio" value="2" class="wpsg_rechnungen_gutschrift" id="wpsg_rechnungen_gutschrift2" name="wpsg_rechnungen_gutschrift" />&nbsp;<?php echo __("Rechnungskorrektur erstellen und an Kunden senden.", "wpsg"); ?></label><br />
+
+                    <div id="wpsg_mod_rechnungen_fee_layer" style="display:none;">
+                        <?php echo wpsg_drawForm_Input('wpsg_mod_rechnungen_fee', __('Gebühr für Rechnungskorrektur', 'wpsg'), ''); ?>
+                    </div>
+
+                    <div class="wpsg_clear"></div><br />
+
+                    <input onclick="return wpsg_mod_rechnungen_storno();" id="wpsg_rechnungen_stornobutton" class="button" type="submit" name="form_submit" value="<?php echo __("Stornieren", "wpsg"); ?>" style="float:right;" />
+                    <input id="wpsg_mod_rechnungen_stornopreview" class="button" type="submit" name="form_submit_preview" value="<?php echo __('Vorschau', 'wpsg'); ?>" style="float:right; margin-right:10px;" />
+
+                    <script type="text/javascript">
+
+                        jQuery(document).ready(function() {
+
+                            jQuery("[name=wpsg_rechnungen_gutschrift]").filter("[value=" + jQuery.cookie("wpsg_rechnungen_stornoradio") + "]").attr("checked","checked");
+
+                            jQuery("#wpsg_rechnungen_stornobutton").bind("click", function() {
+
+                                if (jQuery("#wpsg_rechnungen_gutschrift1").attr("checked") || jQuery("#wpsg_rechnungen_gutschrift2").attr("checked"))
+                                {
+
+                                    //jQuery("#storno_form").attr("action", "<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&noheader=1&action=ajax&mod=wpsg_mod_rechnungen&edit_id=<?php echo $this->view['data']['id']; ?>&do=storno");
+                                    jQuery("#storno_form").attr("target", "_blank");
+
+                                    window.setTimeout(function() {
+                                        location.href = "<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&edit_id=<?php echo $this->view['data']['id']; ?>";
+                                    }, 1500);
+
+                                }
+                                else
+                                {
+
+                                    //jQuery("#storno_form").attr("action", "<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_rechnungen&edit_id=<?php echo $this->view['data']['id']; ?>&do=storno");
+                                    jQuery("#storno_form").attr("target", "");
+
+                                }
+
+                            });
+
+                        });
+
+                    </script>
+
+                </form>
+                <div class="wpsg_hinweis"><?php echo __("Eine neue Rechnung kann erst geschrieben werden wenn alle bestehenden Rechnungen zu dieser Bestellung storniert wurden.", "wpsg"); ?></div>
+                <div class="wpsg_clear"></div>
+            </div>
+        </fieldset>
+    <?php } else { ?>
+
+        <fieldset>
+            <legend><?php echo __("Neue Rechnung", "wpsg"); ?></legend>
+
+            <div>
+
+                <form target="_blank" method="post" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_rechnungen&cmd=rechnung&noheader=1&edit_id=<?php echo $this->view['data']['id']; ?>">
+
+                    <input type="hidden" name="send" value="1" />
+
+                    <label style="height:25px; width:240px; float:left; margin-top:10px;">
+                        <input onchange="if (this.checked) jQuery('#wpsg_rechnungen_email').show(); else jQuery('#wpsg_rechnungen_email').hide();" type="checkbox" checked="checked" value="1" name="wpsg_rechnungen_sendmail" />
+                        &nbsp;<?php echo __("E-Mail an Kunden senden.", "wpsg"); ?>
+                    </label>
+                    <input type="text" style="display:block; width:300px; float:right;" id="wpsg_rechnungen_email" name="wpsg_rechnungen_email" value="<?php echo wpsg_hspc($this->view['data']['email']); ?>" />
+                    <div style="clear:both; width:100%; height:5px;"></div>
+
+                    <label style="height:25px; width:240px; float:left;">
+                        <input checked="checked"  onchange="if (this.checked) jQuery('#wpsg_rechnungen_faelligkeitsdatum').show(); else jQuery('#wpsg_rechnungen_faelligkeitsdatum').hide();" type="checkbox" value="1" name="wpsg_rechnungen_faelligkeit" />
+                        &nbsp;<?php echo __("Fälligkeit anzeigen.", "wpsg"); ?>
+                    </label>
+                    <input type="text" style="display:block; width:300px; float:right;" id="wpsg_rechnungen_faelligkeitsdatum" name="wpsg_rechnungen_faelligkeitsdatum" value="<?php echo date("d.m.Y", time() + ($this->get_option("wpsg_rechnungen_faelligkeit") * 86400)); ?>" />
+                    <div style="clear:both; width:100%; height:5px;"></div>
+
+                    <label style="height:25px; width:220px; float:left;">
+                        <input checked="checked" onchange="if (this.checked) jQuery('#wpsg_rechnungen_status').show(); else jQuery('#wpsg_rechnungen_status').hide();" type="checkbox" value="1" name="wpsg_rechnungen_status" />
+                        &nbsp;<?php echo __("Neuer Status:", "wpsg"); ?>
+                    </label>
+                    <select style="width:300px; float:right;" id="wpsg_rechnungen_status_neu" name="wpsg_rechnungen_status_neu">
+                        <?php foreach ($this->arStatus as $k => $v) { ?>
+                        <option value="<?php echo $k; ?>" <?php echo (($k == 110)?'selected="selected"':''); ?>><?php echo $v; ?></option>
+                        <?php } ?>
+                    </select>
+                    <div style="clear:both; width:100%; height:5px;"></div>
+
+                    <label style="height:25px; width:240px; float:left;">
+                        <input <?php echo (($this->get_option("wpsg_rechnungen_url_std") === "1")?'checked="checked"':''); ?> type="checkbox" value="1" name="wpsg_rechnungen_url" />
+                        &nbsp;<?php echo __("URL Benachrichtigung", "wpsg"); ?>
+                    </label>
+                    <div style="clear:both; width:100%; height:5px;"></div>
+
+                    <label style="height:25px; width:240px; float:left; padding-left:22px;">
+                        <?php echo __("Rechnungsdatum", "wpsg"); ?>:
+                    </label>
+                    <input style="display:block;float:right; width:300px;" type="text" name="wpsg_rechnungen_datum" value="<?php echo date("d.m.Y", time()); ?>" />
+                    <div style="clear:both; width:100%; height:5px;"></div>
+
+                    <label for="wpsg_rechnungen_fusstext" style="height:25px; width:220px; padding-left:22px; float:left">
+                        <?php echo __("Fußtext", "wpsg"); ?>
+                    </label>
+
+                    <?php
+
+                        $wpsg_rechnungen_footer = $this->get_option("wpsg_rechnungen_footer");
+                        if (!is_array($wpsg_rechnungen_footer)) $wpsg_rechnungen_footer = unserialize($this->get_option("wpsg_rechnungen_footer"));
+                        if (!is_array($wpsg_rechnungen_footer)) $wpsg_rechnungen_footer = Array();
+
+                    ?>
+
+                    <?php if (sizeof($wpsg_rechnungen_footer) > 0) { ?>
+                    <select style="width:300px; float:right;" id="wpsg_rechnungen_select" onchange="jQuery('#wpsg_rechnungen_fusstext').val(this.value);">
+                        <?php foreach ($wpsg_rechnungen_footer as $k => $v) { ?>
+                        <option value="<?php echo wpsg_hspc($v[1]); ?>"><?php echo wpsg_hspc($v[0]); ?></option>
+                        <?php } ?>
+                    </select>
+                    <?php } ?>
+
+                    <div style="clear:both; width:100%; height:5px;"></div>
+                    <div style="padding-left:25px;"><input style="width:100%;" type="text" name="wpsg_rechnungen_fusstext" id="wpsg_rechnungen_fusstext" value="" /></div>
+                    <div style="clear:both; width:100%; height:15px;"></div>
+
+                    <script type="text/javascript">
+
+                        jQuery(document).ready(function() {
+                            jQuery('#wpsg_rechnungen_fusstext').val(jQuery("#wpsg_rechnungen_select").val());
+                        });
+
+                    </script>
+
+                    <input class="button" style="float:right;" onclick="window.setTimeout(function() { location.href = '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&edit_id=<?php echo $this->view['data']['id']; ?>'; }, 1000);" name="wpsg_rechnungen_write" type="submit" value="<?php echo __("Rechnung schreiben", "wpsg"); ?>" />
+                    <input class="button" style="float:right; margin-right:10px;" name="wpsg_rechnungen_preview" type="submit" value="<?php echo __("Vorschau", "wpsg"); ?>" />
+
+                    <div style="clear:both; width:100%; height:5px;"></div>
+
+                </form>
+            </div>
+        </fieldset>
+
+    <?php } ?>
+
+<?php echo wpsg_drawForm_AdminboxEnd(); ?>
\ No newline at end of file
diff --git a/views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml b/views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml
index 6301aba..ff3723c 100644
--- a/views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml
+++ b/views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml
@@ -8,70 +8,75 @@
 
 <script type="text/javascript">/* <![CDATA[ */
 
-	function wpsg_editShippingAdress()
+	function wpsg_saveShippingAdress()
 	{
 
-		jQuery('#wpsg_ShippingDialog').dialog( {                   
-	        'dialogClass': 'wp-dialog',           
-	        'modal': true,
-	        'width': 600,
-	        'title': '<?php echo __('Lieferanschrift ändern', 'wpsg'); ?>',
-	        'autoOpen': true, 
-	        'closeOnEscape': true,      
-	        'buttons': {
-	            "<?php echo __('Speichern', 'wpsg'); ?>": function() {
-
-	            	jQuery('#wpsg_backend_loading').show();
-					jQuery(this).dialog('close');
-	            	
-					jQuery.ajax( {
-						url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_shippingadress&edit_id=<?php echo $this->view['data']['id']; ?>&noheader=1',
-						data: {
-							form_data: jQuery('#wpsg_ShippingDialog input, #wpsg_ShippingDialog select').serialize()
-						},
-						success: function(data) {
- 
-							location.href = location.href;
-							
-						}
-					} );
-	                
-	            }
-	        }
-	    } );
+        jQuery('#wpsg_backend_loading').show();
+
+        jQuery.ajax( {
+            url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_shippingadress&edit_id=<?php echo $this->view['data']['id']; ?>&noheader=1',
+            data: {
+                form_data: jQuery('#shipping_dialog_content input, #shipping_dialog_content select').serialize()
+            },
+            success: function(data) {
+
+                location.href = location.href;
+
+            }
+        } );
 
 		return false;
 		
-	}
+	} // function wpsg_saveShippingAdress()
 
 /* ]]> */</script>
 
-<div class="wpsg_form_field">
-	<div class="wpsg_form_left">
-		<?php echo __('Lieferadresse', 'wpsg'); ?>:
-		<a style="float:none; display:inline-block;" onclick="return wpsg_editShippingAdress();" class="wpsg_icon wpsg_icon_edit" href="#" title="<?php echo __('Rechnungsanschrift ändern', 'wpsg'); ?>"></a>
-	</div>
-	<div class="wpsg_form_right">
-		<p>		
-			<?php if (trim($this->view['wpsg_mod_shippingadress']['shipping_firma']) != '') { ?>			
-			<?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_firma']); ?><br />
-			<?php } ?>	
-			<?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_title']); ?> <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_vname']); ?> <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_name']); ?><br />
-			<?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_strasse']); ?><br />
-			<?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_plz']); ?> <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_ort']); ?> <?php echo wpsg_hspc($this->view['shipping_country']['kuerzel']); ?><br />
-		</p>						
-	</div>
-	
-	<div id="wpsg_ShippingDialog" class="wpsg_dialog" style="display:none;">
-		<?php echo wpsg_drawForm_Input('dialog_shipping_firma', __('Firma', 'wpsg'), $this->view['wpsg_mod_shippingadress']['shipping_firma']); ?>
-		<?php echo wpsg_drawForm_Select('dialog_shipping_title', __('Anschrift', 'wpsg'), $this->view['arTitles'], $this->view['wpsg_mod_shippingadress']['shipping_title'], array('noIndex' => true)); ?>
-		<?php echo wpsg_drawForm_Input('dialog_shipping_vname', __('Vorname', 'wpsg'), $this->view['wpsg_mod_shippingadress']['shipping_vname']); ?>
-		<?php echo wpsg_drawForm_Input('dialog_shipping_name', __('Name', 'wpsg'), $this->view['wpsg_mod_shippingadress']['shipping_name']); ?>
-		<?php echo wpsg_drawForm_Input('dialog_shipping_strasse', __('Straße', 'wpsg'), $this->view['wpsg_mod_shippingadress']['shipping_strasse']); ?>
-		<?php echo wpsg_drawForm_Input('dialog_shipping_plz', __('Postleitzahl', 'wpsg'), $this->view['wpsg_mod_shippingadress']['shipping_plz']); ?>
-		<?php echo wpsg_drawForm_Input('dialog_shipping_ort', __('Ort', 'wpsg'), $this->view['wpsg_mod_shippingadress']['shipping_ort']); ?>
-		<?php echo wpsg_drawForm_Select('dialog_shipping_land', __('Land', 'wpsg'), $this->view['arCountry'], $this->view['wpsg_mod_shippingadress']['shipping_land']); ?>
-	</div>
-	
+<div class="modal fade" tabindex="-1" role="dialog" id="wpsg_customer_shipping_edit">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title"><?php echo __('Lieferanschrift beatbeiten', 'wpsg'); ?></h4>
+            </div>
+            <div class="modal-body">
+
+                <div id="shipping_dialog_content">
+                    <?php echo wpsg_drawForm_Input('dialog_shipping_firma', __('Firma', 'wpsg'), $this->view['wpsg_mod_shippingadress']['shipping_firma']); ?>
+                    <?php echo wpsg_drawForm_Select('dialog_shipping_title', __('Anschrift', 'wpsg'), $this->view['arTitles'], $this->view['wpsg_mod_shippingadress']['shipping_title'], array('noIndex' => true)); ?>
+                    <?php echo wpsg_drawForm_Input('dialog_shipping_vname', __('Vorname', 'wpsg'), $this->view['wpsg_mod_shippingadress']['shipping_vname']); ?>
+                    <?php echo wpsg_drawForm_Input('dialog_shipping_name', __('Name', 'wpsg'), $this->view['wpsg_mod_shippingadress']['shipping_name']); ?>
+                    <?php echo wpsg_drawForm_Input('dialog_shipping_strasse', __('Straße', 'wpsg'), $this->view['wpsg_mod_shippingadress']['shipping_strasse']); ?>
+                    <?php echo wpsg_drawForm_Input('dialog_shipping_plz', __('Postleitzahl', 'wpsg'), $this->view['wpsg_mod_shippingadress']['shipping_plz']); ?>
+                    <?php echo wpsg_drawForm_Input('dialog_shipping_ort', __('Ort', 'wpsg'), $this->view['wpsg_mod_shippingadress']['shipping_ort']); ?>
+                    <?php echo wpsg_drawForm_Select('dialog_shipping_land', __('Land', 'wpsg'), $this->view['arCountry'], $this->view['wpsg_mod_shippingadress']['shipping_land']); ?>
+                </div>
+
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal"><?php echo __('Schließen', 'wpsg'); ?></button>
+                <button type="button" class="btn btn-primary" onclick="return wpsg_saveShippingAdress();"><?php echo __('Speichern', 'wpsg'); ?></button>
+            </div>
+        </div>
+    </div>
 </div>
-<div class="wpsg_clear"></div>
+
+<?php echo wpsg_drawForm_TextStart(); ?>
+
+    <?php if (trim($this->view['wpsg_mod_shippingadress']['shipping_firma']) != '') { ?>
+    <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_firma']); ?><br />
+    <?php } ?>
+    <?php
+
+        if (wpsg_isSizedString($this->view['wpsg_mod_shippingadress']['shipping_title']) && $this->view['wpsg_mod_shippingadress']['shipping_title'] != '-1')
+            echo $this->view['arTitles'][$this->view['wpsg_mod_shippingadress']['shipping_title']];
+
+    ?> <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_vname']); ?> <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_name']); ?><br />
+    <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_strasse']); ?><br />
+    <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_plz']); ?> <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_ort']); ?> <?php echo wpsg_hspc($this->view['shipping_country']['kuerzel']); ?><br />
+
+    <a style="position: absolute; right:25px; top:10px; display:inline-block;" data-toggle="modal" data-target="#wpsg_customer_shipping_edit" href="#" title="<?php echo __('Rechnungsanschrift ändern', 'wpsg'); ?>">
+        <span class="glyphicon glyphicon-pencil"></span>
+    </a>
+
+<?php echo wpsg_drawForm_TextEnd(__('Lieferadresse', 'wpsg')); ?>
+
-- 
cgit v1.2.3