Index: /mods/wpsg_mod_kundenverwaltung.class.php =================================================================== --- /mods/wpsg_mod_kundenverwaltung.class.php (revision 6166) +++ /mods/wpsg_mod_kundenverwaltung.class.php (revision 6168) @@ -153,4 +153,5 @@ $this->shop->createPage(__('Registrierung', 'wpsg'), 'wpsg_page_mod_kundenverwaltung_registrierung', $_REQUEST['wpsg_page_mod_kundenverwaltung_registrierung']); $this->shop->createPage(__('Registrierung abgeschlossen', 'wpsg'), 'wpsg_page_mod_kundenverwaltung_weiterleitung_nach_registrierung', $_REQUEST['wpsg_page_mod_kundenverwaltung_weiterleitung_nach_registrierung']); + $this->shop->createPage(__('Passwort gesendet', 'wpsg'), 'wpsg_page_mod_kundenverwaltung_passwordsend', $_REQUEST['wpsg_page_mod_kundenverwaltung_passwordsend']); $this->shop->createPage(__('Bestellungen', 'wpsg'), 'wpsg_page_mod_kundenverwaltung_order', $_REQUEST['wpsg_page_mod_kundenverwaltung_order']); @@ -570,9 +571,10 @@ } else - { - - if (wpsg_isSizedInt($this->shop->get_option('wpsg_mod_kundenverwaltung_redirectlogin'))) - { - + { + + // Wenn im Backend ID > 0 eingestellt ist und die Seite existiert + if (wpsg_isSizedInt($this->shop->get_option('wpsg_mod_kundenverwaltung_redirectlogin')) && is_page($this->shop->get_option('wpsg_mod_kundenverwaltung_redirectlogin'))) + { + $this->shop->redirect(get_permalink($this->shop->get_option('wpsg_mod_kundenverwaltung_redirectlogin'))); @@ -589,5 +591,5 @@ $this->shop->redirect($this->shop->getURL(wpsg_ShopController::URL_PROFIL)); - } + } } @@ -1306,4 +1308,16 @@ } // public function getRegisteredRedirectURL() + /** + * Gibt die URL auf die Passwort-gesendet-Seit zurÌck + */ + public function getPasswordsendURL() + { + + $page_url = get_permalink($this->shop->get_option('wpsg_mod_kundenverwaltung_passwordsend')); + + return $page_url; + + } // public function getProfilURL() + /** * Gibt die URL auf die Registrierungsseite zurÌck Index: /views/css/admin.css =================================================================== --- /views/css/admin.css (revision 6166) +++ /views/css/admin.css (revision 6168) @@ -293,2 +293,7 @@ .wpsg_mod_downloadplus_order_view_filelist .col_action { text-align:left; width:100px;} .wpsg_mod_downloadplus_order_view_filelist .row_raid td { color:red; } + +/* Passwort Visualisierung */ +#wpsg_pwd_info { width:250px; background:#fefefe; width:85%; padding:25px; border-radius:5px; box-shadow:0 1px 3px #ccc; border:1px solid #ddd; } +#wpsg_pwd_info::before { position:absolute; font-size:14px; text-shadow:none; disblay:block; color:#ddd; line-height:14px; display:none; } +#wpsg_pwd_info ul li { margin:10px 20px; display:block; } Index: /views/css/frontend.css =================================================================== --- /views/css/frontend.css (revision 6166) +++ /views/css/frontend.css (revision 6168) @@ -9,5 +9,4 @@ #wpsg_error p { border-left:4px solid #DD3D36; } .wpsg_error { border-color:#DD3D36; } -.wpsg_error_wrap { border-left:4px solid #DD3D36; list-style:none; padding-left:4px; } .wpsg { } .wpsg h2 { } @@ -19,4 +18,5 @@ #TB_ajaxContent { width:100% !important; } .wpsg_upper { vertical-align:top; font-size:60%; } + /* Basket Widget */ @@ -53,5 +53,4 @@ .wpsg_basket .wpsg_cell_gesamtsumme_value { font-weight:bold; } .wpsg_basket .wpsg_refreshbutton, .wpsg_basketbutton { float:left; } -.wpsg_basket .wpsg_basket_weiter_shoppen {background:#1a1a1a none repeat scroll 0 0; border:0 none; border-radius:2px; color:#fff; font-weight:700; line-height:1; text-transform:uppercase; padding:0.85em 0.875em 0.78em;} /* Checkout + Request*/ @@ -68,9 +67,11 @@ .wpsg_checkout .wpsg_checkout2button { float:right; } .wpsg_checkout .wpsg_mod_ordervars { margin-bottom:1rem; } +.wpsg_checkout .wpsg_required { color:#ff0000; } +.wpsg_checkout h2 {font-size:bold; padding:10px 0; } .wpsg_checkout .wpsg_commentblock textarea { box-sizing:border-box; padding:2px; width:100%; height:150px; } .wpsg_checkout .wpsg_logout_box a { float:right; border-bottom:0px; padding:15px; font-weight:bold; color:#FF0000; font-weight:bold; color:#fff; background-color:#333; } /* Checkout2 */ -.shippay_wrap { margin-top:40px; width:100%; font-family:Arial; } +.shippay_wrap { margin-top:40px; width:100%; font-family:Arial; padding-right:10px; } .wpsg_payment .wpsg_payment_textwrap { margin-top:40px; } .shippay_wrap .shippay_item_wrap { position:relative; border-top:1px solid #DFDFDF; cursor:pointer; padding-left:8px; } @@ -81,5 +82,5 @@ .shippay_wrap .shippay_active .wpsg_payship_name { font-weight:bold; } .shippay_wrap .shippay_item_wrap:last-child { border-bottom:1px solid #DFDFDF; } -.shippay_wrap .shippay_item_wrap input[type="radio"] { display:none; } +.shippay_wrap .shippay_item_wrap input { display:none; } .shippay_wrap .shippay_item_wrap .shippay_checkmark { display:none; width:23px; height:18px; background-image:url('../gfx/checkmark.png'); background-repeat:no-repeat; position:absolute; right:10px; top:16px; } .shippay_wrap .shippay_active .shippay_checkmark { display:block; } @@ -88,8 +89,6 @@ .wpsg_checkout2 .wpsg_overviewbutton { float:right; } .wpsg_checkout2 .wpsg_checkoutbutton { float:left; } -.wpsg_checkout2 .wpsg_shipping { margin-bottom:2rem; } /* Overview */ -.wpsg_overview #wpsg_overview_form { display:inline; } .wpsg_overview .wpsg_agb { width:100%; clear:both; margin-bottom:2px; } .wpsg_overview .wpsg_agb label { line-height:18px; } @@ -140,9 +139,4 @@ .wpsg_mod_autodebit input { float:right; margin-bottom:3px; } -/* Kreditkarte */ -.wpsg_mod_creditcard .wpsg_mod_creditcard_field { clear:both; } -.wpsg_mod_creditcard label { width:100%; line-height:36px; } -.wpsg_mod_creditcard input { float:right; margin-bottom:3px; } - /* Versandadresse */ .wpsg_checkout .wpsg_mod_shippingadress { margin-bottom:1rem; } @@ -155,5 +149,5 @@ .wpsg_produkt_wrapper .wpsg_add_basket { margin:1rem 0; float:right; } .wpsg_produkt_wrapper .wpsg_produkt_add_basket_wrapper { clear:both; float:left; margin:1rem 0 0 0; } -.wpsg_produkt_wrapper .wpsg_label { display:inline; font-weight:bold; } +.wpsg_produkt_wrapper .wpsg_label { display:inline; } .wpsg_produkt_wrapper .wpsg_value { display:inline; } .wpsg_produkt_wrapper .wpsg_preis_prediscount { text-decoration: line-through; } @@ -162,36 +156,4 @@ .wpsg_productform .wpsg_product_layer { z-index:1000; background-color:rgba(125, 125, 125, 0.5); position:absolute; left:-10px; top:-10px; width:100%; height:100%; padding:20px; } .wpsg_productform .wpsg_product_layer img { position:absolute; left:50%; top:50%; margin-left:-8px; margin-top:-5.5px; } - -.wpsg_produkt_wrapper .wpsg_product_afterimage { float:left; width:50%; } -.wpsg_produkt_wrapper .wpsg_product_image { float:left; width:50%; } -.wpsg_produkt_wrapper .wpsg_mod_deliverytime, -.wpsg_produkt_wrapper .wpsg_mod_weight_produkt, -.wpsg_produkt_wrapper .wpsg_produkt_varianten, -.wpsg_produkt_wrapper .wpsg-mod_produktindex_stock, -.wpsg_produkt_wrapper .wpsg_produkt_fuellmenge { margin:10px 0; } - -.wpsg_produkt_wrapper .wpsg_product_mod_information_left { float:left; width:45%; margin:20px 20px 20px 0; } -.wpsg_produkt_wrapper .wpsg_product_mod_information_right { float:left; width:45%; margin:20px 0 20px 0; } -.wpsg_produkt_wrapper .wpsg_mod_deliverytime_offline { border:1px solid #ff0a0a; } - -.wpsg_produkt_wrapper .wpsg_product_buttons_add_basket .wpsg_amount_label { float:left; } -.wpsg_produkt_wrapper .wpsg_product_button_basket { float:right; margin:30px 0; } -.wpsg_produkt_wrapper .wpsg_add_basket { padding:10px 30px; color:#fff; background-color:#29556e; border:none; text-transform:uppercase; } -.wpsg_produkt_wrapper .wpsg_add_basket { padding:10px 30px; color:#fff; background-color:#29556e; border:none; text-transform:uppercase; } -.wpsg_produkt_wrapper .wpsg_product_button_area { border-top:1px solid #d0e7ef; border-bottom:1px solid #d0e7ef; } -.wpsg_produkt_wrapper .wpsg_producttitle { font-size:25px; margin:20px 0; } -.wpsg_produkt_wrapper .wpsg_produkt_preis label { display:none; } -.wpsg_produkt_wrapper .wpsg_produkt_preis .wpsg_preis { font-size:20px; font-weight:bold; color:#29556E;} -.wpsg_produkt_wrapper .wpsg_product_price_area { margin-bottom:20px; } -.wpsg_produkt_wrapper .wpsg_product_social_media { border-top:1px solid #d0e7ef; border-bottom:1px solid #d0e7ef; margin:20px 0; } - -.wpsg_product_informationarea { margin:20px 0; } -.wpsg_product_informationarea .wpsg_product_informationarea_reiter { text-transform:uppercase; font-size:20px; font-weight:bold; color:#d0e7ef; } -.wpsg_product_informationarea .wpsg_product_informationarea_reiter:active { font-weight:bold; color:##29556e; text-decoration:underline; } -.wpsg_product_informationarea .wpsg_product_informationarea_reiter:hover { font-weight:bold; color:##29556e; text-decoration:none; } - -.wpsg_product_assessment, .wpsg_product_information_more, .wpsg_product_information_large { width:30%; margin:0 10px; float:left; } - - /* Ajax Meldung Ìber das Produkttemplate */ @@ -311,5 +273,26 @@ /* Modul Zubehörprodukte */ .wpsg_mod_relatedproducts_basket { margin-top:2rem; } - + +/* Progress bar +.steps { list-style:none; margin:0; padding:10px 0; overflow:hidden; font-family:'inherit',sans-serif; font-size:1.5rem; width:100%; height:auto; line-height:20px; font-weight:bold; counter-reset:li; } +.steps > a, .steps > p { float:left; margin:5px 0;} +.steps a, .steps p { list-style-image:none; list-style-type:none; margin-left:0; text-align:center; color:#bbb; background:#f2f2f2; position:relative; margin-left:43px; border-bottom:medium none !important; } + +.steps a:after, .steps p:after { position:absolute; top:50%; left:100%; content:" "; height:0; width:0; border:solid transparent; border-left-color:#f2f2f2; border-width:19px; margin-top:-19px; } +.steps a span:after, .steps p span:after { position:absolute; top:50%; right:100%; content:" "; height:0; width:0; border:solid #f2f2f2; border-left-color:transparent; border-width:19px; margin-top:-19px; } + +.steps a span, .steps p span { display:block; padding:9px 28px 9px 9px; } +.steps a span:before, .steps p span:before { counter-increment:li; } + +.steps a.current, .steps p.current { color:#3a3a3a; background:#c9c9c9; } +.steps a.current:after, .steps p.current:after { border-left-color:#c9c9c9; } +.steps a.current span:after, .steps p.current span:after { border-color:#c9c9c9; border-left-color:transparent; } + +.steps a.step1, .steps p.step1 { z-index:9; } +.steps a.step2, .steps p.step2 { z-index:8; } +.steps a.step3, .steps p.step3 { z-index:7; } +.steps a.step4, .steps p.step4 { z-index:6; } +*/ + .wpsg_progress { padding:0px; margin:0px; width:100%; margin-bottom:100px; margin-top:30px; } .wpsg_progress:after { border:1px solid #C5C5C5; height:10px; background-color:#F2F2F2; box-sizing:border-box; display:block; width:100%; content:" "; } @@ -335,5 +318,5 @@ .wpsg_mod_funding_progress .wpsg_mod_funding_state > .bar > .value { background-color:#484C51; height:100%; width:0%; } .wpsg_mod_funding_progress .wpsg_mod_funding_state > .value { width:10%; height:100%; border-left:1px solid #C5C5C5; float:right; text-align:center; } - + /* Modul "Produktansichten" */ .wpsg_productview { position:relative; } @@ -398,43 +381,5 @@ .wpsg_basket .wpsg_cell_gutschein label { width:100%; display:block; } .wpsg_basket #wpsg_gutschein_input { float:left; } - .wpsg_basket td, th { width:20%; font-size:0.8rem; -moz-hyphens: auto; -o-hyphens: auto; -webkit-hyphens: auto; -ms-hyphens: auto; hyphens: auto; } - .wpsg_basket .wpsg_cell_payment_label select, .wpsg_basket .wpsg_cell_payment_label span { float:none; } - .wpsg_basket .wpsg_cell_shipping_label select, .wpsg_basket .wpsg_cell_shipping_label span { float:left; } - - .wpsg wpsg_checkout2 .wpsg_payment{ margin-top:30px; } - - .wpsg_overview .wpsg_produkte th { width:25% !important; } - .wpsg_overview td, th { width:20%; font-size:0.8rem; -moz-hyphens: auto; -o-hyphens: auto; -webkit-hyphens: auto; -ms-hyphens: auto; hyphens: auto; } } -.only3steps span.step { width: 33%; } - -.wpsg_mod_productvars_input { box-sizing:border-box; } - -/* Passwort Visualisierung */ -#wpsg_pwd_info { width:250px; background:#fefefe; width:100%; padding:25px; border-radius:5px; box-shadow:0 1px 3px #ccc; border:1px solid #ddd; display:none; } -#wpsg_pwd_info::before { position:absolute; font-size:14px; text-shadow:none; disblay:block; color:#ddd; line-height:14px; } -#wpsg_pwd_info ul li { margin:10px 20px; display:block; } -.invalid { padding-left:22px; line-height:24px; color:#ec3f41; } -.valid { padding-left:22px; line-height:24px; color:#3a7d34; } - -/* ajaxDialog Basket */ -#wpsg_basket_ajax_message .wpsg_basket_ajax_message_content { max-height:32rem; } -.wpsg_basket_ajax_message_content_left { width:30%; float:left; } -.wpsg_basket_ajax_message_content_right { width:70%; float:left; } -.wpsg_ajaxdialog_form, .wpsg_ajaxdialog_relatedproducts h3 { float:left; } -.wpsg_ajaxDialog_relatedproducts, .wpsg_ajaxdialog_relatedproducts { float:left; padding:20px 0; } -.wpsg_ajaxdialog_productrow { float:left; padding:20px; margin:0 15px; width:13rem; } -.wpsg_ajaxdialog_relatedproducts { height:200px; } - -/* Amazon */ -.wpsg_amazonhandler { display:none; } -#LoginWithAmazon { float:right; margin-bottom:1rem; margin-left:1rem; } -#addressBookWidgetDiv { width:100%; height:250px; float:left; margin-bottom:1rem; } -#walletWidgetDiv { width:100%; height:250px; float:right; } -#wpsg_mod_amazon_paymentForm input[type="submit"] { float:right; margin-top:1rem; } - -/* SOFORT Ident */ -#wpsg_mod_si_form { display:inline; } -#wpsg_mod_si_form input { float:right; } Index: /views/mods/mod_kundenverwaltung/settings_edit.phtml =================================================================== --- /views/mods/mod_kundenverwaltung/settings_edit.phtml (revision 6166) +++ /views/mods/mod_kundenverwaltung/settings_edit.phtml (revision 6168) @@ -42,4 +42,5 @@ view['pages'], $this->get_option('wpsg_page_mod_kundenverwaltung_registrierung'), array('help' => 'wpsg_page_mod_kundenverwaltung_registrierung')); ?> view['pages'], $this->get_option('wpsg_page_mod_kundenverwaltung_weiterleitung_nach_registrierung'), array('help' => 'wpsg_page_mod_kundenverwaltung_weiterleitung_nach_registrierung')); ?> +view['pages'], $this->get_option('wpsg_page_mod_kundenverwaltung_passwordsend'), array('help' => 'wpsg_page_mod_kundenverwaltung_passwordsend')); ?> view['pages'], $this->get_option('wpsg_page_mod_kundenverwaltung_order'), array('help' => 'wpsg_mod_kundenverwaltung_order')); ?>