Kevin
ac3bd6e8ea
Feedback-Umsetzung (dev/2026-07-22/feedback-analyse-2026-07-24.md, alle 10 Punkte):
- VIP-Statistik: eigener Berater ('ich', Linie 0) in Neue-Kundenabos- und beiden Top-10-Listen; Top-10-Umsatz sortiert nach abgerechneten Ist-Punkten + Abo-Anzahl-Spalte; Fußnote nicht-payline-wirksame Punkte (SalesVolumePoints::nonPaylinePoints)
- Führungskräfte-Liste: beide Sichten 'direkt' (an nächster FK abgeschnitten, additiv) und 'gesamt' (komplette Downline), Gesamt-Spalte nach Kundenzählweise
- Team-Abos: je Ebene 'abgerechnet (Monat)' und 'bis zum 25. erwartet'; Payline-Karte mit Teamabo-/Kundenabo-Zählern
- Incentive-Live-Ranking: Qualifizierte zuerst nummeriert (fixt auch isWinner rank<=max_winners)
- Porto: Netto-/Brutto-Kennzeichnung (Berater netto, Endkunden inkl. MwSt., portal_view-Flag; auch CRM-/Shop-Warenkorb + Checkout), Yard::shipping_tax-Fix
- Struktur-Ansicht: Abo-Badges 'A' (eigenes Abo) und '(n)' (Kundenabos) je Teampartner, gebatcht
- Abo-Löschung: Softdelete setzt active=0 (UserAbo deleting-Hook) + Bereinigungs-Migration für gelöschte-aber-aktive Abos
- Doku: technische Analyse + Kundinnen-Feedback-Dokument unter dev/2026-07-22/
- Tests: IncentiveRankingTest, TeamStructureAboBadgesTest, YardShippingTaxTest (neu); BackofficeStatisticsListsTest, TeamAboOverviewTest, PaylineForecastServiceTest, AboAdminDeleteTest, AboOneTimeViewTest erweitert
Außerdem enthalten (Branch-WIP vor dem Feedback): DATEV-Abgleich-Fixes 08+09/2025, USt-ID-Live-Validierung sowie restliche unkommittete Stände (u. a. Abo-Pause-Sprachkeys).
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
441 lines
14 KiB
PHP
441 lines
14 KiB
PHP
<?php
|
|
|
|
namespace App\Http\Controllers;
|
|
|
|
use App\Models\UserShop;
|
|
use App\Models\UserShopOnSite;
|
|
use App\Repositories\UserRepository;
|
|
use App\Services\Slim;
|
|
use Auth;
|
|
use Cviebrock\EloquentSluggable\Services\SlugService;
|
|
use Request;
|
|
use Response;
|
|
use Validator;
|
|
|
|
class UserShopController extends Controller
|
|
{
|
|
protected $db;
|
|
|
|
protected $userRepo;
|
|
|
|
public function __construct(UserRepository $userRepo)
|
|
{
|
|
$this->middleware('active.shop');
|
|
$this->userRepo = $userRepo;
|
|
}
|
|
|
|
public function index()
|
|
{
|
|
$user = Auth::user();
|
|
if ($user->shop && ! $user->shop->set_defaults) {
|
|
if ($user->account) {
|
|
$user->shop->title = $user->account->first_name.' '.$user->account->last_name;
|
|
}
|
|
if ($user->account) {
|
|
$user->shop->contact = $this->generate_contact($user);
|
|
} else {
|
|
$user->shop->contact = __('shop.shop_contact_text');
|
|
}
|
|
$user->shop->accessibility = __('shop.shop_accessibility_text');
|
|
}
|
|
if ($user->shop && $user->shop->active == 0) {
|
|
return redirect(route('user_shop_name_edit'));
|
|
}
|
|
$data = [
|
|
'user' => $user,
|
|
];
|
|
|
|
return view('user.shop', $data);
|
|
}
|
|
|
|
public function translate()
|
|
{
|
|
$user = Auth::user();
|
|
$data = [
|
|
'user' => $user,
|
|
'localizations' => array_keys(config('localization.supportedLocales')),
|
|
|
|
];
|
|
|
|
return view('user.shop.translate', $data);
|
|
}
|
|
|
|
public function translateStore()
|
|
{
|
|
$user = Auth::user();
|
|
$data = Request::all();
|
|
|
|
if (! $user->shop) {
|
|
abort(404);
|
|
}
|
|
foreach ($data['trans'] as $lang => $val) {
|
|
$this->storeTranslations($user->shop, $lang, $val);
|
|
}
|
|
\Session()->flash('alert-save', true);
|
|
|
|
return redirect(route('user_shop_translate'));
|
|
}
|
|
|
|
public function store()
|
|
{
|
|
$user = Auth::user();
|
|
$data = Request::all();
|
|
|
|
if (! $user->shop) {
|
|
abort(404);
|
|
}
|
|
$user->shop->title = $data['title'];
|
|
$user->shop->active = isset($data['active']) ? true : false;
|
|
$user->shop->set_defaults = true;
|
|
$user->shop->save();
|
|
$this->storeTranslations($user->shop, \App::getLocale(), $data);
|
|
\Session()->flash('alert-save', true);
|
|
|
|
return redirect(route('user_shop'));
|
|
}
|
|
|
|
private function storeTranslations($user_shop, $lang, $data)
|
|
{
|
|
|
|
if ($lang == 'de') {
|
|
$user_shop->contact = trim(preg_replace('/\s*\n+/', "\n", $data['contact']));
|
|
$user_shop->accessibility = trim(preg_replace('/\s*\n+/', "\n", $data['accessibility']));
|
|
$user_shop->about = trim(preg_replace('/\s+/', ' ', $data['about']));
|
|
$user_shop->save();
|
|
|
|
return;
|
|
}
|
|
$trans = $user_shop->trans;
|
|
$trans[$lang]['contact'] = trim(preg_replace('/\s*\n+/', "\n", $data['contact']));
|
|
$trans[$lang]['accessibility'] = trim(preg_replace('/\s*\n+/', "\n", $data['accessibility']));
|
|
$trans[$lang]['about'] = trim(preg_replace('/\s+/', ' ', $data['about']));
|
|
$user_shop->trans = $trans;
|
|
$user_shop->save();
|
|
|
|
}
|
|
|
|
private function generate_contact($user)
|
|
{
|
|
$ret = '';
|
|
$sep = "\n";
|
|
|
|
$ret = $user->account->street != '' ? $user->account->street : __('shop.your_street_number');
|
|
$ret .= ' • ';
|
|
$ret .= $user->account->postal_code != '' ? $user->account->postal_code.' ' : __('shop.your_zip_code');
|
|
$ret .= $user->account->city != '' ? $user->account->city : __('shop.your_city');
|
|
$ret .= $sep;
|
|
|
|
$pre = $user->account->pre_phone_id != '' ? $user->account->pre_phone->phone.' ' : '';
|
|
$ret .= __('shop.phone').': '.($user->account->phone != '' ? $pre.$user->account->phone : __('shop.your_phone_number'));
|
|
$ret .= $sep;
|
|
|
|
$pre = $user->account->pre_mobil_id != '' ? $user->account->pre_mobil->phone.' ' : '';
|
|
$ret .= __('shop.mobil').': '.($user->account->mobil != '' ? $pre.$user->account->mobil : __('shop.your_mobile_number'));
|
|
$ret .= $sep;
|
|
|
|
$ret .= $user->email;
|
|
|
|
return $ret;
|
|
}
|
|
|
|
// Upload FILE -----------------------------------------------------------------------------------------------------------------------
|
|
|
|
public function uploadImage()
|
|
{
|
|
|
|
$user = Auth::user();
|
|
|
|
if (! $user->shop) {
|
|
abort(404);
|
|
}
|
|
|
|
try {
|
|
$image = Slim::getImages('images')[0];
|
|
|
|
if (isset($image['output']['data'])) {
|
|
// Base64 of the image
|
|
$data = $image['output']['data'];
|
|
$file_ex = ['image/jpeg' => 'jpg', 'image/png' => 'png'];
|
|
|
|
if (! isset($file_ex[$image['output']['type']])) {
|
|
\Session()->flash('alert-danger', 'File is not jpg or png!');
|
|
|
|
return redirect(route('user_shop'));
|
|
}
|
|
|
|
$ext = $file_ex[$image['output']['type']];
|
|
// Original file name
|
|
$name = $image['output']['name'];
|
|
$name = Slim::sanitizeFileName($name);
|
|
$name = uniqid().'_'.$name;
|
|
|
|
$data = \Storage::disk('public')->put(
|
|
'images/shop/'.$name,
|
|
$data
|
|
);
|
|
|
|
$user->shop->filename = $name;
|
|
$user->shop->originalname = $image['output']['name'];
|
|
$user->shop->ext = $ext;
|
|
$user->shop->mine = $image['output']['type'];
|
|
$user->shop->size = $image['input']['size'];
|
|
$user->shop->save();
|
|
|
|
\Session()->flash('alert-success', __('msg.file_uploaded'));
|
|
|
|
return redirect(route('user_shop'));
|
|
}
|
|
\Session()->flash('alert-danger', __('msg.file_empty'));
|
|
|
|
return redirect(route('user_shop'));
|
|
} catch (\Exception $e) {
|
|
\Session()->flash('alert-danger', 'Error: '.$e);
|
|
|
|
return redirect(route('user_shop'));
|
|
}
|
|
}
|
|
|
|
public function deleteImage()
|
|
{
|
|
|
|
$user = Auth::user();
|
|
|
|
if (! $user->shop) {
|
|
abort(404);
|
|
}
|
|
|
|
if ($user->shop->filename) {
|
|
$file = 'images/shop/'.$user->shop->filename;
|
|
\Storage::disk('public')->delete($file);
|
|
|
|
$user->shop->filename = null;
|
|
$user->shop->originalname = null;
|
|
$user->shop->ext = null;
|
|
$user->shop->mine = null;
|
|
$user->shop->size = null;
|
|
$user->shop->save();
|
|
|
|
\Session()->flash('alert-success', __('msg.file_deleted'));
|
|
|
|
return redirect(route('user_shop'));
|
|
}
|
|
\Session()->flash('alert-danger', __('msg.file_not_found'));
|
|
|
|
return redirect(route('user_shop'));
|
|
}
|
|
|
|
public function uploadOnSiteImage()
|
|
{
|
|
|
|
$user = Auth::user();
|
|
$user_shop_id = Request::get('user_shop_id');
|
|
|
|
if (! $user->shop || $user->shop->id != $user_shop_id) {
|
|
abort(404);
|
|
}
|
|
|
|
try {
|
|
$image = Slim::getImages('images')[0];
|
|
|
|
if (isset($image['output']['data'])) {
|
|
|
|
// Base64 of the image
|
|
$data = $image['output']['data'];
|
|
$file_ex = ['image/jpeg' => 'jpg', 'image/png' => 'png'];
|
|
|
|
if (! isset($file_ex[$image['output']['type']])) {
|
|
\Session()->flash('alert-danger', 'File is not jpg or png!');
|
|
|
|
return redirect(route('user_shop'));
|
|
}
|
|
|
|
$ext = $file_ex[$image['output']['type']];
|
|
// Original file name
|
|
$name = $image['output']['name'];
|
|
$name = Slim::sanitizeFileName($name);
|
|
$name = uniqid().'_'.$name;
|
|
|
|
$data = \Storage::disk('public')->put(
|
|
'images/user_shop/'.$user->shop->id.'/'.$name,
|
|
$data
|
|
);
|
|
|
|
UserShopOnSite::create([
|
|
'user_shop_id' => $user->shop->id,
|
|
'filename' => $name,
|
|
'original_name' => $image['output']['name'],
|
|
'ext' => $ext,
|
|
'mine' => $image['output']['type'],
|
|
'size' => $image['input']['size'],
|
|
]);
|
|
|
|
\Session()->flash('alert-success', __('msg.file_uploaded'));
|
|
|
|
return redirect(route('user_shop'));
|
|
}
|
|
\Session()->flash('alert-danger', __('msg.file_empty'));
|
|
|
|
return redirect(route('user_shop'));
|
|
} catch (\Exception $e) {
|
|
\Session()->flash('alert-danger', 'Error: '.$e);
|
|
|
|
return redirect(route('user_shop'));
|
|
}
|
|
}
|
|
|
|
public function deleteOnSiteImage($image_id, $user_shop_id)
|
|
{
|
|
|
|
$user = Auth::user();
|
|
if (! $user->shop || $user->shop->id != $user_shop_id) {
|
|
abort(404);
|
|
}
|
|
$image = UserShopOnSite::findOrFail($image_id);
|
|
|
|
if ($image->user_shop_id == $user_shop_id) {
|
|
$file = 'images/user_shop/'.$user_shop_id.'/'.$image->filename;
|
|
\Storage::disk('public')->delete($file);
|
|
|
|
$image->delete();
|
|
|
|
\Session()->flash('alert-success', __('msg.file_deleted'));
|
|
|
|
return redirect(route('user_shop'));
|
|
}
|
|
\Session()->flash('alert-danger', __('msg.file_not_found'));
|
|
|
|
return redirect(route('user_shop'));
|
|
}
|
|
|
|
public function userShopRegisterForm()
|
|
{
|
|
|
|
if (Request::get('shop_submit') == 'check') {
|
|
$rules = [
|
|
'user_shop_name' => ' required|alpha_dash|unique:user_shops,name|min:4|max:20|full_word_check',
|
|
];
|
|
Validator::extend('full_word_check', function ($attribute, $value, $parameters, $validator) {
|
|
if (in_array($value, config('profanity.full_word_check'))) {
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
});
|
|
$validator = Validator::make(Request::all(), $rules);
|
|
|
|
if ($validator->fails()) {
|
|
\Session()->flash('shop-name-error', 'error');
|
|
|
|
return redirect()->back()->withErrors($validator)->withInput(Request::all());
|
|
}
|
|
\Session()->flash('shop-name-error', 'check');
|
|
if (Request::get('user_shop_id')) {
|
|
return back()->withInput(Request::all());
|
|
}
|
|
|
|
return redirect(route('user_shop'))->withInput(Request::all());
|
|
}
|
|
|
|
if (Request::get('shop_submit') == 'action') {
|
|
|
|
$rules = [
|
|
'user_shop_name' => ' required|alpha_dash|unique:user_shops,name|min:4|max:20|full_word_check',
|
|
'user_shop_active' => 'accepted',
|
|
|
|
];
|
|
Validator::extend('full_word_check', function ($attribute, $value, $parameters, $validator) {
|
|
if (in_array($value, config('profanity.full_word_check'))) {
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
});
|
|
$validator = Validator::make(Request::all(), $rules);
|
|
if ($validator->fails()) {
|
|
\Session()->flash('shop-name-error', 'error');
|
|
|
|
return redirect()->back()->withErrors($validator)->withInput(Request::all());
|
|
}
|
|
\Session()->flash('shop-name-error', 'check');
|
|
|
|
// all is right - save
|
|
$user = Auth::user();
|
|
$data = Request::all();
|
|
$slug = SlugService::createSlug(UserShop::class, 'slug', $data['user_shop_name']);
|
|
if (isset($data['user_shop_id'])) {
|
|
$user_shop = UserShop::find($data['user_shop_id']);
|
|
if ($user_shop->user_id != $user->id) {
|
|
abort(404);
|
|
}
|
|
$user_shop->name = $slug;
|
|
$user_shop->slug = $slug;
|
|
$user_shop->active = 1;
|
|
$user_shop->save();
|
|
} else {
|
|
$user_shop = UserShop::create(
|
|
[
|
|
'user_id' => $user->id,
|
|
'name' => $slug,
|
|
'active' => true,
|
|
'active_date' => now(),
|
|
]
|
|
);
|
|
}
|
|
\Session()->flash('alert-save', true);
|
|
|
|
return redirect(route('user_shop'));
|
|
}
|
|
}
|
|
|
|
/**
|
|
* @return string to ajax
|
|
*/
|
|
public function checkUserShopName()
|
|
{
|
|
|
|
$rules = [
|
|
'user_shop_name' => ' required|alpha_dash|unique:user_shops,name|min:4|max:20|full_word_check',
|
|
];
|
|
Validator::extend('full_word_check', function ($attribute, $value, $parameters, $validator) {
|
|
if (in_array($value, config('profanity.full_word_check'))) {
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
});
|
|
|
|
$validator = Validator::make(Request::all(), $rules);
|
|
|
|
if ($validator->fails()) {
|
|
// $messages = $validator->messages();
|
|
return Response::json([
|
|
'success' => false,
|
|
'errors' => $validator->getMessageBag()->toArray(),
|
|
|
|
]);
|
|
}
|
|
$slug = SlugService::createSlug(UserShop::class, 'slug', Request::get('user_shop_name'));
|
|
|
|
return Response::json([
|
|
'success' => true,
|
|
'preview_user_shop_name' => 'https://'.$slug.'.'.config('app.domain').config('app.tld_care'),
|
|
]);
|
|
}
|
|
|
|
public function editName()
|
|
{
|
|
$user = Auth::user();
|
|
$user_shop = $user->shop;
|
|
if (! $user_shop) {
|
|
abort(404);
|
|
}
|
|
$user_shop_domain = $user_shop->getSubdomain(false);
|
|
$data = [
|
|
'user' => $user,
|
|
'user_shop_id' => $user_shop->id,
|
|
'user_shop_domain' => $user_shop_domain,
|
|
];
|
|
|
|
return view('user.shop_edit_name', $data);
|
|
}
|
|
}
|