diff --git a/IES-Bandung/app/Http/Controllers/ObjectSellController.php b/IES-Bandung/app/Http/Controllers/ObjectSellController.php
index bac50d72b30e0a98103eaa82b98461b01dfe6dcc..5ffc290dcd377579a58bc56203dfdd6b28f72493 100644
--- a/IES-Bandung/app/Http/Controllers/ObjectSellController.php
+++ b/IES-Bandung/app/Http/Controllers/ObjectSellController.php
@@ -7,6 +7,7 @@ use Illuminate\Http\Request;
use App\Http\Requests;
use App\Model\ObjectSell;
use App\Model\ObjectType;
+use App\Model\VendorUser;
use Validator;
use Auth;
@@ -34,8 +35,12 @@ class ObjectSellController extends Controller
}
$userId = Auth::user()['id'];
+ $vendorUserModel = new VendorUser;
+ $vendorDBID = $vendorUserModel->getFullProfile($userId)['vendorDBID'];
+ echo $vendorDBID;
+
$item = new ObjectSell;
- $item->vendorDBID = $userId;
+ $item->vendorDBID = $vendorDBID;
$item->object_name = $request->object_name;
$item->objectTypeID = $objectType->objectTypeID;
$item->price = $request->price;
diff --git a/IES-Bandung/app/Http/Controllers/ProfileController.php b/IES-Bandung/app/Http/Controllers/ProfileController.php
index db76201087ebc2be3589c98dfe60ae73efb99584..dcaa1f2cffe06aa2a0f41d5aff501958ee8e5ab9 100644
--- a/IES-Bandung/app/Http/Controllers/ProfileController.php
+++ b/IES-Bandung/app/Http/Controllers/ProfileController.php
@@ -23,7 +23,7 @@ class ProfileController extends Controller
public function index() {
if (Auth::check()) {
$username = Auth::user()['username'];
- return $this->showProfile($username);
+ return redirect('/profile/'.$username);
}
else {
return redirect('/login');
@@ -38,7 +38,7 @@ class ProfileController extends Controller
$user_type = $user['user_type'];
- if($user_type === "publicUser"){
+ if($userType === "public"){
$this->controller = new PublicUserController();
}
else if($user_type === "vendor"){
diff --git a/IES-Bandung/app/Http/Controllers/PublicUserController.php b/IES-Bandung/app/Http/Controllers/PublicUserController.php
index 0af5862fa01135643bf1453a0d5104c14c235711..c39a4f8deb75173dafe9e8dbcf84899a4576a4c9 100644
--- a/IES-Bandung/app/Http/Controllers/PublicUserController.php
+++ b/IES-Bandung/app/Http/Controllers/PublicUserController.php
@@ -72,6 +72,6 @@ class PublicUserController extends Controller
}
$user->save();
}
- // return redirect('/profile');
+ return redirect('/profile');
}
}
diff --git a/IES-Bandung/app/Http/Controllers/VendorUserController.php b/IES-Bandung/app/Http/Controllers/VendorUserController.php
index 2ef6c2e1f0d0f97773f412f1fec8f5f68c789815..1a756889db8c27490e4259429a27c984dd34137a 100644
--- a/IES-Bandung/app/Http/Controllers/VendorUserController.php
+++ b/IES-Bandung/app/Http/Controllers/VendorUserController.php
@@ -19,12 +19,13 @@ class VendorUserController extends Controller
public function viewProfile($username) {
$editable = Auth::check() ? Auth::user()['username'] === $username : false;
- $user = User::where('username', $username)->first();
+ $userId = Auth::user()['id'];
+ $user = $this->VendorUserModel->getFullProfile($userId);
$objects = ObjectSell::
join('ObjectType', 'ObjectSell.objectTypeID', '=', 'ObjectType.objectTypeID')->
- where('vendorDBID', '=', $user->id)->
- select('ObjectSell.*', 'ObjectType.object_type_name')->
- get();
+ where('vendorDBID', '=', $user->vendorDBID)->
+ select('ObjectSell.*', 'ObjectType.object_type_name')
+ ->get();
return view('vendorUser', [
'editable' => $editable,
diff --git a/IES-Bandung/app/Http/routes.php b/IES-Bandung/app/Http/routes.php
index 13a2002158e2b8c70d6ed42d487329d6e1efea12..5d64ec0fe945786d082993debb8e6aea907f83a4 100755
--- a/IES-Bandung/app/Http/routes.php
+++ b/IES-Bandung/app/Http/routes.php
@@ -23,7 +23,7 @@ Route::get('/home', 'HomeController@index');
Route::get('/profile', 'ProfileController@index');
Route::get('/profile/{username}', ['uses' => 'ProfileController@showProfile']);
-// Route::post('/profile/edit', ['uses' => 'PublicUserController@editProfile']);
+Route::post('/profile/edit', ['uses' => 'PublicUserController@editProfile']);
// Vendor's object sell
Route::post('/item/add', 'ObjectSellController@createObjectSell');
diff --git a/IES-Bandung/app/Model/VendorUser.php b/IES-Bandung/app/Model/VendorUser.php
index f6ce51abdd214419680aff19c4a2b0a5832f9fc3..0c69a201070dbd545d2312d9cca73c797e7f66e3 100644
--- a/IES-Bandung/app/Model/VendorUser.php
+++ b/IES-Bandung/app/Model/VendorUser.php
@@ -10,7 +10,7 @@ class VendorUser extends Model
protected $table = 'VendorUser';
public function getFullProfile($userID) {
- return $this->join('users', 'users.id', '=', 'VendorUser.userID')->where('VendorUser.userID', '=', $userID)->get();
+ return $this->join('users', 'users.id', '=', 'VendorUser.userID')->where('VendorUser.userID', '=', $userID)->first();
}
public function createNewVendorUser($userID, $vending_place) {
diff --git a/IES-Bandung/public/img/pasar.png b/IES-Bandung/public/img/pasar.png
new file mode 100644
index 0000000000000000000000000000000000000000..048d8036e654e8514f31e71e22f4123e32a79659
Binary files /dev/null and b/IES-Bandung/public/img/pasar.png differ
diff --git a/IES-Bandung/resources/views/auth/login.blade.php b/IES-Bandung/resources/views/auth/login.blade.php
index 2223974e1e9db7cbb24a743209e03933d13d5ae7..c2bb8aca2cc7fb99bc16ad3884ef21a8c785cd84 100755
--- a/IES-Bandung/resources/views/auth/login.blade.php
+++ b/IES-Bandung/resources/views/auth/login.blade.php
@@ -6,7 +6,9 @@
<div class="container w-xxl w-auto-xs" >
<div class="header-signin">
<div class="wrapper-lg text-center">
- <img src="img/logo-bdg.png" alt="">
+ <a class="navbar-brand text-lt">
+ <img src="http://localhost:8888/img/ecohub.png" alt="." class="large-logo">
+ </a>
<p class="m-t-sm m-b-none">Integrated Economy System Bandung<br />Web App</p>
</div>
</div>
diff --git a/IES-Bandung/resources/views/vendorUser.blade.php b/IES-Bandung/resources/views/vendorUser.blade.php
index 92b5e0eb149d5726be5ff174d68c38b7b3f78d99..1c4050a0772ca84b185863624cbb37e86b7e24e5 100755
--- a/IES-Bandung/resources/views/vendorUser.blade.php
+++ b/IES-Bandung/resources/views/vendorUser.blade.php
@@ -32,10 +32,10 @@
<div class="clear m-b">
<div class="m-b-sm m-t-sm">
<span class="text22 text-white font-semibold">{{ $user->full_name }}</span>
- <small class="m-l-sm text-info"><a href="#">@kangburhan</a></small>
+ <small class="m-l-sm text-info"><a href="#">{{ $user->email }}</a></small>
</div>
<div class="">
- <span class="text12 m-b-md text-grey"><i class="text-white fa fa-map-marker text14 m-r-xs"></i> Pasar Baru, Bandung</span>
+ <span class="text12 m-b-md text-grey"><i class="text-white fa fa-map-marker text14 m-r-xs"></i> {{ $user->vendingPlace }}</span>
</div>
<p class="m-b m-t-sm">
<a href class="m-r-sm text-white btn-icon"><i class="text16 fa fa-twitter"></i></a>
@@ -54,7 +54,7 @@
<small class="text-10 text-grey">Pembeli</small>
</a>
<a href class="inline padder-v padder-md">
- <span class="h3 block font-bold m-b-xs">47</span>
+ <span class="h3 block font-bold m-b-xs">{{ count($objects) }}</span>
<small class="text-10 text-grey">Barang Dagangan</small>
</a>
<a href class="inline padder-v padder-md">
@@ -88,10 +88,7 @@
</div>
<div>
<form>
- <table class="table" ui-jq="footable" ui-options='{
- "paging": {
- "enabled": true
- }}'>
+ <table class="table">
<thead>
<tr>
<th data-breakpoints="xs">ID</th>