From 7852eea2fb906c7e3b43795c73065e7a34d918f8 Mon Sep 17 00:00:00 2001 From: Surendran Date: Sat, 11 Aug 2018 12:50:24 +0800 Subject: [PATCH] update personal information and company information --- app/Http/Controllers/AuthController.php | 1 + app/Http/Controllers/CompanyController.php | 2 +- database/seeds/DatabaseSeeder.php | 2 +- public/company-profile.html | 64 ++++++++++++++++++- public/home.html | 71 +++++++++++----------- 5 files changed, 103 insertions(+), 37 deletions(-) diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index 3ac2596..0c445e5 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -159,6 +159,7 @@ class AuthController extends Controller return response()->json(['success'=> true, 'message'=> 'Profile updated.'], 200); } + public function show() { return response()->json(['user' => Auth::user()]); diff --git a/app/Http/Controllers/CompanyController.php b/app/Http/Controllers/CompanyController.php index b522c5b..0df596a 100644 --- a/app/Http/Controllers/CompanyController.php +++ b/app/Http/Controllers/CompanyController.php @@ -57,7 +57,7 @@ class CompanyController extends Controller public function company() { - return response()->json(['user' => Auth::user()]); + return response()->json(['company' => Auth::user()->company()->first()]); } public function companyProfile(Request $request) diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index 109c2bc..1ce7e13 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -13,7 +13,7 @@ class DatabaseSeeder extends Seeder { $this->call(LaratrustSeeder::class); $this->call(UsersTableSeeder::class); - $this->call(DeliveryInfoSeeder::class); + //$this->call(DeliveryInfoSeeder::class); $this->call(CompanySeeder::class); } } diff --git a/public/company-profile.html b/public/company-profile.html index 6bb6eaf..8cff3dd 100644 --- a/public/company-profile.html +++ b/public/company-profile.html @@ -141,6 +141,35 @@ diff --git a/public/home.html b/public/home.html index bbddbe1..73e853a 100644 --- a/public/home.html +++ b/public/home.html @@ -55,43 +55,39 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
-
- -
-
- +
@@ -616,7 +612,7 @@
- +
Company Information @@ -731,29 +727,19 @@
- +
- +
- +
-
-
- -
- -
+ -
-
- -
- -
+ @@ -1299,6 +1285,8 @@ $.ajax({ console.log('success'); $('#user-name').html(data.user.name); $('#user-phone').html(data.user.phone); + $('#user-name').val(data.user.name); + $('#user-phone').val(data.user.phone); } @@ -1313,13 +1301,28 @@ $.ajax({ async : false, success : function(data) { console.log('success'); - $('#company-name').html(data.company.name); - + $('#company-name').html(data.company.company_name); + $('#registration-no').html(data.company.registration_no); + $('#tax-no').html(data.company.tax_no); + $('#tel-no').html(data.company.tel_no); + $('#fax').html(data.company.fax); + $('#address').html(data.company.address); + $('#city').html(data.company.city); + $('#postcode').html(data.company.postcode); + $('#state').html(data.company.state); + $('#country').html(data.company.country); + $('#contact-person').html(data.company.contact_person); + $('#address').html(data.company.address); + + + } }); + +