Merge pull request #5 from franknstayn/local_dev

Local dev
This commit is contained in:
franknstayn
2019-12-04 18:44:41 +08:00
committed by GitHub
9 changed files with 62 additions and 7 deletions

View File

@@ -19,6 +19,18 @@ class CustomAuthController extends Controller {
$password = $post['password'];
if (Auth::attempt(['email' => $email, 'password' => $password])){
if (Auth::user()->role == 'admin') {
$message = '
<div class="alert alert-danger alert-dismissible">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<h4><i class="icon fa fa-ban"></i> ERROR:</h4>
You are not allowed to enter to this site.
</div>';
return response()->json(array('success' => false, 'message'=>$message));
}
$message = "success";
$navbar = view('layout.navbar', compact('view'))->render();
$save_design_button = ' <button type="button" class="btn btn-lg btn-primary pull-right" data-toggle="modal" data-target="#modalDesignName"><i class="fa fa-floppy-o" aria-hidden="true"></i> Save Design</button>';

View File

@@ -443,7 +443,7 @@ class TeamStoreController extends Controller {
'Quantity' => 1
);
}
}elseif($product_form == "name-size"){
}elseif($product_form == "name-size-form"){
$order_names = $post['order_names'];
$order_size = $post['order_size'];