From bd75e1e313536ecce90611125c4b2a08f84c04c9 Mon Sep 17 00:00:00 2001
From: Muhamad Visat Sutarno <mvisat@gmail.com>
Date: Thu, 7 Apr 2016 12:05:36 +0700
Subject: [PATCH] fix users
---
.../app/Http/Controllers/Auth/AuthController.php | 14 ++++++--------
.../Http/Controllers/ObjectSellController.php | 4 ++--
IES-Bandung/app/Model/PublicUser.php | 16 ++++++++++------
IES-Bandung/app/Model/VendorUser.php | 15 ++++++++++-----
4 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/IES-Bandung/app/Http/Controllers/Auth/AuthController.php b/IES-Bandung/app/Http/Controllers/Auth/AuthController.php
index f59c80a..6dff4f5 100755
--- a/IES-Bandung/app/Http/Controllers/Auth/AuthController.php
+++ b/IES-Bandung/app/Http/Controllers/Auth/AuthController.php
@@ -82,15 +82,13 @@ class AuthController extends Controller
'birth_place' => $data['birth_place'],
'tel_no' => $data['tel_no'],
'type' => $data['type']
- ]);
-
- if($data['type'] == "public"){
- $publicUserModel = new PublicUser();
- $publicUserModel->createNewPublicUser($user->id);
+ ]);
+
+ if ($data['type'] === "public") {
+ PublicUser::createPublicUser($user->id);
}
- else if($data['type'] == 'vendor'){
- $vendorUserModel = new VendorUser();
- $vendorUserModel->createNewVendorUser($user->id, $data['place']);
+ else if ($data['type'] === 'vendor') {
+ VendorUser::createVendorUser($user->id, $data['place']);
}
diff --git a/IES-Bandung/app/Http/Controllers/ObjectSellController.php b/IES-Bandung/app/Http/Controllers/ObjectSellController.php
index 7a3f65b..f45b98d 100644
--- a/IES-Bandung/app/Http/Controllers/ObjectSellController.php
+++ b/IES-Bandung/app/Http/Controllers/ObjectSellController.php
@@ -27,10 +27,10 @@ class ObjectSellController extends Controller
$objectType = ObjectType::getOrCreate($request->name);
$userId = Auth::user()['id'];
$vendorUserModel = new VendorUser;
- $vendorUserID = $vendorUserModel->getFullProfile($userId)['vendor_user_id'];
+ $vendorUserId = $vendorUserModel->getFullProfile($userId)['vendor_user_id'];
$item = new ObjectSell;
- $item->vendorUserID = $vendorUserID;
+ $item->vendor_user_id = $vendorUserId;
$item->name = $request->name;
$item->object_type_id = $objectType->id;
$item->price = $request->price;
diff --git a/IES-Bandung/app/Model/PublicUser.php b/IES-Bandung/app/Model/PublicUser.php
index 0f242f7..da6e72b 100644
--- a/IES-Bandung/app/Model/PublicUser.php
+++ b/IES-Bandung/app/Model/PublicUser.php
@@ -7,15 +7,19 @@ use App\User;
class PublicUser extends Model
{
- //
protected $table = 'public_users';
- public function createNewPublicUser($userID) {
- $this->userID = $userID;
- $this->save();
+ public static function createPublicUser($userId) {
+ $model = new PublicUser;
+ $model->user_id = $userId;
+ $model->save();
+ return $model;
}
- public function getFullProfile($username) {
- return $this->join('users', 'users.id', '=', 'PublicUser.id')->where('users.username', '=', $username)->get();
+ public static function getFullProfile($username) {
+ return PublicUser::
+ join('users', 'users.id', '=', 'public_users.id')->
+ where('users.username', '=', $username)->
+ first();
}
}
diff --git a/IES-Bandung/app/Model/VendorUser.php b/IES-Bandung/app/Model/VendorUser.php
index 776aa44..a5d8616 100644
--- a/IES-Bandung/app/Model/VendorUser.php
+++ b/IES-Bandung/app/Model/VendorUser.php
@@ -10,13 +10,18 @@ class VendorUser extends Model
protected $table = 'vendor_users';
public static function getFullProfile($userId) {
- return VendorUser::join('users', 'users.id', '=', 'VendorUser.user_id')->where('VendorUser.user_id', '=', $userId)->first();
+ return VendorUser::
+ join('users', 'users.id', '=', 'vendor_users.user_id')->
+ where('vendor_users.user_id', '=', $userId)
+ ->first();
}
- public static function createNewVendorUser($userId, $place) {
- $this->user_id = $userId;
- $this->place = $place;
- $this->save();
+ public static function createVendorUser($userId, $place) {
+ $model = new VendorUser;
+ $model->user_id = $userId;
+ $model->place = $place;
+ $model->save();
+ return $model;
}
public static function updateVendorplace($userId, $newplace) {
--
GitLab