Commit 43a9b46c by Arpit Jain

Worked on the code review feedback points

parent 4a0f9ec5
......@@ -5,3 +5,4 @@ DB_ROOT_PASSWORD=envigo@123
DB_DATABASE=locator
DB_USERNAME=root
DB_PASSWORD=envigo@123
......@@ -8,16 +8,17 @@ Trait Apihelpers
{
public function call_api($locatorID=null,$api_url=null)
public static function review_api($locatorID=null)
{
$api = config('app.api').$locatorID.'/reviews';
$client = new Client();
$response = $client->request('GET', $api_url.$locatorID,[ 'headers' => [
$response = $client->request('GET', $api,[ 'headers' => [
'Accept' => 'application/json',
'Authorization' => getenv('API_KEY')]
'Authorization' => config('app.api_key')]
]);
$statusCode = $response->getStatusCode();
$body = $response->getBody()->getContents();
return $locationDetailAPIdata = json_decode($body);
return $locationDetailAPIdata = json_decode($body,true);
}
}
\ No newline at end of file
......@@ -18,11 +18,13 @@ class HomepageController extends AdminController
}
public function homepageslist(Request $request) {
public function homepagesList(Request $request) {
$admin_id = $request->session()->get('id');
$pageNo = trim($request->input('page', 1));
DB::enableQueryLog();
$order_by = strtolower(trim($request->input('order_by')));
$homepageList = Homepage::where('homepages.is_deleted', '=', '0');
$count = Homepage::where('homepages.is_deleted', '=', '0');
$this->data['records'] = $homepageList->sortable(['id'=>'desc'])->paginate($this->record_per_page);
......@@ -31,6 +33,71 @@ class HomepageController extends AdminController
return view('admin.homepages.homepages_mng', ['data' => $this->data,'pageNo' => @$pageNo, 'record_per_page' => $this->record_per_page,'request'=>$request]);
}
public function createHomepage(){
return view('admin.homepages.add');
}
public function saveHomepage(Request $request) {
$user_id = auth()->user('id');
if ($request->all()) { dd($request->all());
$header_image_normal = trim($request->header_image_normal);
$header_image_mobile = trim($request->header_image_mobile);
$footer_image_normal = trim($request->footer_image_normal);
$footer_image_mobile = trim($request->footer_image_mobile);
$created_by = trim($user_id->id);
$status = trim($request->status);
$meta_title = trim($request->meta_title);
$meta_keyword = trim($request->meta_keyword);
$meta_description = trim($request->meta_description);
$validator = Validator::make($request->all(), [
'header_image_normal' => 'required|image|mimes:jpeg,png,jpg,gif,svg|max:2048',
'header_image_mobile' => 'required|image|mimes:jpeg,png,jpg,gif,svg|max:2048',
'footer_image_normal' => 'required|image|mimes:jpeg,png,jpg,gif,svg|max:2048',
'footer_image_mobile' => 'required|image|mimes:jpeg,png,jpg,gif,svg|max:2048',
]);
if ($validator->fails()) {
return redirect()->route('admin.homepages.add')
->withErrors($validator)
->withInput();
} else {
$homepage = new Homepage;
$homepage->created_by = $user_id->id;
if(!empty($request->header_image_normal)){
$homepage->header_image_normal = $request->file('header_image_normal')->store('image');
}
if(!empty($request->header_image_mobile)){
$homepage->header_image_mobile = $request->file('header_image_mobile')->store('image');
}
if(!empty($request->footer_image_normal)){
$homepage->footer_image_normal = $request->file('footer_image_normal')->store('image');
}
if(!empty($request->footer_image_mobile)){
$homepage->footer_image_mobile = $request->file('footer_image_mobile')->store('image');
}
$homepage->status = $status;
$homepage->meta_title = $meta_title;
$homepage->meta_keyword = $meta_keyword;
$homepage->meta_description = $meta_description;
$homepage->save();
$msg = 'Homepage has been added successfully.';
$request->session()->flash('add_message', $msg);
return redirect()->route('admin.homepages');
}
}
}
public function editHomepage(Request $request, $id){
if(!empty($id)){
$data = Homepage::find($id);
}
return view('admin.homepages.edit');
}
/**
* Function add_homepage
*
......@@ -116,12 +183,12 @@ class HomepageController extends AdminController
if ($id) {
$msg = 'Homepage has been updated successfully.';
$request->session()->flash('add_message', $msg);
return redirect()->route('admin-homepages');
return redirect()->route('admin.homepages');
} else if (!empty($id)){
try{
$msg = 'Homepage has been added successfully.';
$request->session()->flash('add_message', $msg);
return redirect()->route('admin-homepages');
return redirect()->route('admin.homepages');
}
catch(\Exception $e){
//
......@@ -131,7 +198,7 @@ class HomepageController extends AdminController
try{
$msg = 'Homepage has been added successfully.';
$request->session()->flash('add_message', $msg);
return redirect()->route('admin-homepages');
return redirect()->route('admin.homepages');
}
catch(\Exception $e){
//
......@@ -153,7 +220,7 @@ class HomepageController extends AdminController
$request->session()->flash('message', $msg);
}
}
return redirect()->route('admin-homepages');
return redirect()->route('admin.homepages');
}
......
......@@ -19,120 +19,122 @@ class LocaterController extends AdminController
$this->record_per_page=10;
}
public function locaterslist(Request $request) {
public function locatersList(Request $request) {
$admin_id = $request->session()->get('id');
$pageNo = trim($request->input('page', 1));
DB::enableQueryLog();
$keyword = strtolower(trim($request->input('keyword')));
$field_name = strtolower(trim($request->input('field_name')));
$order_by = strtolower(trim($request->input('order_by')));
$locaterList = Locater::where('locaters.status', '=', '1');
$count = Locater::where('locaters.status', '=', '1')->count();
$locaterList = Locater::where('locaters.is_deleted', '=', '0');
$count = Locater::where('locaters.is_deleted', '=', '0')->count();
if($keyword)
{
$locaterList = $locaterList->where(function ($query) use ($keyword) {
$query->orwhere('locaters.name', 'like', '%'.$keyword);
$query->orwhere('locaters.locater_id_url', 'like', '%'.$keyword);
$query->orwhere('locaters.locater_identity', 'like', '%'.$keyword);
$query->orwhere('locaters.description', 'like', '%'.$keyword);
});
}
$this->data['records'] = $locaterList->sortable(['id'=>'desc'])->paginate($this->record_per_page);
$queries = DB::getQueryLog();
//dd($queries);
return view('admin.locaters.locaters_mng', ['data' => $this->data,'pageNo' => @$pageNo, 'record_per_page' => $this->record_per_page,'request'=>$request]);
}
/**
* Function add_locater
*
* function to add locater
*
* @Created Date: 28 June,2019
* @Modified Date: 28 June,2019
* @param ARRAY
* @return STRING
*/
public function add_locater(Request $request, $id = '') {
public function createLocater(){
return view('admin.locaters.add');
}
public function saveLocater(Request $request) {
$user_id = auth()->user('id');
if ($request->all()) {
$name = trim($request->name);
$locater_identity = trim($request->locater_identity);
$locater_code = trim($request->locater_code);
$description = trim($request->description);
$validator = Validator::make($request->all(), [
'locater_identity' => 'required|unique:locaters,locater_identity,null,null',
'locater_code' => 'required|unique:locaters,locater_code,null,null',
'name' => 'required',
'description' => 'required',
]);
if ($validator->fails())
{
return redirect()->route('admin.locaters.add')
->withErrors($validator)
->withInput();
}
else
{
$locater = new Locater;
$locater->created_by = $user_id->id;
$locater->name = $name;
$locater->locater_identity = $locater_identity;
$locater->locater_code = $locater_code;
$locater->description = $description;
$locater->save();
$msg = 'Locater has been added successfully.';
$request->session()->flash('add_message', $msg);
return redirect()->route('admin.locaters');
}
}
}
public function editLocater(Request $request, $id){
if(!empty($id)){
$data = Locater::find($id);
}
return view('admin.locaters.edit', compact(array('data')));
}
public function updateLocater(Request $request, $id) {
$user_id = auth()->user('id');
$data = array();
if(!empty($id)){
$data = Locater::find($id);
}
if ($request->all()) { //post
//dd($request->all());
if ($request->all()) {
$name = trim($request->name);
$locater_id_url = trim($request->locater_id_url);
$locater_identity = trim($request->locater_identity);
$locater_code = trim($request->locater_code);
$description = trim($request->description);
if ($id) {
//Validate the input
$validator = Validator::make($request->all(), [
'locater_id_url' => 'required',
'locater_code' => 'required',
'name' => 'required',
'description' => 'required',
]);
$messages = $validator->messages();
}else {
//Validate the input
$validator = Validator::make($request->all(), [
'locater_id_url' => 'required|unique:locaters,locater_id_url,null,null,id,!'.$id,
'locater_code' => 'required|unique:locaters,locater_code,null,null,id,!'.$id,
'name' => 'required',
'description' => 'required',
]);
}
$validator = Validator::make($request->all(), [
'locater_identity' => 'required|unique:locaters,locater_identity,null,null,id,!'.$id,
'locater_code' => 'required|unique:locaters,locater_code,null,null,id,!'.$id,
'name' => 'required',
'description' => 'required',
]);
if ($validator->fails()) {
if($id) {
return redirect()->route('admin-editlocater',['id'=>$id])
->withErrors($validator)
->withInput();
} else {
return redirect()->route('admin-addlocater')
return redirect()->route('admin.locaters.edit',['id'=>$id])
->withErrors($validator)
->withInput();
}
} else {
if ($id) { //update case
$locater = Locater::find($id);
$modified_by = trim($user_id->id);
$locater->modified_by = $modified_by;
} else {
$locater = new Locater;
$locater->created_by = $user_id->id;
}
$locater = Locater::find($id);
$modified_by = trim($user_id->id);
$locater->modified_by = $modified_by;
$locater->name = $name;
$locater->locater_id_url = $locater_id_url;
$locater->locater_identity = $locater_identity;
$locater->locater_code = $locater_code;
$locater->description = $description;
$locater->save();
if ($id) {
$msg = 'Locater has been updated successfully.';
$request->session()->flash('add_message', $msg);
return redirect()->route('admin-locaters');
} else if (!empty($id)){
try{
$msg = 'Locater has been added successfully.';
$request->session()->flash('add_message', $msg);
return redirect()->route('admin-locaters');
}
catch(\Exception $e){
//
}
} else {
######### Here I am creating a Agency locaters with all privillages ######
try{
$msg = 'Locater has been added successfully.';
$request->session()->flash('add_message', $msg);
return redirect()->route('admin-locaters');
}
catch(\Exception $e){
//
}
}
$msg = 'Locater has been updated successfully.';
$request->session()->flash('add_message', $msg);
return redirect()->route('admin.locaters');
}
}
else {
......@@ -140,16 +142,17 @@ class LocaterController extends AdminController
}
}
public function locater_delete($id, Request $request) {
public function deleteLocater($id, Request $request) {
if ($id) {
$locater = Locater::find($id);
$locater->status = '0';
$locater->is_deleted = '1';
if($locater->save()){
$msg = 'Locater has been deleted successfully.';
$request->session()->flash('message', $msg);
}
}
return redirect()->route('admin-locaters');
return redirect()->route('admin.locaters');
}
}
\ No newline at end of file
......@@ -12,21 +12,31 @@ use Illuminate\Support\Facades\Hash;
class PageController extends AdminController
{
const RECORD_PER_PAGE = 10;
public function __construct()
{
$this->middleware('auth');
$this->record_per_page=10;
}
public function pageslist(Request $request) {
$admin_id = $request->session()->get('id');
$pageNo = trim($request->input('page', 1));
DB::enableQueryLog();
$keyword = strtolower(trim($request->input('keyword')));
$field_name = strtolower(trim($request->input('field_name')));
$order_by = strtolower(trim($request->input('order_by')));
$pageList = Page::where('pages.is_deleted', '=', '0')->with('locaterlists');
$count = Page::where('pages.is_deleted', '=', '0')->count();
$pageList = Page::where('pages.is_deleted', '=', '0')
->with(array('locaterlists' => function ($query){
$query->select(['locater_identity', 'id']);
}));
$count = Page::where('pages.is_deleted', '=', '0')
->with(array('locaterlists' => function ($query){
$query->select(['locater_identity', 'id']);
}))
->count();
if($keyword)
{
$pageList = $pageList->where(function ($query) use ($keyword) {
......@@ -35,11 +45,138 @@ class PageController extends AdminController
});
}
$this->data['records'] = $pageList->sortable(['id'=>'desc'])->paginate($this->record_per_page);
$records = $pageList->sortable(['id'=>'desc'])->paginate(Self::RECORD_PER_PAGE);
$queries = DB::getQueryLog();
//echo"<pre>";
//print_r($this->data['records']); die;
return view('admin.pages.pages_mng', ['data' => $this->data,'pageNo' => @$pageNo, 'record_per_page' => $this->record_per_page,'request'=>$request]);
return view('admin.pages.pages_mng', ['records' => $records,'pageNo' => @$pageNo, 'record_per_page' => Self::RECORD_PER_PAGE,'request'=>$request]);
}
public function createPage(){
$locater_identity = Locater::where('locaters.status', '=', '1')->get();
return view('admin.pages.add', compact('locater_identity'));
}
public function savePage(Request $request) {
$user_id = auth()->user('id');
if ($request->all()) {
$title = trim($request->title);
$locater_id = trim($request->locater_id);
if(!empty($request->slug)){
$slug = trim($request->slug);
}else{
$slug = str_replace(' ','_',$title);
}
$contents = trim($request->contents);
$meta_title = trim($request->meta_title);
$meta_keyword = trim($request->meta_keyword);
$meta_description = trim($request->meta_description);
$banner_content = trim($request->banner_content);
$created_by = trim($user_id->id);
$status = trim($request->status);
$validator = Validator::make($request->all(), [
'locater_id' => 'required',
'title' => 'required',
'contents' => 'required',
'banner_image' => 'image|mimes:jpeg,png,jpg,gif,svg|max:2048',
]);
if ($validator->fails()) {
return redirect()->route('admin.pages.add')
->withErrors($validator)
->withInput();
} else {
$page = new Page;
$page->created_by = $user_id->id;
$page->title = $title;
$page->locater_id = $locater_id;
$page->contents = $contents;
$page->slug = $slug;
$page->meta_title = $meta_title;
$page->meta_keyword = $meta_keyword;
$page->meta_description = $meta_description;
if(!empty($request->banner_image)){
$page->banner_image = $request->file('banner_image')->store('image');
}
$page->banner_content = $banner_content;
$page->status = $status;
$page->save();
$msg = 'Page has been added successfully.';
$request->session()->flash('add_message', $msg);
return redirect()->route('admin.pages');
}
}
}
public function editPage(Request $request, $id){
if(!empty($id)){
$data = Page::find($id);
}
$locater_identity = Locater::where('locaters.status', '=', '1')->get();
return view('admin.pages.edit', compact(array('data','locater_identity')));
}
public function updatePage(Request $request, $id) {
$user_id = auth()->user('id');
$data = array();
if(!empty($id)){
$data = Page::find($id);
}
if ($request->all()) {
$title = trim($request->title);
$locater_id = trim($request->locater_id);
$slug = trim($request->slug);
$contents = trim($request->contents);
$meta_title = trim($request->meta_title);
$meta_keyword = trim($request->meta_keyword);
$meta_description = trim($request->meta_description);
$banner_content = trim($request->banner_content);
$created_by = trim($user_id->id);
$status = trim($request->status);
$validator = Validator::make($request->all(), [
'locater_id' => 'required',
'title' => 'required',
'contents' => 'required',
'banner_image' => 'image|mimes:jpeg,png,jpg,gif,svg|max:2048',
]);
$messages = $validator->messages();
if ($validator->fails()) {
return redirect()->route('admin.pages.edit',['id'=>$id])
->withErrors($validator)
->withInput();
} else {
$page = Page::find($id);
$modified_by = trim($user_id->id);
$page->modified_by = $modified_by;
$page->title = $title;
$page->locater_id = $locater_id;
$page->contents = $contents;
$page->slug = $slug;
$page->meta_title = $meta_title;
$page->meta_keyword = $meta_keyword;
$page->meta_description = $meta_description;
if(!empty($request->banner_image)){
$page->banner_image = $request->file('banner_image')->store('image');
}
$page->banner_content = $banner_content;
$page->status = $status;
$page->save();
$msg = 'Page has been updated successfully.';
$request->session()->flash('add_message', $msg);
return redirect()->route('admin.pages');
}
}
}
/**
......
......@@ -17,16 +17,18 @@ class UserController extends AdminController
$this->record_per_page=10;
}
public function userslist(Request $request) {
public function usersList(Request $request) {
$admin_id = $request->session()->get('id');
$pageNo = trim($request->input('page', 1));
DB::enableQueryLog();
$keyword = strtolower(trim($request->input('keyword')));
//$group = strtolower(trim($request->input('group')));
$field_name = strtolower(trim($request->input('field_name')));
$order_by = strtolower(trim($request->input('order_by')));
$usersList = User::where('users.email', '!=', '')->where('users.status', '=', '1');
$count = User::where('users.email', '!=', '')->where('users.status', '=', '1')->count();
$usersList = User::where('users.email', '!=', '')->where('users.is_deleted', '=', '0');
$count = User::where('users.email', '!=', '')->where('users.is_deleted', '=', '0')->count();
if($keyword)
{
$usersList = $usersList->where(function ($query) use ($keyword) {
......@@ -35,59 +37,84 @@ class UserController extends AdminController
});
}
$this->data['records'] = $usersList->sortable(['id'=>'desc'])->paginate($this->record_per_page);
$records = $usersList->sortable(['id'=>'desc'])->paginate($this->record_per_page);
$queries = DB::getQueryLog();
//dd($queries);
return view('admin.users.users_mng', ['data' => $this->data,'pageNo' => @$pageNo, 'record_per_page' => $this->record_per_page,'request'=>$request]);
return view('admin.users.users_mng', ['records' => $records,'pageNo' => @$pageNo, 'record_per_page' => $this->record_per_page,'request'=>$request]);
}
/**
* Function add_user
*
* function to add user
*
* @Created Date: 27 June,2019
* @Modified Date: 27 June,2019
* @param ARRAY
* @return STRING
*/
public function add_user(Request $request, $id = '') {
$data = array();
if(!empty($id)){
$data = User::find($id);
}
public function createUser(){
return view('admin.users.add');
}
public function saveUser(Request $request) {
if ($request->all()) { //post
//dd($request->all());
$email = strtolower(trim($request->email));
$name = strtolower(trim($request->name));
$email = strtolower(trim($request->email));
$new_password = trim($request->new_password);
$confirm_password = trim($request->confirm_password);
if ($id) {
//Validate the input
$validator = Validator::make($request->all(), [
'name' => 'required',
'email' => 'required|email',
]);
$messages = $validator->messages();
}else {
//Validate the input
$validator = Validator::make($request->all(), [
'name' => 'required',
'email' => 'required|email|unique:users,email,null,null,id,!'.$id,
]);
}
$validator = Validator::make($request->all(), [
'name' => 'required',
'email' => 'required|email|unique:users,email,null,null',
]);
if ($validator->fails()) {
if($id) {
return redirect()->route('admin-edituser',['id'=>$id])
->withErrors($validator)
->withInput();
} else {
return redirect()->route('admin-adduser')
return redirect()->route('admin.user.add')
->withErrors($validator)
->withInput();
}
} else {
if(!$new_password)
$password = _makePassword(6);
else
$password = $new_password;
$user = new User;
$user->password = Hash::make($password);
$user->name = $name;
$user->email = strtolower($email);
$user->save();
$msg = 'User has been added successfully.';
$request->session()->flash('add_message', $msg);
return redirect()->route('admin.users');
}
}
}
public function editUser(Request $request, $id){
if(!empty($id)){
$data = User::find($id);
}
return view('admin.users.edit', compact(array('data')));
}
public function updateUser(Request $request, $id = '') {
$data = array();
if(!empty($id)){
$data = User::find($id);
}
if ($request->all()) {
$email = strtolower(trim($request->email));
$name = strtolower(trim($request->name));
$new_password = trim($request->new_password);
$confirm_password = trim($request->confirm_password);
$validator = Validator::make($request->all(), [
'name' => 'required',
'email' => 'required|email|unique:users,email,null,null,id,!'.$id,
]);
if ($validator->fails())
{
return redirect()->route('admin.user.edit',['id'=>$id])
->withErrors($validator)
->withInput();
}
else
{
if ($id) { //update case
$user = User::find($id);
if($new_password)
......@@ -100,32 +127,34 @@ class UserController extends AdminController
$user = new User;
$user->password = Hash::make($password);
}
$user->name = $name;
$user->email = strtolower($email);
$user->save();
if ($id && empty($request->new_password)) {
if ($id && empty($request->new_password))
{
$msg = 'User has been updated successfully.';
$request->session()->flash('add_message', $msg);
return redirect()->route('admin-users');
} else if (!empty($id) && !empty($request->new_password)){
return redirect()->route('admin.users');
}
else if (!empty($id) && !empty($request->new_password))
{
try{
//Mail::to('info@clixmedia.io')->send(new SendMailable($request));
//Mail::to($request->email)->send(new SendMailableNewUser($request));
$msg = 'User has been added successfully.';
$request->session()->flash('add_message', $msg);
return redirect()->route('admin-users');
return redirect()->route('admin.users');
}
catch(\Exception $e){
//
}
} else {
######### Here I am creating a Agency user with all privillages ######
}
else
{
try{
//Mail::to($request->email)->send(new SendMailableNewUser($request));
$msg = 'User has been added successfully.';
$request->session()->flash('add_message', $msg);
return redirect()->route('admin-users');
return redirect()->route('admin.users');
}
catch(\Exception $e){
//
......@@ -134,20 +163,21 @@ class UserController extends AdminController
}
}
else {
return view('admin.users.add_user', ['data' => $data, 'request' => $request]);
return view('admin.user.edit', compact(array('data')));
}
}
public function user_delete($id, Request $request) {
public function deleteUser($id, Request $request) {
if ($id) {
$user = User::find($id);
$user->status = '0';
$user->is_deleted = '1';
if($user->save()){
$msg = 'User has been deleted successfully.';
$request->session()->flash('message', $msg);
}
}
return redirect()->route('admin-users');
return redirect()->route('admin.users');
}
}
\ No newline at end of file
......@@ -43,10 +43,10 @@ class HomeController extends Controller
}
}
public function check_locater_id_url(Request $request) {
$locater_id_url = strtolower(trim($request->locater_id_url));
public function check_locater_identity(Request $request) {
$locater_identity = strtolower(trim($request->locater_identity));
$id = strtolower(trim($request->id));
$locater = Locater::where('locater_id_url', '=', $locater_id_url);
$locater = Locater::where('locater_identity', '=', $locater_identity);
if($id){
$locater->where('id', '!=', $id);
}
......
......@@ -5,18 +5,17 @@ namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\Homepage;
use App\Helpers\Apihelpers;
use GuzzleHttp\Client;
use App\Traits\Apitraits;
use App\Locater;
use App\Page;
use DB;
use Validator;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Storage;
class SearchController extends Controller
{
use Apihelpers;
//public $locationDeatilAPIdata;
use Apitraits;
/**
* Create a new controller instance.
*
......@@ -24,66 +23,119 @@ class SearchController extends Controller
*/
public function __construct()
{
//$this->middleware('auth');
$this->record_per_page=10;
}
/**
* Show the application dashboard.
*
* @return \Illuminate\Contracts\Support\Renderable
*/
/**
* For Rendring index page first time and FetchData in DataBase and ApiData then Match both Data Then show final array with slug
*
* */
public function index(Request $request)
{
$api_url = getenv('API_LIST');
$locatorApiData = $this->call_api('',$api_url);
//$locatorApiData = $locationDeatilAPIdata;
$locaterkeyvalueddata = Locater::where('status', '=', '1')->with('page')->get()->pluck('page.slug', 'locater_id_url');
// $file = storage_path('app/key/apikey.dba');
/*$file = Storage::disk('public')->path('key/apikey.dba');
dd($file);
if (!is_file($file)) {
$fh = fopen($file, 'w') or $this->traceLog('Code Error #: Unable to create .dba file');
}
die($fh);*/
$api_url = config('app.api_list');
$apiLocaterData = $this->call_api('',$api_url);
if ( count($apiLocaterData['data']) < 1 ) return '';
$locaterIds = collect($apiLocaterData['data'])->pluck('id');
$locaterData = Locater::whereIn('locater_identity', $locaterIds)
->with(array('page'=> function ($query) {
$query->select(['locater_id', 'title', 'slug']);
}))
->get();
$locaterData = !empty($locaterData) ? $locaterData->groupBy('locater_identity') : [];
$finalData = array_map(function ($data) use ($locaterData) {
$data['slug'] = null;
if ( count($locaterData) < 1 ) return $data;
if ( isset($locaterData[$data['id']]) ) {
$data['name'] = $locaterData[$data['id']][0]->name;
$data['slug'] = $locaterData[$data['id']][0]->page->slug ?? null;
}
return $data;
}, $apiLocaterData['data']);
$homepage = Homepage::where('homepages.status', '=', '1')->first();
return view('frontend.searchs.index', ['homepage' => $homepage,'locatorApiData'=>$locatorApiData,'locaterkeyvalueddata'=>$locaterkeyvalueddata]);
return view('frontend.searchs.index', compact('homepage','finalData'));
}
/**
* For render location list after searching
* */
public function searchlocator(Request $request)
{
$api_url = getenv('API_LIST');
$locationDetailAPIdata = $this->call_api($request->locality,$api_url);
$locaterkeyvalueddata = Locater::where('status', '=', '1')->with('page')->get()->pluck('page.slug', 'locater_id_url');
$homepage = Homepage::where('homepages.status', '=', '1')->first();
$datanew = '';
foreach($locationDetailAPIdata->data as $key=>$data){
$link = '';
if(isset($locaterkeyvalueddata[$data->id])){
$link = $locaterkeyvalueddata[$data->id];
$api_url = config('app.api_list');
$apiLocaterData = $this->call_api($request->locality,$api_url);
if ( count($apiLocaterData['data']) < 1 ) return '';
$locaterIds = collect($apiLocaterData['data'])->pluck('id');
$locaterData = Locater::whereIn('locater_identity', $locaterIds)
->with(array('page'=> function ($query) {
$query->select(['locater_id', 'title', 'slug']);
}))
->get();
$locaterData = !empty($locaterData) ? $locaterData->groupBy('locater_identity') : [];
$finalData = array_map(function ($data) use ($locaterData) {
$data['slug'] = null;
if ( count($locaterData) < 1 ) return $data;
if ( isset($locaterData[$data['id']]) ) {
$data['name'] = $locaterData[$data['id']][0]->name;
$data['slug'] = $locaterData[$data['id']][0]->page->slug ?? null;
}
$datanew .= '<div class="card"><div class="card-body"><div class="location_data-img"><img src="vendor/frontend/img/location-img.png" /></div><div class="location_data-content"><h5 class="title"><a href="/detail/'.$link.'">'.$data->name.'</a></h5><span class="ratings"><i class="mdi mdi-star"></i><i class="mdi mdi-star"></i><i class="mdi mdi-star"></i><i class="mdi mdi-star"></i><i class="mdi mdi-star-outline"></i><br><span class="counts">'.$data->reviewCounts.'</span></span><p class="address">'.$data->fullAddress->addressLines[0].'</p></div></div></div>';
}
return $datanew;
return $data;
}, $apiLocaterData['data']);
return view('frontend.searchs.location_element', compact('finalData'));
}
public function detail(Request $request, $slug = '') {
$pageData = Page::where('pages.slug', '=', $slug)->with('locaterlists')->first();
/**
* For render detail page
* */
public function detail(Request $request, $slug)
{
$pageData = Page::where('pages.slug', '=', $slug)
->with(array('locaterlists' => function ($query){
$query->select(['locater_identity', 'id']);
}))
->first();
/*Fetch Locater ID*/
$locatorID = $pageData->locaterlists->locater_id_url;
$api_url = getenv('API_LOCATION');
$locatorID = $pageData->locaterlists->locater_identity;
$api_url = config('app.api_location');
$locationDetailAPIdata = $this->call_api($locatorID,$api_url);
$homepage = Homepage::where('homepages.status', '=', '1')->first();
return view('frontend.searchs.detail', ['homepage' => $homepage,'locationDetailAPIdata'=>$locationDetailAPIdata, 'pageData' => $pageData]);
return view('frontend.searchs.detail', compact('homepage','locatorID','locationDetailAPIdata','pageData'));
}
/*For showing autocomplete result in index page*/
public function autocomplete(Request $request)
{
$api_url = getenv('API_SEARCH');
$api_url = config('app.api_search');
$locationDetailAPIdata = $this->call_api($request['query'],$api_url);
$output = '<ul class="dropdown-menu" style="display:block; position:relative">';
foreach($locationDetailAPIdata->data as $row){
$output .= '<li><i class="mdi mdi-map-marker"></i><a href="#">'.$row->name.'</a></li>';
}
$output .= '</ul>';
echo $output;
//return response()->json($data);
return view('frontend.searchs.autocomplete', compact('locationDetailAPIdata'));
}
}
<?php
namespace App\Traits;
use GuzzleHttp\Client;
Trait Apitraits
{
public function call_api($locatorID=null,$api_url=null)
{
$client = new Client();
$response = $client->request('GET', $api_url.$locatorID,[ 'headers' => [
'Accept' => 'application/json',
'Authorization' => getenv('API_KEY')]
]);
$statusCode = $response->getStatusCode();
$body = $response->getBody()->getContents();
return $locationDetailAPIdata = json_decode($body,true);
}
}
\ No newline at end of file
......@@ -123,6 +123,12 @@ return [
'cipher' => 'AES-256-CBC',
'api_list' => env('API_LIST'),
'api_search' => env('API_SEARCH'),
'api_location' => env('API_LOCATION'),
'api_key' => env('API_KEY'),
'api' => env('API'),
/*
|--------------------------------------------------------------------------
| Autoloaded Service Providers
......@@ -231,6 +237,7 @@ return [
'View' => Illuminate\Support\Facades\View::class,
'Form' => Collective\Html\FormFacade::class,
'Html' => Collective\Html\FormFacade::class,
'Apihelpers' => App\Helpers\Apihelpers::class,
],
......
@extends('adminlte::page')
@section('content')
<div class="container-fluid">
<div class="">
<div class="col-sm-6">
<h2>Homepage Settings</h2>
</div>
<div class="col-sm-6">
<ol class="breadcrumb float-sm-right">
<li class="breadcrumb-item"><a href="#">Home</a></li>
<li class="breadcrumb-item active">Homepage Settings</li>
</ol>
</div>
</div>
</div><!-- /.container-fluid -->
<section class="content">
<div class="container-fluid">
<div class="row">
<div class="col-md-12">
<!-- Horizontal Form -->
<div class="box box-info">
<div class="box-header with-border">
<h3 class="box-title"></h3>
<div class="alert alert-success alert-dismissible groputitle" style="display:none">
</div>
@if(Session::has('add_message'))
<div class="alert alert-success alert-dismissible">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
{!! session('add_message') !!}
</div>
@endif
<form class="form-horizontal" id="add-pageform" action="{{route('admin.homepages.save')}}" method="POST" enctype="multipart/form-data">
{{ csrf_field() }}
<div class="col-md-12">
<!-- Custom Tabs -->
<div class="nav-tabs-custom">
<ul class="nav nav-tabs">
<li class="active"><a href="#other" data-toggle="tab" aria-expanded="true">Other</a></li>
<li><a href="#tab_1" data-toggle="tab" aria-expanded="false">MAIN</a></li>
<li class=""><a href="#tab_2" data-toggle="tab" aria-expanded="false">SEO</a></li>
</ul>
<div class="tab-content">
<div class="tab-pane active" id="other">
<div class="form-group @if($errors->first('other_setting')) {{' has-error has-feedback'}} @endif ">
<label for="inputError" class="col-sm-2 control-label">other_setting</label>
<div class="col-sm-10">
<input type="text" name="other_setting" class="form-control">
</div>
</div>
</div>
<div class="tab-pane" id="tab_1">
<div class="form-group @if($errors->first('header_image_normal')) {{' has-error has-feedback'}} @endif ">
<label for="inputError" class="col-sm-2 control-label">header_image_normal</label>
<div class="col-sm-10">
<input type="file" name="header_image_normal" class="form-control">
</div>
</div>
<div class="form-group @if($errors->first('header_image_mobile')) {{' has-error has-feedback'}} @endif ">
<label for="inputError" class="col-sm-2 control-label">header_image_mobile</label>
<div class="col-sm-10">
<input type="file" name="header_image_mobile" class="form-control">
</div>
</div>
<div class="form-group @if($errors->first('footer_image_normal')) {{' has-error has-feedback'}} @endif ">
<label for="inputError" class="col-sm-2 control-label">footer_image_normal</label>
<div class="col-sm-10">
<input type="file" name="footer_image_normal" class="form-control">
</div>
</div>
<div class="form-group @if($errors->first('footer_image_mobile')) {{' has-error has-feedback'}} @endif ">
<label for="inputError" class="col-sm-2 control-label">footer_image_mobile</label>
<div class="col-sm-10">
<input type="file" name="footer_image_mobile" class="form-control">
</div>
</div>
</div>
<!-- /.tab-pane -->
<div class="tab-pane" id="tab_2">
<div class="form-group @if($errors->first('meta_title')) {{' has-error has-feedback'}} @endif ">
<label for="inputError" class="col-sm-2 control-label">Meta Title</label>
<div class="col-sm-10">
<input type="text" name="meta_title" class="form-control" placeholder="Meta Title" value="{{old('meta_title',@$data->meta_title)}}">
</div>
</div>
<div class="form-group @if($errors->first('meta_keyword')) {{' has-error has-feedback'}} @endif ">
<label for="inputError" class="col-sm-2 control-label">Meta Keyword</label>
<div class="col-sm-10">
<input type="text" name="meta_keyword" class="form-control" placeholder="Meta Keyword" value="{{old('meta_keyword',@$data->meta_keyword)}}">
</div>
</div>
<div class="form-group @if($errors->first('meta_description')) {{' has-error has-feedback'}} @endif ">
<label for="inputError" class="col-sm-2 control-label">Meta Description</label>
<div class="col-sm-10">
<input type="text" name="meta_description" class="form-control" placeholder="Meta Description" value="{{old('meta_description',@$data->meta_description)}}">
</div>
</div>
</div>
</div>
<!-- /.tab-content -->
</div>
<!-- nav-tabs-custom -->
</div>
<!-- /.box-body -->
<div class="box-footer">
<input type="submit" value="Submit" class="btn btn-info">
<a href="{{route('admin.pages')}}" class="btn btn-default">Cancel</a>
</div>
<!-- /.box-footer -->
</form>
</div>
</div>
<!--/.col (right) -->
</div>
</div>
</div>
<style>
.help-block{
color:red;
}
.error{
color:red;
}
</style>
<script src="{{ asset('/vendor/adminlte/dist/js/slug.js') }}"></script>
<script type="text/javascript">
$( document ).ready(function() {
$('#add-pageform').validate({
ignore: ".ignore",
rules: {
locater_id: "required",
title: "required",
//contents: "required",
status: "required",
//banner_image: "required",
banner_content: "required",
},
// Specify validation error messages
messages: {
locater_id: "Please select locator",
title: "Please enter Name.",
//contents: "Please enter Description.",
status: "Please select Status.",
//banner_image: "Please enter Banner Image url.",
banner_content: "Please enter Meta Banner Content.",
},
});
});
$(function() {
$("#title").slug({ slug:'permalink',hide: false });
$('#edit_target_url').bind('click',function(){if ($('#target_url').attr('readonly') !== undefined) {
$('#target_url').removeAttr( "readonly");
} else {$('#target_url').attr('readonly','readonly')}
});
$('#target_url').bind('blur',function(){$(this).attr('readonly','readonly')});
});
</script>
<script src="{{ asset('/vendor/unisharp/laravel-ckeditor/ckeditor.js') }}"></script>
<script>
CKEDITOR.replace( 'contents' );
</script>
@endsection
\ No newline at end of file
@extends('adminlte::page')
@section('content')
<div class="container-fluid">
<div class="">
<div class="col-sm-6">
<h2>Homepage Settings</h2>
</div>
<div class="col-sm-6">
<ol class="breadcrumb float-sm-right">
<li class="breadcrumb-item"><a href="#">Home</a></li>
<li class="breadcrumb-item active">Homepage Settings</li>
</ol>
</div>
</div>
</div><!-- /.container-fluid -->
<section class="content">
<div class="container-fluid">
<div class="row">
<div class="col-md-12">
<!-- Horizontal Form -->
<div class="box box-info">
<div class="box-header with-border">
<h3 class="box-title"></h3>
<div class="alert alert-success alert-dismissible groputitle" style="display:none">
</div>
@if(Session::has('add_message'))
<div class="alert alert-success alert-dismissible">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
{!! session('add_message') !!}
</div>
@endif
<form class="form-horizontal" id="add-pageform" action="{{route('admin.homepages.save')}}" method="POST" enctype="multipart/form-data">
{{ csrf_field() }}
<div class="col-md-12">
<!-- Custom Tabs -->
<div class="nav-tabs-custom">
<ul class="nav nav-tabs">
<li class="active"><a href="#other" data-toggle="tab" aria-expanded="true">Other</a></li>
<li><a href="#tab_1" data-toggle="tab" aria-expanded="false">MAIN</a></li>
<li class=""><a href="#tab_2" data-toggle="tab" aria-expanded="false">SEO</a></li>
</ul>
<div class="tab-content">
<div class="tab-pane active" id="other">
<div class="form-group @if($errors->first('other_setting')) {{' has-error has-feedback'}} @endif ">
<label for="inputError" class="col-sm-2 control-label">other_setting</label>
<div class="col-sm-10">
<input type="text" name="other_setting" class="form-control">
</div>
</div>
</div>
<div class="tab-pane" id="tab_1">
<div class="form-group @if($errors->first('header_image_normal')) {{' has-error has-feedback'}} @endif ">
<label for="inputError" class="col-sm-2 control-label">header_image_normal</label>
<div class="col-sm-10">
<input type="file" name="header_image_normal" class="form-control">
</div>
</div>
<div class="form-group @if($errors->first('header_image_mobile')) {{' has-error has-feedback'}} @endif ">
<label for="inputError" class="col-sm-2 control-label">header_image_mobile</label>
<div class="col-sm-10">
<input type="file" name="header_image_mobile" class="form-control">
</div>
</div>
<div class="form-group @if($errors->first('footer_image_normal')) {{' has-error has-feedback'}} @endif ">
<label for="inputError" class="col-sm-2 control-label">footer_image_normal</label>
<div class="col-sm-10">
<input type="file" name="footer_image_normal" class="form-control">
</div>
</div>
<div class="form-group @if($errors->first('footer_image_mobile')) {{' has-error has-feedback'}} @endif ">
<label for="inputError" class="col-sm-2 control-label">footer_image_mobile</label>
<div class="col-sm-10">
<input type="file" name="footer_image_mobile" class="form-control">
</div>
</div>
</div>
<!-- /.tab-pane -->
<div class="tab-pane" id="tab_2">
<div class="form-group @if($errors->first('meta_title')) {{' has-error has-feedback'}} @endif ">
<label for="inputError" class="col-sm-2 control-label">Meta Title</label>
<div class="col-sm-10">
<input type="text" name="meta_title" class="form-control" placeholder="Meta Title" value="{{old('meta_title',@$data->meta_title)}}">
</div>
</div>
<div class="form-group @if($errors->first('meta_keyword')) {{' has-error has-feedback'}} @endif ">
<label for="inputError" class="col-sm-2 control-label">Meta Keyword</label>
<div class="col-sm-10">
<input type="text" name="meta_keyword" class="form-control" placeholder="Meta Keyword" value="{{old('meta_keyword',@$data->meta_keyword)}}">
</div>
</div>
<div class="form-group @if($errors->first('meta_description')) {{' has-error has-feedback'}} @endif ">
<label for="inputError" class="col-sm-2 control-label">Meta Description</label>
<div class="col-sm-10">
<input type="text" name="meta_description" class="form-control" placeholder="Meta Description" value="{{old('meta_description',@$data->meta_description)}}">
</div>
</div>
</div>
</div>
<!-- /.tab-content -->
</div>
<!-- nav-tabs-custom -->
</div>
<!-- /.box-body -->
<div class="box-footer">
<input type="submit" value="Submit" class="btn btn-info">
<a href="{{route('admin.pages')}}" class="btn btn-default">Cancel</a>
</div>
<!-- /.box-footer -->
</form>
</div>
</div>
<!--/.col (right) -->
</div>
</div>
</div>
<style>
.help-block{
color:red;
}
.error{
color:red;
}
</style>
<script src="{{ asset('/vendor/adminlte/dist/js/slug.js') }}"></script>
<script type="text/javascript">
$( document ).ready(function() {
$('#add-pageform').validate({
ignore: ".ignore",
rules: {
locater_id: "required",
title: "required",
//contents: "required",
status: "required",
//banner_image: "required",
banner_content: "required",
},
// Specify validation error messages
messages: {
locater_id: "Please select locator",
title: "Please enter Name.",
//contents: "Please enter Description.",
status: "Please select Status.",
//banner_image: "Please enter Banner Image url.",
banner_content: "Please enter Meta Banner Content.",
},
});
});
$(function() {
$("#title").slug({ slug:'permalink',hide: false });
$('#edit_target_url').bind('click',function(){if ($('#target_url').attr('readonly') !== undefined) {
$('#target_url').removeAttr( "readonly");
} else {$('#target_url').attr('readonly','readonly')}
});
$('#target_url').bind('blur',function(){$(this).attr('readonly','readonly')});
});
</script>
<script src="{{ asset('/vendor/unisharp/laravel-ckeditor/ckeditor.js') }}"></script>
<script>
CKEDITOR.replace( 'contents' );
</script>
@endsection
\ No newline at end of file
......@@ -32,7 +32,7 @@
{!! session('add_message') !!}
</div>
@endif
<form id="locaters-mng" method="get" action="{{route('admin-locaters')}}">
<form id="homepages-mng" method="get" action="{{route('admin.homepages')}}">
{{ csrf_field() }}
<div class="row clearfix">
<div class="col-sm-2">
......@@ -44,10 +44,10 @@
</div>
<div class="col-sm-4">
<button type="submit" class="btn btn-primary btn-info">Search<div></div></button>
<a href="{{route('admin-locaters')}}" class="btn btn-primary btn-success">Reset</a>
<a href="{{route('admin.homepages')}}" class="btn btn-primary btn-success">Reset</a>
</div>
<div class="col-sm-2 pull-right">
<a href="{{route('admin-addlocater')}}" class="btn btn-block btn-warning">Add Locater</a>
<a href="{{route('admin.homepages.add')}}" class="btn btn-block btn-warning">Add Homepages</a>
</div>
</div>
</form>
......@@ -71,9 +71,7 @@
<table class="table table-bordered">
<tr>
<th style="width: 10px">#</th>
<th>@sortablelink('locater_id_url')</th>
<th>@sortablelink('name')</th>
<th>@sortablelink('locator_code')</th>
<th>@sortablelink('other_setting')</th>
<th>@sortablelink('created_at')</th>
<th style="width: 40px">Action</th>
</tr>
......@@ -82,13 +80,11 @@
@foreach($data['records'] as $row)
<tr>
<td>{{$row->id}}</td>
<td>{{$row->locater_id_url}}</td>
<td>{{$row->name}}</td>
<td>{{$row->locater_code}}</td>
<td>{{$row->other_setting}}</td>
<td>{{date("F j, Y", strtotime($row->created_at))}}</td>
<td style="width:10%">
<a href="{{route('admin-locatersedit',['id'=>$row->id])}}" class="btn btn-info btn-xs action-btn" title ="Edit"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></a>
<a href="{{route('admin-deletelocater',['id'=>$row->id])}}" class="btn btn-danger btn-xs action-btn" onclick="return confirm('Are you sure you want to delete ?');" title ="Delete"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span></a>
<a href="{{route('admin.homepages.edit',['id'=>$row->id])}}" class="btn btn-info btn-xs action-btn" title ="Edit"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></a>
<a href="{{route('admin.homepages.delete',['id'=>$row->id])}}" class="btn btn-danger btn-xs action-btn" onclick="return confirm('Are you sure you want to delete ?');" title ="Delete"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span></a>
</td>
</tr>
<?php $k++; ?>
......
@extends('adminlte::page')
@section('content')
<div class="container-fluid">
<div class="row mb-2">
<div class="col-sm-6">
<h1>Locater</h1>
</div>
<div class="col-sm-6">
<ol class="breadcrumb float-sm-right">
<li class="breadcrumb-item"><a href="#">Home</a></li>
<li class="breadcrumb-item active">Create Locater</li>
</ol>
</div>
</div>
</div><!-- /.container-fluid -->
<section class="content">
<div class="container-fluid">
<div class="row">
<div class="col-md-12">
<!-- Horizontal Form -->
<div class="box box-info">
<div class="box-header with-border">
<h3 class="box-title"></h3>
<div class="alert alert-success alert-dismissible groputitle" style="display:none">
</div>
@if(Session::has('add_message'))
<div class="alert alert-success alert-dismissible">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
{!! session('add_message') !!}
</div>
@endif
<form class="form-horizontal" id="add-locaterform" action="{{route('admin.locaters.save')}}" method="POST" enctype="multipart/form-data">
{{ csrf_field() }}
<div class="box-body">
<div class="form-group @if($errors->first('locater_identity')) {{' has-error has-feedback'}} @endif ">
<label for="inputError" class="col-sm-2 control-label">Locater ID<em>*</em></label>
<div class="col-sm-10">
<input type="text" name="locater_identity" class="form-control" placeholder="Locater ID">
<?php if(@$errors->first('locater_identity')) { ?> <span class="help-block">{{@$errors->first('locater_identity')}}</span> <?php } ?>
</div>
</div>
<div class="form-group @if($errors->first('locater_code')) {{' has-error has-feedback'}} @endif ">
<label for="inputError" class="col-sm-2 control-label">Locater Code</label>
<div class="col-sm-10">
<input type="text" name="locater_code" class="form-control" placeholder="Locater Code">
</div>
</div>
<div class="form-group @if($errors->first('name')) {{' has-error has-feedback'}} @endif ">
<label for="inputError" class="col-sm-2 control-label">Name<em>*</em></label>
<div class="col-sm-10">
<input type="text" name="name" class="form-control" placeholder="Name" value="{{old('name',@$data->name)}}">
<?php if(@$errors->first('name')) { ?> <span class="help-block">{{@$errors->first('name')}}</span> <?php } ?>
</div>
</div>
<div class="form-group @if($errors->first('description')) {{' has-error has-feedback'}} @endif ">
<label for="inputError" class="col-sm-2 control-label">Description</label>
<div class="col-sm-10">
<input type="text" name="description" class="form-control" placeholder="Description">
</div>
</div>
</div>
<!-- /.box-body -->
<div class="box-footer">
<input type="submit" value="Submit" class="btn btn-info">
<a href="{{route('admin.locaters')}}" class="btn btn-default">Cancel</a>
</div>
<!-- /.box-footer -->
</form>
</div>
</div>
<!--/.col (right) -->
</div>
</div>
</div>
<style>
.help-block{
color:red;
}
.error{
color:red;
}
</style>
<script type="text/javascript">
$( document ).ready(function() {
$.validator.addMethod('filesize', function(value, element, param) {
return this.optional(element) || (element.files[0].size <= param)
});
$.validator.addMethod("alphanumspecial", function (value, element) {
return this.optional(element) || /^(?=.*[a-z])(?=.*[0-9])(?=.*[!@#\$%\^&\*])(?=.{6,})/i.test(value);
}, "Combination of alphabets,special characters & numeric values required.");
$('#add-locaterform').validate({
ignore: ".ignore",
rules: {
locater_identity: {
required:true,
remote: {
url: '{{route("check_locater_identity")}}'+'?id='+'{{@$data->id}}',
type: "get",
data: {
title: function() {
return $("#locater_identity").val();
}
},
},
},
name: "required",
},
// Specify validation error messages
messages: {
locater_identity:
{
required:"Please enter Locater ID.",
remote:"Locater ID already exist."
},
name: "Please enter Name.",
},
});
});
</script>
@endsection
\ No newline at end of file
......@@ -33,25 +33,24 @@
</div>
@endif
<form class="form-horizontal" id="add-locaterform" action="@if(@$data->id) {{route('admin-locatersedit',['id'=>@$data->id])}} @else {{route('admin-addlocater')}} @endif" method="POST" enctype="multipart/form-data">
<form class="form-horizontal" id="add-locaterform" action="{{route('admin.locaters.edit',['id'=>@$data->id])}}" method="POST" enctype="multipart/form-data">
{{ csrf_field() }}
<div class="box-body">
<input type="hidden" name="id" value="{{old('id',@$data->id)}}">
<div class="form-group @if($errors->first('locater_id_url')) {{' has-error has-feedback'}} @endif ">
<div class="form-group @if($errors->first('locater_identity')) {{' has-error has-feedback'}} @endif ">
<label for="inputError" class="col-sm-2 control-label">Locater ID<em>*</em></label>
<div class="col-sm-10">
<input type="text" name="locater_id_url" class="form-control" placeholder="Locater ID" value="{{old('locater_id_url',@$data->locater_id_url)}}">
<?php if(@$errors->first('locater_id_url')) { ?> <span class="help-block">{{@$errors->first('locater_id_url')}}</span> <?php } ?>
<input type="text" name="locater_identity" class="form-control" placeholder="Locater ID" value="{{old('locater_identity',@$data->locater_identity)}}">
<?php if(@$errors->first('locater_identity')) { ?> <span class="help-block">{{@$errors->first('locater_identity')}}</span> <?php } ?>
</div>
</div>
<div class="form-group @if($errors->first('locater_code')) {{' has-error has-feedback'}} @endif ">
<label for="inputError" class="col-sm-2 control-label">Locater Code<em>*</em></label>
<label for="inputError" class="col-sm-2 control-label">Locater Code</label>
<div class="col-sm-10">
<input type="text" name="locater_code" class="form-control" placeholder="Locater Code" value="{{old('locater_code',@$data->locater_code)}}">
<?php if(@$errors->first('locater_code')) { ?> <span class="help-block">{{@$errors->first('locater_code')}}</span> <?php } ?>
</div>
</div>
......@@ -63,34 +62,17 @@
</div>
</div>
<div class="form-group @if($errors->first('description')) {{' has-error has-feedback'}} @endif ">
<label for="inputError" class="col-sm-2 control-label">Description<em>*</em></label>
<label for="inputError" class="col-sm-2 control-label">Description</label>
<div class="col-sm-10">
<input type="text" name="description" class="form-control" placeholder="Description" value="{{old('description',@$data->description)}}">
<?php if(@$errors->first('description')) { ?> <span class="help-block">{{@$errors->first('description')}}</span> <?php } ?>
</div>
</div>
<!--<div class="form-group @if($errors->first('created_by')) {{' has-error has-feedback'}} @endif ">
<label for="inputError" class="col-sm-2 control-label">Created By<em>*</em></label>
<div class="col-sm-10">
<input type="text" name="created_by" readonly="true" class="form-control" placeholder="Created By" value="{{old('created_by',@$data->created_by)}}">
<?php //if(@$errors->first('created_by')) { ?> <span class="help-block">{{@$errors->first('created_by')}}</span> <?php //} ?>
</div>
</div>
<div class="form-group @if($errors->first('modified_by')) {{' has-error has-feedback'}} @endif ">
<label for="inputError" class="col-sm-2 control-label">Modified By<em>*</em></label>
<div class="col-sm-10">
<input type="text" name="modified_by" readonly="true" class="form-control" placeholder="Modified By" value="{{old('modified_by',@$data->modified_by)}}">
<?php //if(@$errors->first('modified_by')) { ?> <span class="help-block">{{@$errors->first('modified_by')}}</span> <?php //} ?>
</div>
</div>-->
</div>
<!-- /.box-body -->
<div class="box-footer">
<input type="submit" value="Submit" class="btn btn-info">
<a href="{{route('admin-locaters')}}" class="btn btn-default">Cancel</a>
<a href="{{route('admin.locaters')}}" class="btn btn-default">Cancel</a>
</div>
<!-- /.box-footer -->
</form>
......@@ -126,31 +108,28 @@
$('#add-locaterform').validate({
ignore: ".ignore",
rules: {
locater_id_url: {
locater_identity: {
required:true,
remote: {
url: '{{route("check_locater_id_url")}}'+'?id='+'{{@$data->id}}',
url: '{{route("check_locater_identity")}}'+'?id='+'{{@$data->id}}',
type: "get",
data: {
title: function() {
return $("#locater_id_url").val();
return $("#locater_identity").val();
}
},
},
},
name: "required",
description: "required",
},
// Specify validation error messages
messages: {
locater_id_url:
locater_identity:
{
required:"Please enter Locater ID.",
remote:"Locater ID already exist."
},
locater_code: "Please enter Locater Code.",
name: "Please enter Name.",
description: "Please enter Description.",
},
});
});
......
......@@ -32,7 +32,7 @@
{!! session('add_message') !!}
</div>
@endif
<form id="locaters-mng" method="get" action="{{route('admin-locaters')}}">
<form id="locaters-mng" method="get" action="{{route('admin.locaters')}}">
{{ csrf_field() }}
<div class="row clearfix">
<div class="col-sm-2">
......@@ -44,10 +44,10 @@
</div>
<div class="col-sm-4">
<button type="submit" class="btn btn-primary btn-info">Search<div></div></button>
<a href="{{route('admin-locaters')}}" class="btn btn-primary btn-success">Reset</a>
<a href="{{route('admin.locaters')}}" class="btn btn-primary btn-success">Reset</a>
</div>
<div class="col-sm-2 pull-right">
<a href="{{route('admin-addlocater')}}" class="btn btn-block btn-warning">Add Locater</a>
<a href="{{route('admin.locaters.add')}}" class="btn btn-block btn-warning">Add Locater</a>
</div>
</div>
</form>
......@@ -71,9 +71,8 @@
<table class="table table-bordered">
<tr>
<th style="width: 10px">#</th>
<th>@sortablelink('locater_id_url')</th>
<th>@sortablelink('locater_identity')</th>
<th>@sortablelink('name')</th>
<th>@sortablelink('locator_code')</th>
<th>@sortablelink('created_at')</th>
<th style="width: 40px">Action</th>
</tr>
......@@ -82,13 +81,12 @@
@foreach($data['records'] as $row)
<tr>
<td>{{$row->id}}</td>
<td>{{$row->locater_id_url}}</td>
<td>{{$row->locater_identity}}</td>
<td>{{$row->name}}</td>
<td>{{$row->locater_code}}</td>
<td>{{date("F j, Y", strtotime($row->created_at))}}</td>
<td style="width:10%">
<a href="{{route('admin-locatersedit',['id'=>$row->id])}}" class="btn btn-info btn-xs action-btn" title ="Edit"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></a>
<a href="{{route('admin-deletelocater',['id'=>$row->id])}}" class="btn btn-danger btn-xs action-btn" onclick="return confirm('Are you sure you want to delete ?');" title ="Delete"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span></a>
<a href="{{route('admin.locaters.edit',['id'=>$row->id])}}" class="btn btn-info btn-xs action-btn" title ="Edit"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></a>
<a href="{{route('admin.locaters.delete',['id'=>$row->id])}}" class="btn btn-danger btn-xs action-btn" onclick="return confirm('Are you sure you want to delete ?');" title ="Delete"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span></a>
</td>
</tr>
<?php $k++; ?>
......
......@@ -33,7 +33,7 @@
</div>
@endif
<form class="form-horizontal" id="add-offerform" action="@if(@$data->id) {{route('admin-offersedit',['id'=>@$data->id])}} @else {{route('admin-addoffer')}} @endif" method="POST" enctype="multipart/form-data">
<form class="form-horizontal" id="add-offerform" action="@if(@$data->id) {{route('admin.offers.edit',['id'=>@$data->id])}} @else {{route('admin-addoffer')}} @endif" method="POST" enctype="multipart/form-data">
{{ csrf_field() }}
......@@ -51,13 +51,13 @@
<div class="col-sm-10">
<select name="locater_id" class="form-control">
<option value="">Select</option>
@foreach($locater_id_url as $key => $option)
@foreach($locater_identity as $key => $option)
<?php if(isset($data) && !empty($data)){ ?>
<option
@if($data->locater_id == $option->id) {{'selected'}} @endif value="<?php echo $option->id; ?>"><?php echo $option->locater_id_url; ?></option>
@if($data->locater_id == $option->id) {{'selected'}} @endif value="<?php echo $option->id; ?>"><?php echo $option->locater_identity; ?></option>
<?php }else{ ?>
<option
value="<?php echo $option->id; ?>"><?php echo $option->locater_id_url; ?></option>
value="<?php echo $option->id; ?>"><?php echo $option->locater_identity; ?></option>
<?php } ?>
@endforeach
</select>
......@@ -156,7 +156,7 @@
<!-- /.box-body -->
<div class="box-footer">
<input type="submit" value="Submit" class="btn btn-info">
<a href="{{route('admin-pages')}}" class="btn btn-default">Cancel</a>
<a href="{{route('admin.pages')}}" class="btn btn-default">Cancel</a>
</div>
<!-- /.box-footer -->
</form>
......
......@@ -32,7 +32,7 @@
{!! session('add_message') !!}
</div>
@endif
<form id="offers-mng" method="get" action="{{route('admin-offers')}}">
<form id="offers-mng" method="get" action="{{route('admin.offers')}}">
{{ csrf_field() }}
<div class="row clearfix">
<div class="col-sm-2">
......@@ -44,10 +44,10 @@
</div>
<div class="col-sm-4">
<button type="submit" class="btn btn-primary btn-info">Search<div></div></button>
<a href="{{route('admin-offers')}}" class="btn btn-primary btn-success">Reset</a>
<a href="{{route('admin.offers')}}" class="btn btn-primary btn-success">Reset</a>
</div>
<div class="col-sm-2 pull-right">
<a href="{{route('admin-addoffer')}}" class="btn btn-block btn-warning">Add Offer</a>
<a href="{{route('admin.offers.add')}}" class="btn btn-block btn-warning">Add Offer</a>
</div>
</div>
</form>
......@@ -83,7 +83,7 @@
@foreach($data['records'] as $row)
<tr>
<td>{{$row->id}}</td>
<td>{{$row->locaterlists->locater_id_url}}</td>
<td>{{$row->locaterlists->locater_identity}}</td>
<td>{{$row->offer_name}}</td>
<td><?php $imageshow = asset('storage/'.$row->offer_image); ?>
<img src="<?php echo $imageshow; ?>" />
......@@ -91,8 +91,8 @@
<td>{{date("F j, Y", strtotime($row->start_date))}}</td>
<td>{{date("F j, Y", strtotime($row->end_date))}}</td>
<td style="width:10%">
<a href="{{route('admin-offersedit',['id'=>$row->id])}}" class="btn btn-info btn-xs action-btn" title ="Edit"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></a>
<a href="{{route('admin-deleteoffer',['id'=>$row->id])}}" class="btn btn-danger btn-xs action-btn" onclick="return confirm('Are you sure you want to delete ?');" title ="Delete"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span></a>
<a href="{{route('admin.offers.edit',['id'=>$row->id])}}" class="btn btn-info btn-xs action-btn" title ="Edit"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></a>
<a href="{{route('admin.offers.delete',['id'=>$row->id])}}" class="btn btn-danger btn-xs action-btn" onclick="return confirm('Are you sure you want to delete ?');" title ="Delete"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span></a>
</td>
</tr>
<?php $k++; ?>
......
......@@ -33,11 +33,10 @@
</div>
@endif
<form class="form-horizontal" id="add-pageform" action="@if(@$data->id) {{route('admin-pagesedit',['id'=>@$data->id])}} @else {{route('admin-addpage')}} @endif" method="POST" enctype="multipart/form-data">
<form class="form-horizontal" id="add-pageform" action="{{route('admin.pages.update',['id'=>@$data->id])}}" method="POST" enctype="multipart/form-data">
{{ csrf_field() }}
<div class="col-md-12">
<!-- Custom Tabs -->
<div class="nav-tabs-custom">
......@@ -47,18 +46,19 @@
</ul>
<div class="tab-content">
<div class="tab-pane active" id="tab_1">
<input type="hidden" name="id" value="{{old('id',@$data->id)}}">
<div class="form-group @if($errors->first('locater_id')) {{' has-error has-feedback'}} @endif ">
<label for="inputError" class="col-sm-2 control-label">Locater ID<em>*</em></label>
<div class="col-sm-10">
<select name="locater_id" class="form-control">
<option value="">Select</option>
@foreach($locater_id_url as $key => $option)
@foreach($locater_identity as $key => $option)
<?php if(isset($data) && !empty($data)){ ?>
<option
@if($data->locater_id == $option->id) {{'selected'}} @endif value="<?php echo $option->id; ?>"><?php echo $option->locater_id_url; ?></option>
@if($data->locater_id == $option->id) {{'selected'}} @endif value="<?php echo $option->id; ?>"><?php echo $option->locater_identity; ?></option>
<?php }else{ ?>
<option
value="<?php echo $option->id; ?>"><?php echo $option->locater_id_url; ?></option>
value="<?php echo $option->id; ?>"><?php echo $option->locater_identity; ?></option>
<?php } ?>
@endforeach
</select>
......@@ -72,14 +72,7 @@
<?php if(@$errors->first('title')) { ?> <span class="help-block">{{@$errors->first('title')}}</span> <?php } ?>
</div>
</div>
<!--<div class="form-group @if($errors->first('slug')) {{' has-error has-feedback'}} @endif ">
<label for="inputError" class="col-sm-2 control-label">Slug</label>
<div class="col-sm-10">
<input type="text" name="slug" class="form-control" placeholder="Slug" value="{{old('slug',@$data->slug)}}">
<?php if(@$errors->first('slug')) { ?> <span class="help-block">{{@$errors->first('slug')}}</span> <?php } ?>
</div>
</div>-->
<!-- new code -->
<div class="form-group @if($errors->first('slug')) {{' has-error has-feedback'}} @endif ">
<label for="inputError" class="col-sm-2 control-label">Slug</label>
......@@ -163,7 +156,7 @@
<!-- /.box-body -->
<div class="box-footer">
<input type="submit" value="Submit" class="btn btn-info">
<a href="{{route('admin-pages')}}" class="btn btn-default">Cancel</a>
<a href="{{route('admin.pages')}}" class="btn btn-default">Cancel</a>
</div>
<!-- /.box-footer -->
</form>
......
......@@ -32,7 +32,7 @@
{!! session('add_message') !!}
</div>
@endif
<form id="pages-mng" method="get" action="{{route('admin-pages')}}">
<form id="pages-mng" method="get" action="{{route('admin.pages')}}">
{{ csrf_field() }}
<div class="row clearfix">
<div class="col-sm-2">
......@@ -44,10 +44,10 @@
</div>
<div class="col-sm-4">
<button type="submit" class="btn btn-primary btn-info">Search<div></div></button>
<a href="{{route('admin-pages')}}" class="btn btn-primary btn-success">Reset</a>
<a href="{{route('admin.pages')}}" class="btn btn-primary btn-success">Reset</a>
</div>
<div class="col-sm-2 pull-right">
<a href="{{route('admin-addpage')}}" class="btn btn-block btn-warning">Add Page</a>
<a href="{{route('admin.pages.add')}}" class="btn btn-block btn-warning">Add Page</a>
</div>
</div>
</form>
......@@ -73,22 +73,20 @@
<th style="width: 10px">#</th>
<th>@sortablelink('locater_id')</th>
<th>@sortablelink('title')</th>
<th>@sortablelink('contents')</th>
<th>@sortablelink('created_at')</th>
<th style="width: 40px">Action</th>
</tr>
@if(count($data['records'])>0)
@if(count($records)>0)
<?php $k = ($pageNo == 1) ? $pageNo : (($pageNo - 1) * $record_per_page) + 1; ?>
@foreach($data['records'] as $row)
@foreach($records as $row)
<tr>
<td>{{$row->id}}</td>
<td>{{$row->locaterlists->locater_id_url}}</td>
<td>{{$row->locaterlists->locater_identity}}</td>
<td>{{$row->title}}</td>
<td>{!!$row->contents!!}</td>
<td>{{date("F j, Y", strtotime($row->created_at))}}</td>
<td style="width:10%">
<a href="{{route('admin-pagesedit',['id'=>$row->id])}}" class="btn btn-info btn-xs action-btn" title ="Edit"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></a>
<a href="{{route('admin-deletepage',['id'=>$row->id])}}" class="btn btn-danger btn-xs action-btn" onclick="return confirm('Are you sure you want to delete ?');" title ="Delete"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span></a>
<a href="{{route('admin.pages.edit',['id'=>$row->id])}}" class="btn btn-info btn-xs action-btn" title ="Edit"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></a>
<a href="{{route('admin.pages.delete',['id'=>$row->id])}}" class="btn btn-danger btn-xs action-btn" onclick="return confirm('Are you sure you want to delete ?');" title ="Delete"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span></a>
</td>
</tr>
<?php $k++; ?>
......@@ -103,7 +101,7 @@
<!-- /.card-body -->
<div class="card-footer clearfix">
<ul class="pagination pagination-sm m-0 float-right">
{!! $data['records']->links() !!}
{!! $records->links() !!}
</ul>
</div>
<!-- /.card -->
......
@extends('adminlte::page')
@section('content')
<div class="container-fluid">
<div class="row mb-2">
<div class="col-sm-6">
<h1>Add Users</h1>
</div>
<div class="col-sm-6">
<ol class="breadcrumb float-sm-right">
<li class="breadcrumb-item"><a href="#">Home</a></li>
<li class="breadcrumb-item active">Add User</li>
</ol>
</div>
</div>
</div><!-- /.container-fluid -->
<section class="content">
<div class="container-fluid">
<div class="row">
<div class="col-md-12">
<!-- Horizontal Form -->
<div class="box box-info">
<div class="box-header with-border">
<h3 class="box-title"></h3>
<div class="alert alert-success alert-dismissible groputitle" style="display:none">
</div>
@if(Session::has('add_message'))
<div class="alert alert-success alert-dismissible">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
{!! session('add_message') !!}
</div>
@endif
<form class="form-horizontal" id="add-form" action="{{ route('admin.user.save') }}" method="POST" enctype="multipart/form-data">
{{ csrf_field() }}
<div class="box-body">
<input type="hidden" name="id" value="{{old('id',@$data->id)}}">
<div class="form-group @if($errors->first('first_name')) {{' has-error has-feedback'}} @endif ">
<label for="inputError" class="col-sm-2 control-label">Name<em>*</em></label>
<div class="col-sm-10">
<input type="text" name="name" class="form-control" placeholder="Name">
<?php if(@$errors->first('name')) { ?> <span class="help-block">{{@$errors->first('name')}}</span> <?php } ?>
</div>
</div>
<div class="form-group @if($errors->first('email')) {{' has-error has-feedback'}} @endif ">
<label for="inputError" class="col-sm-2 control-label">Email<em>*</em></label>
<div class="col-sm-10">
<input type="text" name="email" autocomplete="off" class="form-control" placeholder="Email">
<?php if(@$errors->first('email')) { ?><span class="help-block">{{@$errors->first('email')}}</span> <?php } ?>
</div>
</div>
<div class="form-group @if($errors->first('new_password')) {{' has-error has-feedback'}} @endif ">
<label for="inputError" class="col-sm-2 control-label">Password</label>
<div class="col-sm-10">
<input type="password" id="new_password" name="new_password" class="form-control" placeholder="New password">
<?php if(@$errors->first('new_password')) { ?><span class="help-block">{{@$errors->first('new_password')}}</span> <?php } ?>
</div>
</div>
<div class="form-group @if($errors->first('confirm_password')) {{' has-error has-feedback'}} @endif ">
<label for="inputError" class="col-sm-2 control-label">Confirm Password</label>
<div class="col-sm-10">
<input type="password" id="confirm_password" name="confirm_password" class="form-control" placeholder="Confirm Password">
<?php if(@$errors->first('confirm_password')) { ?><span class="help-block">{{@$errors->first('confirm_password')}}</span> <?php } ?>
</div>
</div>
</div>
<!-- /.box-body -->
<div class="box-footer">
<input type="submit" value="Submit" class="btn btn-info">
<a href="{{route('admin.users')}}" class="btn btn-default">Cancel</a>
</div>
<!-- /.box-footer -->
</form>
</div>
</div>
<!--/.col (right) -->
</div>
</div>
</div>
<style>
.help-block{
color:red;
}
</style>
<script type="text/javascript">
$( document ).ready(function() {
$.validator.addMethod('filesize', function(value, element, param) {
return this.optional(element) || (element.files[0].size <= param)
});
$.validator.addMethod("alphanumspecial", function (value, element) {
return this.optional(element) || /^(?=.*[a-z])(?=.*[0-9])(?=.*[!@#\$%\^&\*])(?=.{6,})/i.test(value);
}, "Combination of alphabets,special characters & numeric values required.");
$('#add-form').validate({
ignore: ".ignore",
rules: {
email: {
required:true,
email:true,
remote: {
url: '{{route("check_email")}}'+'?id='+'{{@$data->id}}',
type: "get",
data: {
title: function() {
return $("#email").val();
}
},
},
},
name: "required",
new_password: {
minlength: 6,
maxlength: 15,
alphanumspecial: true
},
confirm_password:{
required: {
depends: function(element) {
return ($("input[name=new_password]").val() != "" && $('input[name=id]').val() != "");
},
},
minlength:6,
equalTo : "#new_password",
},
},
// Specify validation error messages
messages: {
email:
{
required:"Please enter email.",
email:"Please enter valid email.",
remote:"Email already exist."
},
name: "Please enter Name.",
new_password:{
minlength: "Password must be 6 characters long hhhh.",
maxlength: 'Maximum length required is 15',
alphanumspecial: 'Combination of alphabets,special characters & numeric values required',
},
confirm_password:{
required:"Please enter confirm password.",
minlength: "Password must be 6 characters long.",
equalTo : "Confirm password should match with new password.",
}
},
});
});
</script>
@endsection
\ No newline at end of file
......@@ -10,7 +10,7 @@
<div class="col-sm-6">
<ol class="breadcrumb float-sm-right">
<li class="breadcrumb-item"><a href="#">Home</a></li>
<li class="breadcrumb-item active">Update User</li>
<li class="breadcrumb-item active">Edit User</li>
</ol>
</div>
</div>
......@@ -33,7 +33,7 @@
</div>
@endif
<form class="form-horizontal" id="add-form" action="@if(@$data->id) {{route('admin-usersedit',['id'=>@$data->id])}} @else {{route('admin-adduser')}} @endif" method="POST" enctype="multipart/form-data">
<form class="form-horizontal" id="edit-form" action="{{route('admin.user.update',['id'=>@$data->id])}}" method="POST" enctype="multipart/form-data">
{{ csrf_field() }}
<div class="box-body">
......@@ -53,18 +53,14 @@
<div class="col-sm-10">
<?php
if(isset($data->id) && $data->id>0){
echo $data->email;
echo $data->email;
?>
<input type="hidden" name="email" class="form-control" placeholder="Email" value="{{old('email',@$data->email)}}">
<?php
}
else{
?>
<input type="text" name="email" class="form-control" placeholder="Email" value="{{old('email',@$data->email)}}">
<?php } ?>
<?php if(@$errors->first('email')) { ?><span class="help-block">{{@$errors->first('email')}}</span> <?php } ?>
</div>
</div>
<div class="form-group @if($errors->first('new_password')) {{' has-error has-feedback'}} @endif ">
<label for="inputError" class="col-sm-2 control-label">Password</label>
<div class="col-sm-10">
......@@ -72,6 +68,7 @@
<?php if(@$errors->first('new_password')) { ?><span class="help-block">{{@$errors->first('new_password')}}</span> <?php } ?>
</div>
</div>
<div class="form-group @if($errors->first('confirm_password')) {{' has-error has-feedback'}} @endif ">
<label for="inputError" class="col-sm-2 control-label">Confirm Password</label>
<div class="col-sm-10">
......@@ -84,7 +81,7 @@
<!-- /.box-body -->
<div class="box-footer">
<input type="submit" value="Submit" class="btn btn-info">
<a href="{{route('admin-users')}}" class="btn btn-default">Cancel</a>
<a href="{{route('admin.users')}}" class="btn btn-default">Cancel</a>
</div>
<!-- /.box-footer -->
</form>
......
......@@ -32,7 +32,7 @@
{!! session('add_message') !!}
</div>
@endif
<form id="users-mng" method="get" action="{{route('admin-users')}}">
<form id="users-mng" method="get" action="{{route('admin.users')}}">
{{ csrf_field() }}
<div class="row clearfix">
<div class="col-sm-2">
......@@ -44,10 +44,10 @@
</div>
<div class="col-sm-4">
<button type="submit" class="btn btn-primary btn-info">Search<div></div></button>
<a href="{{route('admin-users')}}" class="btn btn-primary btn-success">Reset</a>
<a href="{{route('admin.users')}}" class="btn btn-primary btn-success">Reset</a>
</div>
<div class="col-sm-2 pull-right">
<a href="{{route('admin-adduser')}}" class="btn btn-block btn-warning">Add User</a>
<a href="{{route('admin.user.add')}}" class="btn btn-block btn-warning">Add User</a>
</div>
</div>
</form>
......@@ -79,17 +79,17 @@
<th>@sortablelink('created_at')</th>
<th style="width: 40px">Action</th>
</tr>
@if(count($data['records'])>0)
@if(count($records)>0)
<?php $k = ($pageNo == 1) ? $pageNo : (($pageNo - 1) * $record_per_page) + 1; ?>
@foreach($data['records'] as $row)
@foreach($records as $row)
<tr>
<td>{{$row->id}}</td>
<td>{{$row->name}}</td>
<td>{{$row->email}}</td>
<td>{{date("F j, Y", strtotime($row->created_at))}}</td>
<td style="width:10%">
<a href="{{route('admin-usersedit',['id'=>$row->id])}}" class="btn btn-info btn-xs action-btn" title ="Edit"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></a>
<a href="{{route('admin-deleteuser',['id'=>$row->id])}}" class="btn btn-danger btn-xs action-btn" onclick="return confirm('Are you sure you want to delete ?');" title ="Delete"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span></a>
<a href="{{route('admin.user.edit',['id'=>$row->id])}}" class="btn btn-info btn-xs action-btn" title ="Edit"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></a>
<a href="{{route('admin.user.delete',['id'=>$row->id])}}" class="btn btn-danger btn-xs action-btn" onclick="return confirm('Are you sure you want to delete ?');" title ="Delete"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span></a>
</td>
</tr>
<?php $k++; ?>
......@@ -104,7 +104,7 @@
<!-- /.card-body -->
<div class="card-footer clearfix">
<ul class="pagination pagination-sm m-0 float-right">
{!! $data['records']->links() !!}
{!! $records->links() !!}
</ul>
</div>
<!-- /.card -->
......
<ul class="dropdown-menu" style="display:block; position:relative">
@foreach($locationDetailAPIdata['data'] as $row)
<li><i class="mdi mdi-map-marker"></i><a href="#">{{ $row['name'] }}</a></li>
@endforeach
</ul>
\ No newline at end of file
......@@ -53,7 +53,7 @@
<div class="row result_head">
<div class="col-6">
<span class="result_head-counts">
<?php $totalFoundLocation = count($locatorApiData->data); ?>
<?php $totalFoundLocation = count($finalData); ?>
{{ $totalFoundLocation }} locations found</span>
</div>
<div class="col-6 text-right">
......@@ -74,11 +74,11 @@
<div class="row no-gutters">
<div class=" mt-4 location_data-listing" id="searchlocaterid">
<?php
foreach($locatorApiData->data as $key=>$data){
$link = '';
foreach($finalData as $key=>$data){
/*$link = '';
if(isset($locaterkeyvalueddata[$data->id])){
$link = $locaterkeyvalueddata[$data->id];
}
}*/
?>
<div class="card">
<div class="card-body">
......@@ -86,7 +86,7 @@
<img src="vendor/frontend/img/location-img.png" />
</div>
<div class="location_data-content">
<h5 class="title"><a href="{{route('detail',['slug'=>$link])}}"><?php echo $data->name; ?></a></h5>
<h5 class="title"><a href="{{route('detail',['slug'=>$data['slug']])}}"><?php echo $data['name']; ?></a></h5>
<span class="ratings">
<i class="mdi mdi-star"></i>
<i class="mdi mdi-star"></i>
......@@ -94,10 +94,10 @@
<i class="mdi mdi-star"></i>
<i class="mdi mdi-star-outline"></i>
<br>
<span class="counts">({{ $data->reviewCounts }})</span>
<span class="counts">({{ $data['reviewCounts'] }})</span>
</span>
<p class="address">
<?php echo $data->fullAddress->addressLines[0]; ?>
<?php echo $data['fullAddress']['addressLines'][0]; ?>
</p>
</div>
</div>
......
@foreach($finalData as $key=>$data)
<div class="card">
<div class="card-body">
<div class="location_data-img">
<img src="vendor/frontend/img/location-img.png" />
</div>
<div class="location_data-content">
<h5 class="title">
<a href="{{route('detail',['slug'=>$data['slug']])}}">{{ $data['name'] }}</a>
</h5>
<span class="ratings">
<i class="mdi mdi-star"></i>
<i class="mdi mdi-star"></i>
<i class="mdi mdi-star"></i>
<i class="mdi mdi-star"></i>
<i class="mdi mdi-star-outline"></i>
<br>
<span class="counts">{{ $data['reviewCounts'] }}</span>
</span>
<p class="address">{{ $data['fullAddress']['addressLines'][0] }} <br> {{ $data['fullAddress']['addressLines'][1] }}</p>
</div>
</div>
</div>
@endforeach
......@@ -15,10 +15,10 @@
return view('welcome');
});*/
Route::any('/', 'SearchController@index')->name('search');
Route::any('/searchlocator', 'SearchController@searchlocator')->name('searchlocator');
Route::get('/', 'SearchController@index')->name('search');
Route::post('searchlocator', 'SearchController@searchlocator')->name('searchlocator');
Route::get('autocomplete', 'SearchController@autocomplete')->name('autocomplete');
Route::any('/detail/{slug}', 'SearchController@detail')->name('detail');
Route::get('detail/{slug}', 'SearchController@detail')->name('detail');
Auth::routes();
......@@ -29,39 +29,67 @@ Route::get('/home', 'HomeController@index')->name('home');
//Route::get('/home', 'HomeController@index')->name('home');
Route::any('/check_email', 'HomeController@check_email')->name('check_email');
Route::any('/check_locater_id_url', 'HomeController@check_locater_id_url')->name('check_locater_id_url');
Route::get('/check_email', 'HomeController@check_email')->name('check_email');
Route::get('/check_locater_identity', 'HomeController@check_locater_identity')->name('check_locater_identity');
Route::group(['middleware' => ['auth'], 'prefix' => 'admin', 'namespace' => 'Admin'], function () {
/* For manage users */
/* For manage dashboard */
Route::get('/dashboard', 'AdminController@index')->name('admin-dashboard');
Route::any('/users', 'UserController@userslist')->name('admin-users');
Route::any('/add-user', 'UserController@add_user')->name('admin-adduser');
Route::any('/users/user_edit/{id}', 'UserController@add_user')->name('admin-usersedit');
Route::get('/user_delete/{id}', 'UserController@user_delete')->name('admin-deleteuser');
/* For manage users */
Route::get('users', 'UserController@usersList')->name('admin.users');
Route::get('users/create', 'UserController@createUser')->name('admin.user.add');
Route::post('users/create', 'UserController@saveUser')->name('admin.user.save');
Route::get('users/{id}/edit', 'UserController@editUser')->name('admin.user.edit');
Route::post('users/{id}/edit', 'UserController@updateUser')->name('admin.user.update');
Route::get('users/{id}/delete', 'UserController@deleteUser')->name('admin.user.delete');
/* For manage locaters */
Route::any('/locaters', 'LocaterController@locaterslist')->name('admin-locaters');
Route::any('/add-locater', 'LocaterController@add_locater')->name('admin-addlocater');
Route::any('/locaters/locater_edit/{id}', 'LocaterController@add_locater')->name('admin-locatersedit');
Route::get('/locater_delete/{id}', 'LocaterController@locater_delete')->name('admin-deletelocater');
Route::get('locaters', 'LocaterController@locatersList')->name('admin.locaters');
Route::get('locaters/create', 'LocaterController@createLocater')->name('admin.locaters.add');
Route::post('locaters/create', 'LocaterController@saveLocater')->name('admin.locaters.save');
Route::get('locaters/{id}/edit', 'LocaterController@editLocater')->name('admin.locaters.edit');
Route::post('locaters/{id}/edit', 'LocaterController@updateLocater')->name('admin.locaters.update');
Route::get('locaters/{id}/delete', 'LocaterController@deleteLocater')->name('admin.locaters.delete');
/*Route::get('locaters/create', 'LocaterController@createLocater')->name('admin.locaters.add');
Route::post('locaters/create', 'LocaterController@saveLocater')->name('admin.locaters.save');
Route::get('locaters/{id}/edit', 'LocaterController@editLocater')->name('admin.locaters.edit');
Route::post('locaters/{id}/edit', 'LocaterController@updateLocater')->name('admin.locaters.update');
Route::post('locaters/{id}/delete', 'LocaterController@deleteLocater')->name('admin.locaters.delete');*/
/* For manage pages */
Route::any('/pages', 'PageController@pageslist')->name('admin-pages');
Route::any('/add-page', 'PageController@add_page')->name('admin-addpage');
Route::any('/pages/page_edit/{id}', 'PageController@add_page')->name('admin-pagesedit');
Route::get('/page_delete/{id}', 'PageController@page_delete')->name('admin-deletepage');
Route::any('pages', 'PageController@pagesList')->name('admin.pages');
Route::get('pages/create', 'PageController@createPage')->name('admin.pages.add');
Route::post('pages/create', 'PageController@savePage')->name('admin.pages.save');
Route::get('pages/{id}/edit', 'PageController@editPage')->name('admin.pages.edit');
Route::post('pages/{id}/edit', 'PageController@updatePage')->name('admin.pages.update');
Route::get('pages/{id}/delete', 'PageController@deletePage')->name('admin.pages.delete');
/* For manage offers */
Route::any('/offers', 'OfferController@offerslist')->name('admin-offers');
Route::any('/add-offer', 'OfferController@add_offer')->name('admin-addoffer');
Route::any('/offers/offer_edit/{id}', 'OfferController@add_offer')->name('admin-offersedit');
Route::get('/offer_delete/{id}', 'OfferController@offer_delete')->name('admin-deleteoffer');
Route::any('offers', 'OfferController@offersList')->name('admin.offers');
Route::get('offers/create', 'OfferController@createOffer')->name('admin.offers.add');
Route::post('offers/create', 'OfferController@saveOffer')->name('admin.offers.save');
Route::get('offers/{id}/edit', 'OfferController@editOffer')->name('admin.offers.edit');
Route::post('offers/{id}/edit', 'OfferController@updateOffer')->name('admin.offers.update');
Route::get('offers/{id}/delete', 'OfferController@deleteOffer')->name('admin.offers.delete');
/* For manage homepages */
Route::any('/homepages', 'HomepageController@homepageslist')->name('admin-homepages');
Route::any('/add-homepage', 'HomepageController@add_homepage')->name('admin-addhomepage');
Route::any('/homepages/homepage_edit/{id}', 'HomepageController@add_homepage')->name('admin-homepagesedit');
Route::get('/homepage_delete/{id}', 'HomepageController@homepage_delete')->name('admin-deletehomepage');
Route::any('homepages', 'HomepageController@homepagesList')->name('admin.homepages');
Route::get('homepages/create', 'HomepageController@createHomepage')->name('admin.homepages.add');
Route::post('homepages/create', 'HomepageController@saveHomepage')->name('admin.homepages.save');
Route::get('homepages/{id}/edit', 'HomepageController@editHomepage')->name('admin.homepages.edit');
Route::post('homepages/{id}/edit', 'HomepageController@updateHomepage')->name('admin.homepages.update');
Route::get('homepages/{id}/delete', 'HomepageController@deleteHomepage')->name('admin.homepages.delete');
//Route::any('/add-homepage', 'HomepageController@add_homepage')->name('admin-addhomepage');
//Route::any('/homepages/homepage_edit/{id}', 'HomepageController@add_homepage')->name('admin-homepagesedit');
//Route::get('/homepage_delete/{id}', 'HomepageController@homepage_delete')->name('admin-deletehomepage');
});
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment