Partnercenter: Rollen-Flags fuer Einzelprovision und interne Rollen
- exclude_single_commission: Rollen (z. B. Barkunde 0 %) ziehen den produktseitigen Kunden-Einzelrabatt (single_commission/value_commission) nicht mehr ab. Behebt: 0-%-Rolle zog trotzdem die Produktprovision. - hide_registration: interne Rollen (z. B. Mitarbeiter) werden im Wizard und der Mitgliedschafts-Auswahl ausgeblendet, bleiben im Admin/Lead (HTMLHelper) weiter zuweisbar. - Migration 2026_09_11_100000 (beide Flags, Default false), Model-casts/ fillable, Admin-Formular (2 Checkboxen), Warenkorb-Gate in Yard. - Test tests/Feature/UserLevelSingleCommissionTest.php. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
parent
ef19dc2ced
commit
5e55fa63bb
8 changed files with 752 additions and 521 deletions
|
|
@ -2,19 +2,15 @@
|
|||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
|
||||
use App\Models\Attribute;
|
||||
use App\Models\ProductAttribute;
|
||||
use App\Models\Shipping;
|
||||
use App\Models\UserLevel;
|
||||
use App\Models\UserLevelMargin;
|
||||
use Request;
|
||||
use Validator;
|
||||
|
||||
|
||||
class UserLevelController extends Controller
|
||||
{
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->middleware('admin');
|
||||
|
|
@ -27,53 +23,59 @@ class UserLevelController extends Controller
|
|||
'values' => UserLevel::orderBy('pos')->get(),
|
||||
'trans' => array_keys(config('localization.supportedLocales')),
|
||||
];
|
||||
|
||||
return view('admin.level.index', $data);
|
||||
}
|
||||
|
||||
public function edit($id)
|
||||
{
|
||||
if($id === "new"){
|
||||
$user_level = new UserLevel();
|
||||
if ($id === 'new') {
|
||||
$user_level = new UserLevel;
|
||||
$user_level->active = 1;
|
||||
|
||||
}else{
|
||||
} else {
|
||||
$user_level = UserLevel::findOrFail($id);
|
||||
|
||||
}
|
||||
$data = [
|
||||
'value' => $user_level,
|
||||
];
|
||||
|
||||
return view('admin.level.edit', $data);
|
||||
|
||||
|
||||
}
|
||||
|
||||
public function store()
|
||||
{
|
||||
|
||||
$data = Request::all();
|
||||
|
||||
if($data['action'] === 'user_level') {
|
||||
if ($data['id'] === "new") {
|
||||
if ($data['action'] === 'user_level') {
|
||||
if ($data['id'] === 'new') {
|
||||
$user_level = UserLevel::create([
|
||||
'name' => $data['name'],
|
||||
'pos' => $data['pos'],
|
||||
'payment_year' => isset($data['payment_year']) ? true : false,
|
||||
'payment_year' => isset($data['payment_year']) ? true : false,
|
||||
'content' => $data['content'],
|
||||
'partner_provision' => isset($data['partner_provision']) ? true : false,
|
||||
'exclude_single_commission' => isset($data['exclude_single_commission']) ? true : false,
|
||||
'hide_registration' => isset($data['hide_registration']) ? true : false,
|
||||
'active' => isset($data['active']) ? true : false,
|
||||
]);
|
||||
} else {
|
||||
$user_level = UserLevel::find($data['id']);
|
||||
$user_level->name = $data['name'];
|
||||
$user_level->pos = $data['pos'];
|
||||
$user_level->payment_year =isset($data['payment_year']) ? true : false;
|
||||
$user_level->payment_year = isset($data['payment_year']) ? true : false;
|
||||
$user_level->content = $data['content'];
|
||||
$user_level->partner_provision = isset($data['partner_provision']) ? true : false;
|
||||
$user_level->exclude_single_commission = isset($data['exclude_single_commission']) ? true : false;
|
||||
$user_level->hide_registration = isset($data['hide_registration']) ? true : false;
|
||||
$user_level->active = isset($data['active']) ? true : false;
|
||||
$user_level->save();
|
||||
}
|
||||
|
||||
if (!empty($data['trans'])) {
|
||||
if (! empty($data['trans'])) {
|
||||
$trans = [];
|
||||
foreach ($data['trans'] as $lang => $value) {
|
||||
if ($value && $value != null) {
|
||||
|
|
@ -87,19 +89,19 @@ class UserLevelController extends Controller
|
|||
}
|
||||
}
|
||||
|
||||
if($data['action'] === 'user_level_margin') {
|
||||
if ($data['action'] === 'user_level_margin') {
|
||||
$user_level = UserLevel::findOrFail($data['user_level_id']);
|
||||
$rules = array('price_from' => 'required');
|
||||
$rules = ['price_from' => 'required'];
|
||||
$ret = ['value' => $user_level];
|
||||
$validator = Validator::make(Request::all(), $rules);
|
||||
if ($validator->fails()) {
|
||||
return view('admin.level.edit', $ret)->withErrors($validator);
|
||||
}
|
||||
if ($data['id'] === "new") {
|
||||
if ($data['id'] === 'new') {
|
||||
$user_level_margin = UserLevelMargin::create($data);
|
||||
} else {
|
||||
$user_level_margin = UserLevelMargin::findOrFail($data['id']);
|
||||
if($user_level_margin->user_level_id != $user_level->id){
|
||||
if ($user_level_margin->user_level_id != $user_level->id) {
|
||||
abort(404);
|
||||
}
|
||||
$user_level_margin->fill($data);
|
||||
|
|
@ -108,23 +110,24 @@ class UserLevelController extends Controller
|
|||
}
|
||||
|
||||
\Session()->flash('alert-save', '1');
|
||||
|
||||
return redirect(route('admin_level_edit', [$user_level->id]));
|
||||
|
||||
}
|
||||
|
||||
public function delete($do, $id)
|
||||
{
|
||||
if($do === 'user_level_margin'){
|
||||
if ($do === 'user_level_margin') {
|
||||
$model = UserLevelMargin::findOrFail($id);
|
||||
$id = $model->user_level->id;
|
||||
$model->delete();
|
||||
\Session()->flash('alert-success', "Eintrag gelöscht");
|
||||
\Session()->flash('alert-success', 'Eintrag gelöscht');
|
||||
|
||||
return redirect(route('admin_level_edit', [$id]));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
/*public function delete($id){
|
||||
|
||||
if(ProductAttribute::where('attribute_id', $id)->count()){
|
||||
|
|
@ -139,4 +142,4 @@ class UserLevelController extends Controller
|
|||
}
|
||||
*/
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue