- Bestellansicht Umbau der Moduleinbindung in Reiter

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

1 files changed, 63 insertions, 58 deletions

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')); ?>

+