gitmedia/mivita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update 20.10.2025

Browse source
This commit is contained in:
Kevin Adametz 2025-10-20 17:42:08 +02:00
parent 8c11130b5d
commit a939cd51ef
616 changed files with 84821 additions and 4121 deletions
Download patch file Download diff file Expand all files Collapse all files

0
app/Http/Controllers/Web/CardController.php Executable file → Normal file
View file

4
app/Http/Controllers/Web/CheckoutController.php Executable file → Normal file
View file

@ -243,7 +243,7 @@ class CheckoutController extends Controller
// Kreditkarte prüfen
if ($payment_method === 'cc') {
$result = $this->checkCreditCard($data, $shopping_user, $shopping_order);
if (!isset($result['returnstatus']) || $result['returnstatus'] !== 'VALID') {
if (!is_array($result) || !isset($result['returnstatus']) || $result['returnstatus'] !== 'VALID') {
return $result;
}
}
@ -251,7 +251,7 @@ class CheckoutController extends Controller
// SEPA prüfen
if ($payment_method === 'elv') {
$result = $this->checkSepaAccount($data, $shopping_user, $shopping_order);
if (!isset($result['returnstatus']) || $result['returnstatus'] !== 'VALID') {
if (!is_array($result) || !isset($result['returnstatus']) || $result['returnstatus'] !== 'VALID') {
return $result;
}
}

0
app/Http/Controllers/Web/ContactController.php Executable file → Normal file
View file

0
app/Http/Controllers/Web/HomepartyController.php Executable file → Normal file
View file

55
app/Http/Controllers/Web/RegisterController.php Executable file → Normal file
View file

@ -39,6 +39,18 @@ class RegisterController extends Controller
public function index()
{
if (config('app.debug')) {
\Log::channel('doamin')->debug('RegisterController: index - Session user_shop', [
'session_user_shop_id' => \Session::get('user_shop')?->id,
'session_user_shop_name' => \Session::get('user_shop')?->name,
'session_user_shop_user_id' => \Session::get('user_shop')?->user_id,
'session_id' => \Session::getId(),
'session_domain' => config('session.domain'),
'request_host' => request()->getHost(),
'all_session_keys' => array_keys(\Session::all())
]);
}
$data = [
'GOOGLE_ReCAPTCHA_KEY' => $this->GOOGLE_ReCAPTCHA_KEY,
'user_shop' => Util::getUserShop(),
@ -49,12 +61,12 @@ class RegisterController extends Controller
public function member($member_id = false)
{
if(!$member_id){
if (!$member_id) {
return redirect('/registrierung');
}
$user_id = (int) str_replace('m', '', $member_id) - config('mivita.add_number_id');
$user = User::find($user_id);
if(!$user || !$user->isActive() || !$user->isActiveAccount()){
if (!$user || !$user->isActive() || !$user->isActiveAccount()) {
return redirect('/registrierung');
}
$data = [
@ -66,22 +78,23 @@ class RegisterController extends Controller
return view('web.templates.registrierung', $data);
}
public function register(){
public function register()
{
$rules = array(
'salutation' => 'required',
'first_name'=>'required',
'last_name'=>'required',
'first_name' => 'required',
'last_name' => 'required',
'email' => 'required|string|email|max:255|unique:users',
'email-confirm' => 'required|same:email',
'password' => 'required|string|min:6|confirmed',
'password_confirmation' => 'required|string|min:6',
'g-recaptcha-response'=>'required|recaptcha',
'g-recaptcha-response' => 'required|recaptcha',
'accepted_data_protection' => 'required',
);
Validator::extend('recaptcha', function($attribute, $value, $parameters, $validator) {
return $this->reCaptcha_validate($attribute, $value, $parameters, $validator);
Validator::extend('recaptcha', function ($attribute, $value, $parameters, $validator) {
return $this->reCaptcha_validate($attribute, $value, $parameters, $validator);
});
$validator = Validator::make(Request::all(), $rules);
@ -90,16 +103,15 @@ class RegisterController extends Controller
}
$user_shop = Util::getUserShop();
$data = Request::all();
$user = $this->userRepo->create($data);
$confirmation_code = UserService::createConfirmationCode();
$m_sponsor_id = 1;
if($user_shop){
if ($user_shop) {
$m_sponsor_id = $user_shop->user->id;
}
if(isset($data['from_member_id'])){
if (isset($data['from_member_id'])) {
$m_sponsor_id = (int) str_replace('m', '', $data['from_member_id']) - config('mivita.add_number_id');
}
$user->lang = !empty(\App::getLocale()) ? \App::getLocale() : "de";
@ -109,22 +121,19 @@ class RegisterController extends Controller
$user->m_sponsor = $m_sponsor_id;
$UserLevel = UserLevel::where('default', 1)->first();
if($UserLevel){
if ($UserLevel) {
$user->m_level = $UserLevel->id;
}else{
} else {
$user->m_level = 10;
}
$user->save();
$user->account->data_protection = now();
$user->account->save();
Mail::to($user->email)->locale($user->getLocale())->send(new MailVerifyAccount($confirmation_code, $user));
Mail::to($user->email)->locale($user->getLocale())->send(new MailVerifyAccount($confirmation_code, User::find($user->id)));
return redirect('/registrierung/finish');
}
public function finish()
@ -135,7 +144,7 @@ class RegisterController extends Controller
];
return view('web.templates.registrierung_finish', $data);
}
private function reCaptcha_validate($attribute, $value, $parameters, $validator)
{
@ -143,7 +152,8 @@ class RegisterController extends Controller
$response = $client->post(
'https://www.google.com/recaptcha/api/siteverify',
['form_params' =>
[
'form_params' =>
[
'secret' => $this->GOOGLE_ReCAPTCHA_SECRET,
'response' => $value
@ -154,7 +164,4 @@ class RegisterController extends Controller
$body = json_decode((string)$response->getBody());
return $body->success;
}
}
}

66
app/Http/Controllers/Web/SiteController.php Executable file → Normal file
View file

@ -20,7 +20,7 @@ class SiteController extends Controller
{
$this->setIPInfo();
$products = ['aloe-vera-gel-99', 'aloe-vera-saft-500-ml', 'aloe-vera-lippenbalsam'];
// $set_products = ['aloe-vera-cleaner-set', 'aloe-vera-koerper-set', 'aloe-vera-repair-set'];
// $set_products = ['aloe-vera-cleaner-set', 'aloe-vera-koerper-set', 'aloe-vera-repair-set'];
$set_products = ['aloe-vera-koerper-set', 'baby-set', 'aloe-vera-gel-set'];
$data = [
'products' => Product::whereIn('slug', $products)->where('active', true)->whereJsonContains('show_on', '1')->get(),
@ -34,16 +34,18 @@ class SiteController extends Controller
return view('web.index', $data);
}
public function domainCheck(){
public function domainCheck()
{
die("checked");
}
public function changeLang(){
public function changeLang()
{
$data = Request::all();
if(isset($data['change_country_id'])){
if (isset($data['change_country_id'])) {
$mylangs = Shop::getLangChange('webshop');
foreach($mylangs as $code => $country){
if(strtolower($data['change_country_id']) === strtolower($code)){
foreach ($mylangs as $code => $country) {
if (strtolower($data['change_country_id']) === strtolower($code)) {
\Session::put('user_init_country', strtolower($code));
\Session::forget('user_init_country_options');
\Session::put('locale', strtolower($data['change_locale_id']));
@ -58,41 +60,41 @@ class SiteController extends Controller
{
//wurde schon gesetzt //cache
$country = strtolower(Shop::getIPDatabaseInfo());
if(\Session::has('user_init_country')){
if (\Session::has('user_init_country')) {
return;
}
if(config('app.ipinfo')){
if (config('app.ipinfo')) {
$country = strtolower(Shop::getIPDatabaseInfo());
if($country === 'de'){ //$locale de - init AT
if ($country === 'de') { //$locale de - init AT
\Session::put('user_init_country', $country);
return;
}
if($country === 'error'){ //$locale at - init AT
if ($country === 'error') { //$locale at - init AT
$country = 'de';
}
}else{
} else {
$country = 'de';
}
}
//$locale = strtolower(\App::getLocale());
//ist default
//sprache
if(array_key_exists($country, \App\Services\UserService::getTransChange())){
if (array_key_exists($country, \App\Services\UserService::getTransChange())) {
\Session::put('user_init_country', $country);
\Session::put('locale', $country);
\App::setLocale($country);
}else{
} else {
//default EN
\Session::put('user_init_country', 'de');
\Session::put('locale', 'de');
\App::setLocale('de');
}
}
//bestelland / versandland
if(array_key_exists($country, Shop::getLangChange('webshop'))){
if (array_key_exists($country, Shop::getLangChange('webshop'))) {
\Session::put('user_init_country_options', $country);
}else{
} else {
\Session::put('user_init_country_options', 'de');
}
@ -101,11 +103,10 @@ class SiteController extends Controller
public function site($site, $subsite = false, $product_slug = false)
{
$this->setIPInfo();
$subsite = trim($subsite, '/');
$product_slug = trim($product_slug, '/');
if($product_slug){
if ($product_slug) {
$category = Category::where('slug', $subsite)->where('active', true)->first();
$product = Product::where('slug', $product_slug)->where('active', true)->whereJsonContains('show_on', '1')->first();
if ($category && $product) {
@ -121,13 +122,12 @@ class SiteController extends Controller
return view('web.templates.produkte-show', $data);
}
}
if($site === 'produkte'){
if($subsite || $subsite !== 'alle-produkte') {
if ($site == 'produkte') {
if ($subsite || $subsite !== 'alle-produkte') {
$category = Category::where('slug', $subsite)->where('active', true)->first();
if ($category) {
$headline_image = false;
if($category->headline_image_id && $category->iq_image && $category->iq_image->active){
if ($category->headline_image_id && $category->iq_image && $category->iq_image->active) {
$headline_image = $category->iq_image;
}
@ -148,9 +148,9 @@ class SiteController extends Controller
'yard_instance' => 'webshop',
];
return view('web.templates.' . $site, $data);
}
}
dd($subsite);
$data = [
'user_shop' => Util::getUserShop(),
'mylangs' => Shop::getLangChange('webshop'),
@ -163,22 +163,22 @@ class SiteController extends Controller
'headline_image' => false,
'yard_instance' => 'webshop',
];
return view('web.templates.'.$site, $data);
return view('web.templates.' . $site, $data);
}
$data = [
'user_shop' => Util::getUserShop(),
'mylangs' => Shop::getLangChange('webshop'),
'yard_instance' => 'webshop',
];
if($subsite){
if(!view()->exists('web.templates.'.$subsite)){
];
if ($subsite) {
if (!view()->exists('web.templates.' . $subsite)) {
abort(404);
}
return view('web.templates.'.$subsite, $data);
return view('web.templates.' . $subsite, $data);
}
if(!view()->exists('web.templates.'.$site)){
if (!view()->exists('web.templates.' . $site)) {
abort(404);
}
return view('web.templates.'.$site, $data);
return view('web.templates.' . $site, $data);
}
}
}