From bd7690af4ae8efa6d6c2704b0df753d946ee1c24 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Thu, 19 Oct 2017 09:30:36 +0000
Subject: - Wenn WPML verwendet wird, werden die Einstellungen aus dem Backend
 mit der korrekten Seite verglichen - Doppelter Produktstatus entfernt

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6619 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_kundenverwaltung/login.phtml | 13 +++++++++++++
 views/mods/mod_paypalapi/paypalplus.phtml   |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'views/mods')

diff --git a/views/mods/mod_kundenverwaltung/login.phtml b/views/mods/mod_kundenverwaltung/login.phtml
index 668420e..bc5a0b4 100644
--- a/views/mods/mod_kundenverwaltung/login.phtml
+++ b/views/mods/mod_kundenverwaltung/login.phtml
@@ -39,4 +39,17 @@
 		</div>
 	</form>
 
+	<?php
+
+		$this->view['data'] = $_SESSION['wpsg']['checkout'];
+		$this->view['error'] = $_SESSION['wpsg']['errorFields'];
+		$this->view['pflicht'] = $this->loadPflichtFeldDaten();
+		$this->view['laender'] = $this->db->fetchAssoc("SELECT * FROM `".WPSG_TBL_LAND."` ORDER BY `name` ASC");
+
+		$this->clearMessages();
+
+		echo $this->render(WPSG_PATH_VIEW.'/mods/mod_kundenverwaltung/register.phtml', false);
+
+	?>
+
 </div>
\ No newline at end of file
diff --git a/views/mods/mod_paypalapi/paypalplus.phtml b/views/mods/mod_paypalapi/paypalplus.phtml
index f9efe0d..e275410 100644
--- a/views/mods/mod_paypalapi/paypalplus.phtml
+++ b/views/mods/mod_paypalapi/paypalplus.phtml
@@ -13,7 +13,7 @@
 		"language": "de_DE",
 		"preselection": "<?php echo (($_SESSION['wpsg']['checkout']['payment'] == '10')?'paypal':'none')?>",
 		"country": "DE",
-		<?php if ($this->hasMod('wpsg_mod_onepagecheckout') && get_the_id() == $this->get_option('wpsg_mod_onepagecheckout_page')) { ?>
+		<?php if ($this->hasMod('wpsg_mod_onepagecheckout') && wpsg_get_the_id() == $this->get_option('wpsg_mod_onepagecheckout_page')) { ?>
 		"onContinue": function(event) {
 			
 			jQuery('#wpsg_basket_form').attr('target', 'wpsg_hiddenTarget');
-- 
cgit v1.2.3