diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/css/frontend.css | 2 | ||||
| -rw-r--r-- | views/mods/mod_kundenverwaltung/login.phtml | 13 | ||||
| -rw-r--r-- | views/mods/mod_paypalapi/paypalplus.phtml | 2 | ||||
| -rw-r--r-- | views/produkt/addedit_general.phtml | 2 | ||||
| -rw-r--r-- | views/warenkorb/index.phtml | 2 |
5 files changed, 16 insertions, 5 deletions
diff --git a/views/css/frontend.css b/views/css/frontend.css index 392fc58..cd7ad5f 100644 --- a/views/css/frontend.css +++ b/views/css/frontend.css @@ -4,7 +4,7 @@ .wpsg_clear { clear:both; }
#wpsg_error, #wpsg_message { margin-bottom:1rem; }
#wpsg_message li, #wpsg_error li, #wpsg_notice li,
-#wpsg_message p, #wpsg_error p, #wpsg_notice p { margin-bottom:4px; padding:3px 0px 3px 8px; }
+#wpsg_message p, #wpsg_error p, #wpsg_notice p { list-style:none; margin-bottom:4px; padding:3px 0px 3px 8px; }
#wpsg_message li,
#wpsg_message p { border-left:4px solid #7AD03A; }
#wpsg_notice li,
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');
diff --git a/views/produkt/addedit_general.phtml b/views/produkt/addedit_general.phtml index 595e962..6d02445 100644 --- a/views/produkt/addedit_general.phtml +++ b/views/produkt/addedit_general.phtml @@ -62,8 +62,6 @@ <?php echo wpsg_drawForm_Select('rating', __('Bewertungspunkte', 'wpsg'), $arSelect, wpsg_getInt($this->view['data']['rating'])); ?>
<?php } ?>
- <?php echo wpsg_drawForm_Select('pstatus', __('Produktstatus', 'wpsg'), array('Veröffentlicht', 'Entwurf'), wpsg_getStr($this->view['data']['pstatus']), array('noKeys' => false)); ?>
-
<?php $this->callMods('produkt_edit_allgemein', array(&$this->view['data'])); ?>
<?php echo wpsg_drawForm_AdminboxEnd(); ?>
diff --git a/views/warenkorb/index.phtml b/views/warenkorb/index.phtml index a6a6eb7..e8a178a 100644 --- a/views/warenkorb/index.phtml +++ b/views/warenkorb/index.phtml @@ -79,7 +79,7 @@ <?php } ?>
</span>
- <?php if ($this->get_option('wpsg_page_basket') != get_the_ID() || isset($_REQUEST['produkt_id'])) { ?>
+ <?php if ($this->get_option('wpsg_page_basket') != wpsg_get_the_ID() || isset($_REQUEST['produkt_id'])) { ?>
<input type="button" class="wpsg_button wpshopgermany_linktokasse" onclick="location.href='<?php echo $this->getURL(wpsg_ShopController:: URL_BASKET); ?>';" value="<?php echo __("Zum Warenkorb", "wpsg"); ?>" />
<?php } ?>
<?php } else { ?>
|