DHL Modul v0.5 Shipping Label ok
This commit is contained in:
parent
480fdc65ed
commit
8fdaa0ba1d
122 changed files with 17938 additions and 2239 deletions
|
|
@ -322,6 +322,9 @@ class UserShopController extends Controller
|
|||
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());
|
||||
}
|
||||
|
||||
|
|
@ -329,6 +332,8 @@ class UserShopController extends Controller
|
|||
|
||||
$rules = array(
|
||||
'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'))){
|
||||
|
|
@ -337,41 +342,43 @@ class UserShopController extends Controller
|
|||
return true;
|
||||
});
|
||||
$validator = Validator::make(Request::all(), $rules);
|
||||
|
||||
if ($validator->fails()) {
|
||||
\Session()->flash('shop-name-error', 'error');
|
||||
}else{
|
||||
\Session()->flash('shop-name-error', 'check');
|
||||
|
||||
}
|
||||
|
||||
$rules = array(
|
||||
'user_shop_active' => 'accepted',
|
||||
);
|
||||
$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']);
|
||||
$user_shop = UserShop::create([
|
||||
'user_id' => $user->id,
|
||||
'name' => $slug,
|
||||
'active' => true,
|
||||
'active_date' => now(),
|
||||
]
|
||||
);
|
||||
|
||||
$ret = $this->userShopRegisterSubDomain($user_shop->slug);
|
||||
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->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'));
|
||||
/*$ret = $this->userShopRegisterSubDomain($user_shop->slug);
|
||||
if($ret['success'] === true){
|
||||
\Session()->flash('alert-save', true);
|
||||
}else{
|
||||
$user_shop->forceDelete();
|
||||
\Session()->flash('alert-error', $ret['error']);
|
||||
}
|
||||
return redirect(route('user_shop'));
|
||||
return redirect(route('user_shop'));*/
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -444,4 +451,19 @@ class UserShopController extends Controller
|
|||
));
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue