From fb9fa18e81e769686f4f02d83dc12b9c1d843fd8 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Tue, 19 Nov 2019 06:08:19 +0000
Subject: - Feature: Lieferadresse lässt sich zu einer Bestellung nachträglich
 anlegen und auch löschen
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7613 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 .../wpsg_order_view_customerdata.phtml             | 68 ++++++++++++++--------
 1 file changed, 44 insertions(+), 24 deletions(-)

diff --git a/views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml b/views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml
index 50f5b3e..0fe4a1d 100644
--- a/views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml
+++ b/views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml
@@ -3,33 +3,36 @@
 	/**
 	 * Template für die Integration der Versandadresse in die Bestellansicht
 	 */
-	//wpsg_debug($this->view);
+	
 ?>
 
-<script type="text/javascript">/* <![CDATA[ */
+<script>
 
-	function wpsg_saveShippingAdress()
-	{
+	function wpsg_saveShippingAdress() {
 
         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',
+            url: '<?php 
+				
+				echo wpsg_admin_url('Order', 'ajax', ['mod' => 'wpsg_mod_shippingadress', 'edit_id' => $this->view['data']['id']], ['noheader' => '1'], true);
+				
+			?>',
             data: {
                 form_data: jQuery('#shipping_dialog_content input, #shipping_dialog_content select').serialize()
             },
-            success: function(data) {
+            success: function() {
 
-                location.href = location.href;
+				location.reload();
 
             }
         } );
 
 		return false;
 		
-	} // function wpsg_saveShippingAdress()
+	} 
 
-/* ]]> */</script>
+</script>
 
 <div class="modal fade" tabindex="-1" role="dialog" id="wpsg_customer_shipping_edit">
     <div class="modal-dialog" role="document">
@@ -56,6 +59,11 @@
                     <?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']); ?>
+					
+					<br />
+					
+					<?php echo wpsg_drawForm_Checkbox('dialog_delete', __('Lieferadresse löschen', 'wpsg'), false); ?>
+					
                 </div>
 
             </div>
@@ -70,21 +78,33 @@
 
 <?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'].rtrim(' '.wpsg_getStr($this->view['wpsg_mod_shippingadress']['shipping_nr']))); ?><br />
-	<?php $lk = $this->view['wpsg_mod_shippingadress']['oCountry']->getShorttext(); ?>
-    <?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($lk); ?><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 __('Lieferanschrift ändern', 'wpsg'); ?>">
-        <span class="glyphicon glyphicon-pencil"></span>
-    </a>
+	<?php if (wpsg_isSizedArray($this->view['wpsg_mod_shippingadress'])) { ?>
+	
+		<?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'].rtrim(' '.wpsg_getStr($this->view['wpsg_mod_shippingadress']['shipping_nr']))); ?><br />
+		<?php $lk = $this->view['wpsg_mod_shippingadress']['oCountry']->getShorttext(); ?>
+		<?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($lk); ?><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 __('Lieferanschrift ändern', 'wpsg'); ?>">
+			<span class="glyphicon glyphicon-pencil"></span>
+		</a>
+
+	<?php } else { ?>
+			
+		<?php echo __('Keine abweichende Lieferadresse angegeben.', 'wpsg'); ?>
+		
+		<a style="position: absolute; right:25px; top:10px; display:inline-block;" data-toggle="modal" data-target="#wpsg_customer_shipping_edit" href="#" title="<?php echo __('Lieferanschrift ändern', 'wpsg'); ?>">
+			<span class="glyphicon glyphicon-pencil"></span>
+		</a>
+		
+	<?php } ?>
 
 <?php echo wpsg_drawForm_TextEnd(__('Lieferadresse', 'wpsg')); ?>
 
-- 
cgit v1.2.3