From 32b970cd3dc65c84f7cd3ae6ed8349e6d8476622 Mon Sep 17 00:00:00 2001
From: Erick Chandra <erickchandra.1@gmail.com>
Date: Thu, 7 Apr 2016 09:28:26 +0700
Subject: [PATCH] Update renaming non-ID column name with convention.
---
.../app/Http/Controllers/Auth/AuthController.php | 12 ++++++------
.../app/Http/Controllers/ObjectSellController.php | 12 ++++++------
.../app/Http/Controllers/ProfileController.php | 4 ++--
.../app/Http/Controllers/VendorUserController.php | 2 +-
IES-Bandung/app/Model/GovUser.php | 4 ++--
IES-Bandung/app/Model/ObjectSell.php | 4 ++--
IES-Bandung/app/Model/ObjectType.php | 4 ++--
IES-Bandung/app/Model/VendorUser.php | 8 ++++----
IES-Bandung/app/User.php | 2 +-
.../2014_10_12_000000_create_users_table.php | 2 +-
.../migrations/2016_04_04_022610_gov_user.php | 2 +-
.../migrations/2016_04_04_022611_vendor_user.php | 2 +-
.../migrations/2016_04_04_022613_object_type.php | 2 +-
.../migrations/2016_04_04_022615_object_sell.php | 2 +-
.../migrations/2016_04_05_144116_gov_user_log.php | 2 +-
.../migrations/2016_04_05_144129_vendor_user_log.php | 4 ++--
.../migrations/2016_04_05_145431_object_type_log.php | 2 +-
.../migrations/2016_04_05_150010_object_sell_log.php | 2 +-
.../migrations/2016_04_06_020321_user_log.php | 2 +-
...16_04_06_051454_user_log_after_insert_trigger.php | 2 +-
...16_04_06_054018_user_log_after_update_trigger.php | 2 +-
...4_06_061227_gov_user_log_after_insert_trigger.php | 2 +-
...6_061637_vendor_user_log_after_insert_trigger.php | 4 ++--
...6_061851_vendor_user_log_after_update_trigger.php | 4 ++--
...6_062313_object_type_log_after_insert_trigger.php | 2 +-
...6_062533_object_sell_log_after_insert_trigger.php | 2 +-
...6_063143_object_sell_log_after_update_trigger.php | 2 +-
IES-Bandung/resources/views/auth/register.blade.php | 12 ++++++------
IES-Bandung/resources/views/vendorUser.blade.php | 12 ++++++------
database-sql/db_ies_bandung_core.sql | 6 +++---
30 files changed, 62 insertions(+), 62 deletions(-)
diff --git a/IES-Bandung/app/Http/Controllers/Auth/AuthController.php b/IES-Bandung/app/Http/Controllers/Auth/AuthController.php
index 98d36f4..6c5d32c 100755
--- a/IES-Bandung/app/Http/Controllers/Auth/AuthController.php
+++ b/IES-Bandung/app/Http/Controllers/Auth/AuthController.php
@@ -59,8 +59,8 @@ class AuthController extends Controller
'birth_date' => 'required|date',
'birth_place' => 'required|max:255',
'tel_no' => 'required|max:255',
- 'user_type' => 'required',
- 'vending_place' => 'required_if:userRole,vendor|max:255'
+ 'type' => 'required',
+ 'place' => 'required_if:userRole,vendor|max:255'
]);
}
@@ -81,16 +81,16 @@ class AuthController extends Controller
'birth_date' => $data['birth_date'],
'birth_place' => $data['birth_place'],
'tel_no' => $data['tel_no'],
- 'user_type' => $data['user_type']
+ 'type' => $data['type']
]);
- if($data['user_type'] == "public"){
+ if($data['type'] == "public"){
$publicUserModel = new PublicUser();
$publicUserModel->createNewPublicUser($user->id);
}
- else if($data['user_type'] == 'vendor'){
+ else if($data['type'] == 'vendor'){
$vendorUserModel = new VendorUser();
- $vendorUserModel->createNewVendorUser($user->id, $data['vending_place']);
+ $vendorUserModel->createNewVendorUser($user->id, $data['place']);
}
diff --git a/IES-Bandung/app/Http/Controllers/ObjectSellController.php b/IES-Bandung/app/Http/Controllers/ObjectSellController.php
index 5ffc290..823ea06 100644
--- a/IES-Bandung/app/Http/Controllers/ObjectSellController.php
+++ b/IES-Bandung/app/Http/Controllers/ObjectSellController.php
@@ -15,8 +15,8 @@ class ObjectSellController extends Controller
{
protected function validator(array $request) {
return Validator::make($request, [
- 'object_name' => 'required',
- 'object_type_name' => 'required',
+ 'name' => 'required',
+ 'name' => 'required',
'price' => 'required|numeric'
]);
}
@@ -26,10 +26,10 @@ class ObjectSellController extends Controller
if ($v->fails())
return redirect()->back()->withErrors($v->errors());
- $objectType = ObjectType::where('object_type_name', $request->object_type_name)->first();
+ $objectType = ObjectType::where('name', $request->name)->first();
if ($objectType === null) {
$objectType = new ObjectType;
- $objectType->object_type_name = $request->object_type_name;
+ $objectType->name = $request->name;
$objectType->save();
$objectType->objectTypeID = $objectType->id;
}
@@ -41,7 +41,7 @@ class ObjectSellController extends Controller
$item = new ObjectSell;
$item->vendorDBID = $vendorDBID;
- $item->object_name = $request->object_name;
+ $item->name = $request->name;
$item->objectTypeID = $objectType->objectTypeID;
$item->price = $request->price;
$item->save();
@@ -55,7 +55,7 @@ class ObjectSellController extends Controller
return redirect()->back()->withErrors($v->errors());
$item = ObjectSell::find($id);
- $item->object_name = $request->object_name;
+ $item->name = $request->name;
$item->objectTypeID = $request->objectTypeID;
$item->price = $request->price;
$item->save();
diff --git a/IES-Bandung/app/Http/Controllers/ProfileController.php b/IES-Bandung/app/Http/Controllers/ProfileController.php
index dcaa1f2..3eb0273 100644
--- a/IES-Bandung/app/Http/Controllers/ProfileController.php
+++ b/IES-Bandung/app/Http/Controllers/ProfileController.php
@@ -36,12 +36,12 @@ class ProfileController extends Controller
if ($user === null)
return redirect('/');
- $user_type = $user['user_type'];
+ $type = $user['type'];
if($userType === "public"){
$this->controller = new PublicUserController();
}
- else if($user_type === "vendor"){
+ else if($type === "vendor"){
$this->controller = new VendorUserController();
}
else{
diff --git a/IES-Bandung/app/Http/Controllers/VendorUserController.php b/IES-Bandung/app/Http/Controllers/VendorUserController.php
index 1a75688..a7e2bd3 100644
--- a/IES-Bandung/app/Http/Controllers/VendorUserController.php
+++ b/IES-Bandung/app/Http/Controllers/VendorUserController.php
@@ -24,7 +24,7 @@ class VendorUserController extends Controller
$objects = ObjectSell::
join('ObjectType', 'ObjectSell.objectTypeID', '=', 'ObjectType.objectTypeID')->
where('vendorDBID', '=', $user->vendorDBID)->
- select('ObjectSell.*', 'ObjectType.object_type_name')
+ select('ObjectSell.*', 'ObjectType.name')
->get();
return view('vendorUser', [
diff --git a/IES-Bandung/app/Model/GovUser.php b/IES-Bandung/app/Model/GovUser.php
index c9736a4..c0e98b6 100644
--- a/IES-Bandung/app/Model/GovUser.php
+++ b/IES-Bandung/app/Model/GovUser.php
@@ -10,10 +10,10 @@ class GovUser extends Model
//
protected $table = 'GovUser';
- public function createNewGovUser($userID, $gov_nip) {
+ public function createNewGovUser($userID, $nip) {
return $this->$insert(array(
'userID' => $userID,
- 'gov_nip' => $gov_nip
+ 'nip' => $nip
));
}
diff --git a/IES-Bandung/app/Model/ObjectSell.php b/IES-Bandung/app/Model/ObjectSell.php
index cd2509e..b3d7033 100644
--- a/IES-Bandung/app/Model/ObjectSell.php
+++ b/IES-Bandung/app/Model/ObjectSell.php
@@ -9,10 +9,10 @@ class ObjectSell extends Model
//
protected $table = 'ObjectSell';
- public function createNewObjectSell($vendorDBID, $object_name, $objectTypeID) {
+ public function createNewObjectSell($vendorDBID, $name, $objectTypeID) {
return $this->insert(array(
'vendorDBID' => $vendorDBID,
- 'object_name' => $object_name,
+ 'name' => $name,
'objectTypeID' => $objectTypeID
));
}
diff --git a/IES-Bandung/app/Model/ObjectType.php b/IES-Bandung/app/Model/ObjectType.php
index 8535f82..3c59d9a 100644
--- a/IES-Bandung/app/Model/ObjectType.php
+++ b/IES-Bandung/app/Model/ObjectType.php
@@ -9,9 +9,9 @@ class ObjectType extends Model
//
protected $table = 'ObjectType';
- public function createNewObjectType($newobject_name) {
+ public function createNewObjectType($newname) {
return $this->insert(array(
- 'object_name' => $newobject_name
+ 'name' => $newname
));
}
diff --git a/IES-Bandung/app/Model/VendorUser.php b/IES-Bandung/app/Model/VendorUser.php
index 0c69a20..99f8259 100644
--- a/IES-Bandung/app/Model/VendorUser.php
+++ b/IES-Bandung/app/Model/VendorUser.php
@@ -13,15 +13,15 @@ class VendorUser extends Model
return $this->join('users', 'users.id', '=', 'VendorUser.userID')->where('VendorUser.userID', '=', $userID)->first();
}
- public function createNewVendorUser($userID, $vending_place) {
+ public function createNewVendorUser($userID, $place) {
$this->userID = $userID;
- $this->vending_place = $vending_place;
+ $this->place = $place;
$this->save();
}
- public function updateVendorvending_place($userID, $newvending_place) {
+ public function updateVendorplace($userID, $newplace) {
return $this->where($userID, '=', 'VendorUser.userID')->update(array(
- 'vending_place' => $newvending_place
+ 'place' => $newplace
));
}
}
diff --git a/IES-Bandung/app/User.php b/IES-Bandung/app/User.php
index 0f08975..7ff245a 100755
--- a/IES-Bandung/app/User.php
+++ b/IES-Bandung/app/User.php
@@ -12,7 +12,7 @@ class User extends Authenticatable
* @var array
*/
protected $fillable = [
- 'username', 'email', 'password', 'user_nik', 'full_name', 'birth_date', 'birth_place', 'tel_no', 'user_type'
+ 'username', 'email', 'password', 'user_nik', 'full_name', 'birth_date', 'birth_place', 'tel_no', 'type'
];
/**
diff --git a/IES-Bandung/database/migrations/2014_10_12_000000_create_users_table.php b/IES-Bandung/database/migrations/2014_10_12_000000_create_users_table.php
index c98ccff..e0f135e 100755
--- a/IES-Bandung/database/migrations/2014_10_12_000000_create_users_table.php
+++ b/IES-Bandung/database/migrations/2014_10_12_000000_create_users_table.php
@@ -22,7 +22,7 @@ class CreateUsersTable extends Migration
$table->date('birth_date');
$table->string('birth_place');
$table->string('tel_no');
- $table->string('user_type');
+ $table->string('type');
$table->string('ip_addr');
$table->rememberToken();
$table->timestamps();
diff --git a/IES-Bandung/database/migrations/2016_04_04_022610_gov_user.php b/IES-Bandung/database/migrations/2016_04_04_022610_gov_user.php
index 07faabe..59375b8 100644
--- a/IES-Bandung/database/migrations/2016_04_04_022610_gov_user.php
+++ b/IES-Bandung/database/migrations/2016_04_04_022610_gov_user.php
@@ -16,7 +16,7 @@ class GovUser extends Migration
//
$table->increments('govDBID');
$table->integer('userID')->unsigned();
- $table->bigInteger('gov_nip')->unsigned()->unique();
+ $table->bigInteger('nip')->unsigned()->unique();
$table->string('ip_addr');
$table->foreign('userID')->references('id')->on('users');
$table->timestamps();
diff --git a/IES-Bandung/database/migrations/2016_04_04_022611_vendor_user.php b/IES-Bandung/database/migrations/2016_04_04_022611_vendor_user.php
index 2768970..3dbc84d 100644
--- a/IES-Bandung/database/migrations/2016_04_04_022611_vendor_user.php
+++ b/IES-Bandung/database/migrations/2016_04_04_022611_vendor_user.php
@@ -16,7 +16,7 @@ class VendorUser extends Migration
//
$table->increments('vendorDBID');
$table->integer('userID')->unsigned();
- $table->mediumText('vending_place');
+ $table->mediumText('place');
$table->string('ip_addr');
$table->foreign('userID')->references('id')->on('users');
$table->timestamps();
diff --git a/IES-Bandung/database/migrations/2016_04_04_022613_object_type.php b/IES-Bandung/database/migrations/2016_04_04_022613_object_type.php
index 6a0e8c4..0889231 100644
--- a/IES-Bandung/database/migrations/2016_04_04_022613_object_type.php
+++ b/IES-Bandung/database/migrations/2016_04_04_022613_object_type.php
@@ -15,7 +15,7 @@ class ObjectType extends Migration
Schema::create('ObjectType', function (Blueprint $table) {
//
$table->increments('objectTypeID');
- $table->longText('object_type_name');
+ $table->longText('name');
$table->string('ip_addr');
$table->timestamps();
});
diff --git a/IES-Bandung/database/migrations/2016_04_04_022615_object_sell.php b/IES-Bandung/database/migrations/2016_04_04_022615_object_sell.php
index 98ed0a4..03db964 100644
--- a/IES-Bandung/database/migrations/2016_04_04_022615_object_sell.php
+++ b/IES-Bandung/database/migrations/2016_04_04_022615_object_sell.php
@@ -16,7 +16,7 @@ class ObjectSell extends Migration
//
$table->increments('objectSellID');
$table->integer('vendorDBID')->unsigned();
- $table->string('object_name');
+ $table->string('name');
$table->integer('objectTypeID')->unsigned();
$table->integer('price')->unsigned();
$table->string('ip_addr');
diff --git a/IES-Bandung/database/migrations/2016_04_05_144116_gov_user_log.php b/IES-Bandung/database/migrations/2016_04_05_144116_gov_user_log.php
index 789d2ba..a077ee8 100644
--- a/IES-Bandung/database/migrations/2016_04_05_144116_gov_user_log.php
+++ b/IES-Bandung/database/migrations/2016_04_05_144116_gov_user_log.php
@@ -16,7 +16,7 @@ class GovUserLog extends Migration
$table->increments('govUserLogDBID');
$table->integer('govDBID')->unsigned();
$table->integer('userID')->unsigned();
- $table->bigInteger('gov_nip')->unsigned()->nullable();
+ $table->bigInteger('nip')->unsigned()->nullable();
$table->string('action');
$table->string('ip_addr');
$table->timestamps();
diff --git a/IES-Bandung/database/migrations/2016_04_05_144129_vendor_user_log.php b/IES-Bandung/database/migrations/2016_04_05_144129_vendor_user_log.php
index c6baa73..e5e4ec4 100644
--- a/IES-Bandung/database/migrations/2016_04_05_144129_vendor_user_log.php
+++ b/IES-Bandung/database/migrations/2016_04_05_144129_vendor_user_log.php
@@ -16,8 +16,8 @@ class VendorUserLog extends Migration
$table->increments('vendorUserLogDBID');
$table->integer('vendorDBID')->unsigned();
$table->integer('userID')->unsigned();
- $table->mediumText('old_vending_place')->nullable();
- $table->mediumText('new_vending_place')->nullable();
+ $table->mediumText('old_place')->nullable();
+ $table->mediumText('new_place')->nullable();
$table->string('action');
$table->string('ip_addr');
$table->timestamps();
diff --git a/IES-Bandung/database/migrations/2016_04_05_145431_object_type_log.php b/IES-Bandung/database/migrations/2016_04_05_145431_object_type_log.php
index 6bfdb8a..af1d33c 100644
--- a/IES-Bandung/database/migrations/2016_04_05_145431_object_type_log.php
+++ b/IES-Bandung/database/migrations/2016_04_05_145431_object_type_log.php
@@ -15,7 +15,7 @@ class ObjectTypeLog extends Migration
Schema::create('ObjectTypeLog', function (Blueprint $table) {
$table->increments('objectTypeLogDBID');
$table->integer('objectTypeID')->unsigned();
- $table->longText('object_type_name');
+ $table->longText('name');
$table->string('action');
$table->string('ip_addr');
$table->timestamps();
diff --git a/IES-Bandung/database/migrations/2016_04_05_150010_object_sell_log.php b/IES-Bandung/database/migrations/2016_04_05_150010_object_sell_log.php
index 3aab142..e35328c 100644
--- a/IES-Bandung/database/migrations/2016_04_05_150010_object_sell_log.php
+++ b/IES-Bandung/database/migrations/2016_04_05_150010_object_sell_log.php
@@ -16,7 +16,7 @@ class ObjectSellLog extends Migration
$table->increments('objectSellLogDBID');
$table->integer('objectSellID')->unsigned();
$table->integer('vendorDBID')->unsigned();
- $table->string('object_name');
+ $table->string('name');
$table->integer('objectTypeID')->unsigned();
$table->integer('old_price')->unsigned()->nullable();
$table->integer('new_price')->unsigned()->nullable();
diff --git a/IES-Bandung/database/migrations/2016_04_06_020321_user_log.php b/IES-Bandung/database/migrations/2016_04_06_020321_user_log.php
index 6ec0e01..f441f70 100644
--- a/IES-Bandung/database/migrations/2016_04_06_020321_user_log.php
+++ b/IES-Bandung/database/migrations/2016_04_06_020321_user_log.php
@@ -25,7 +25,7 @@ class UserLog extends Migration
$table->string('birth_place');
$table->string('old_tel_no')->nullable();
$table->string('new_tel_no')->nullable();
- $table->string('user_type');
+ $table->string('type');
$table->string('action');
$table->string('ip_addr');
$table->timestamps();
diff --git a/IES-Bandung/database/migrations/2016_04_06_051454_user_log_after_insert_trigger.php b/IES-Bandung/database/migrations/2016_04_06_051454_user_log_after_insert_trigger.php
index ec05714..c8ca713 100644
--- a/IES-Bandung/database/migrations/2016_04_06_051454_user_log_after_insert_trigger.php
+++ b/IES-Bandung/database/migrations/2016_04_06_051454_user_log_after_insert_trigger.php
@@ -31,7 +31,7 @@ class UserLogAfterInsertTrigger extends Migration
birth_place = NEW.birth_place,
old_tel_no = NULL,
new_tel_no = NEW.tel_no,
- user_type = NEW.user_type,
+ type = NEW.type,
ip_addr = NEW.ip_addr,
updated_at = NEW.updated_at;
END
diff --git a/IES-Bandung/database/migrations/2016_04_06_054018_user_log_after_update_trigger.php b/IES-Bandung/database/migrations/2016_04_06_054018_user_log_after_update_trigger.php
index e64cc73..4e2750f 100644
--- a/IES-Bandung/database/migrations/2016_04_06_054018_user_log_after_update_trigger.php
+++ b/IES-Bandung/database/migrations/2016_04_06_054018_user_log_after_update_trigger.php
@@ -31,7 +31,7 @@ class UserLogAfterUpdateTrigger extends Migration
birth_place = NEW.birth_place,
old_tel_no = OLD.tel_no,
new_tel_no = NEW.tel_no,
- user_type = NEW.user_type,
+ type = NEW.type,
ip_addr = NEW.ip_addr,
updated_at = NEW.updated_at;
END
diff --git a/IES-Bandung/database/migrations/2016_04_06_061227_gov_user_log_after_insert_trigger.php b/IES-Bandung/database/migrations/2016_04_06_061227_gov_user_log_after_insert_trigger.php
index f8c6799..4084a55 100644
--- a/IES-Bandung/database/migrations/2016_04_06_061227_gov_user_log_after_insert_trigger.php
+++ b/IES-Bandung/database/migrations/2016_04_06_061227_gov_user_log_after_insert_trigger.php
@@ -22,7 +22,7 @@ class GovUserLogAfterInsertTrigger extends Migration
SET action = \'insert.a\',
govDBID = NEW.govDBID,
userID = NEW.userID,
- gov_nip = NEW.gov_nip,
+ nip = NEW.nip,
ip_addr = NEW.ip_addr,
updated_at = NEW.updated_at;
END
diff --git a/IES-Bandung/database/migrations/2016_04_06_061637_vendor_user_log_after_insert_trigger.php b/IES-Bandung/database/migrations/2016_04_06_061637_vendor_user_log_after_insert_trigger.php
index 279f830..db7e514 100644
--- a/IES-Bandung/database/migrations/2016_04_06_061637_vendor_user_log_after_insert_trigger.php
+++ b/IES-Bandung/database/migrations/2016_04_06_061637_vendor_user_log_after_insert_trigger.php
@@ -22,8 +22,8 @@ class VendorUserLogAfterInsertTrigger extends Migration
SET action = \'insert.a\',
vendorDBID = NEW.vendorDBID,
userID = NEW.userID,
- old_vending_place = NULL,
- new_vending_place = NEW.vending_place,
+ old_place = NULL,
+ new_place = NEW.place,
ip_addr = NEW.ip_addr,
updated_at = NEW.updated_at;
END
diff --git a/IES-Bandung/database/migrations/2016_04_06_061851_vendor_user_log_after_update_trigger.php b/IES-Bandung/database/migrations/2016_04_06_061851_vendor_user_log_after_update_trigger.php
index cc10568..9dd378b 100644
--- a/IES-Bandung/database/migrations/2016_04_06_061851_vendor_user_log_after_update_trigger.php
+++ b/IES-Bandung/database/migrations/2016_04_06_061851_vendor_user_log_after_update_trigger.php
@@ -22,8 +22,8 @@ class VendorUserLogAfterUpdateTrigger extends Migration
SET action = \'update.a\',
vendorDBID = NEW.vendorDBID,
userID = NEW.userID,
- old_vending_place = OLD.vending_place,
- new_vending_place = NEW.vending_place,
+ old_place = OLD.place,
+ new_place = NEW.place,
ip_addr = NEW.ip_addr,
updated_at = NEW.updated_at;
END
diff --git a/IES-Bandung/database/migrations/2016_04_06_062313_object_type_log_after_insert_trigger.php b/IES-Bandung/database/migrations/2016_04_06_062313_object_type_log_after_insert_trigger.php
index e8e328c..9165e0e 100644
--- a/IES-Bandung/database/migrations/2016_04_06_062313_object_type_log_after_insert_trigger.php
+++ b/IES-Bandung/database/migrations/2016_04_06_062313_object_type_log_after_insert_trigger.php
@@ -21,7 +21,7 @@ class ObjectTypeLogAfterInsertTrigger extends Migration
INSERT INTO `ObjectTypeLog`
SET action = \'insert.a\',
objectTypeID = NEW.objectTypeID,
- object_type_name = NEW.object_type_name,
+ name = NEW.name,
ip_addr = NEW.ip_addr,
updated_at = NEW.updated_at;
END
diff --git a/IES-Bandung/database/migrations/2016_04_06_062533_object_sell_log_after_insert_trigger.php b/IES-Bandung/database/migrations/2016_04_06_062533_object_sell_log_after_insert_trigger.php
index 34e2515..2713797 100644
--- a/IES-Bandung/database/migrations/2016_04_06_062533_object_sell_log_after_insert_trigger.php
+++ b/IES-Bandung/database/migrations/2016_04_06_062533_object_sell_log_after_insert_trigger.php
@@ -22,7 +22,7 @@ class ObjectSellLogAfterInsertTrigger extends Migration
SET action = \'insert.a\',
objectSellID = NEW.objectSellID,
vendorDBID = NEW.vendorDBID,
- object_name = NEW.object_name,
+ name = NEW.name,
objectTypeID = NEW.objectTypeID,
old_price = NULL,
new_price = NEW.price,
diff --git a/IES-Bandung/database/migrations/2016_04_06_063143_object_sell_log_after_update_trigger.php b/IES-Bandung/database/migrations/2016_04_06_063143_object_sell_log_after_update_trigger.php
index ff1885f..0291e42 100644
--- a/IES-Bandung/database/migrations/2016_04_06_063143_object_sell_log_after_update_trigger.php
+++ b/IES-Bandung/database/migrations/2016_04_06_063143_object_sell_log_after_update_trigger.php
@@ -22,7 +22,7 @@ class ObjectSellLogAfterUpdateTrigger extends Migration
SET action = \'update.a\',
objectSellID = NEW.objectSellID,
vendorDBID = NEW.vendorDBID,
- object_name = NEW.object_name,
+ name = NEW.name,
objectTypeID = NEW.objectTypeID,
old_price = OLD.price,
new_price = NEW.price,
diff --git a/IES-Bandung/resources/views/auth/register.blade.php b/IES-Bandung/resources/views/auth/register.blade.php
index 9845454..cd814fd 100755
--- a/IES-Bandung/resources/views/auth/register.blade.php
+++ b/IES-Bandung/resources/views/auth/register.blade.php
@@ -58,12 +58,12 @@
<label class="col-sm-4" style="margin-top: 8px; margin-left: -10px;">User Type</label>
<div class="col-sm-8" style="margin: 8px 0px 0px 0px; padding: 0px;">
<label class="i-switch bg-primary m-t-xs m-r" style="margin: 0px 5px 0px 0px;" >
- <input type="radio" id="radio-button-public" class="radio-button-user-type" name="user_type" value="public" checked />
+ <input type="radio" id="radio-button-public" class="radio-button-user-type" name="type" value="public" checked />
<i style="margin-left: -35px; margin-right: 0px;"></i>
</label>
<label style="margin: 0px 20px 0px 0px;">Public</label>
<label class="i-switch bg-warning m-t-xs m-r" style="margin: 0px 5px 0px 0px;" >
- <input type="radio" id="radio-button-vendor" class="radio-button-user-type" value="vendor" name="user_type" />
+ <input type="radio" id="radio-button-vendor" class="radio-button-user-type" value="vendor" name="type" />
<i style="margin-left: -35px; margin-right: 0px;"></i>
</label>
<label style="margin: 0px;">Vendor</label>
@@ -127,10 +127,10 @@
<div class="form-group vendor">
- <input type="text" placeholder="Tempat Jualan" class="form-control vendorRequired" name="vending_place" value="{{ old('vending_place') }}">
- @if ($errors->has('vending_place'))
+ <input type="text" placeholder="Tempat Jualan" class="form-control vendorRequired" name="place" value="{{ old('place') }}">
+ @if ($errors->has('place'))
<span class="help-block">
- <strong>{{ $errors->first('vending_place') }}</strong>
+ <strong>{{ $errors->first('place') }}</strong>
</span>
@endif
</div>
@@ -173,7 +173,7 @@
$("#app-background").css("background-color", "#150815");
$(".radio-button-user-type").change(function(){
- if($('input[name="user_type"]:checked').val() === "vendor") {
+ if($('input[name="type"]:checked').val() === "vendor") {
$(".vendor").show();
$(".vendorRequired").attr('required', true);
$("#app-background").css("background-color", "#221105");
diff --git a/IES-Bandung/resources/views/vendorUser.blade.php b/IES-Bandung/resources/views/vendorUser.blade.php
index 1c4050a..c2e518f 100755
--- a/IES-Bandung/resources/views/vendorUser.blade.php
+++ b/IES-Bandung/resources/views/vendorUser.blade.php
@@ -103,16 +103,16 @@
<tr>
<td>{{ $object->objectSellID }}</td>
<td>
- <input type="text" value="{{ $object->object_name }}" class="fedit-barang toggle-display"></input>
- <p class="tedit-barang toggle-display displayit">{{ $object->object_name }}</p>
+ <input type="text" value="{{ $object->name }}" class="fedit-barang toggle-display"></input>
+ <p class="tedit-barang toggle-display displayit">{{ $object->name }}</p>
</td>
<td>
<input type="text" value="Rp{{ $object->price }}/kg" class="fedit-barang toggle-display"></input>
<p class="tedit-barang toggle-display displayit">Rp{{ $object->price }}/kg</p>
</td>
<td>
- <input type="text" value="{{ $object->object_type_name }}" class="suggest fedit-barang toggle-display"></input>
- <p class="tedit-barang toggle-display displayit">{{ $object->object_type_name }}</p>
+ <input type="text" value="{{ $object->name }}" class="suggest fedit-barang toggle-display"></input>
+ <p class="tedit-barang toggle-display displayit">{{ $object->name }}</p>
</td>
<td>{{ $object->updated_at }}</td>
</tr>
@@ -137,11 +137,11 @@
{{ csrf_field() }}
<div class="form-group">
<label>Nama Barang</label>
- <input type="text" name="object_name" class="form-control" placeholder="Masukan Nama Barang">
+ <input type="text" name="name" class="form-control" placeholder="Masukan Nama Barang">
</div>
<div class="form-group">
<label>Jenis</label>
- <input id="suggest" type="text" name="object_type_name" class="suggest form-control" placeholder="Masukkan Jenis Barang">
+ <input id="suggest" type="text" name="name" class="suggest form-control" placeholder="Masukkan Jenis Barang">
<p class="fz-tsize-small">This form support suggestion</p>
</div>
<div class="form-group">
diff --git a/database-sql/db_ies_bandung_core.sql b/database-sql/db_ies_bandung_core.sql
index 0cd6f10..160c86e 100755
--- a/database-sql/db_ies_bandung_core.sql
+++ b/database-sql/db_ies_bandung_core.sql
@@ -23,7 +23,7 @@ CREATE TABLE `User` (
CREATE TABLE `GovUser` (
`govDBID` INTEGER(10) NOT NULL AUTO_INCREMENT,
`userID` INTEGER(10) NOT NULL,
- `gov_nip` INTEGER(20) NOT NULL,
+ `nip` INTEGER(20) NOT NULL,
PRIMARY KEY (`govDBID`),
FOREIGN KEY (`userID`) REFERENCES `User`(`userID`)
);
@@ -33,7 +33,7 @@ CREATE TABLE `VendorUser` (
`vendorDBID` INTEGER(10) NOT NULL AUTO_INCREMENT,
`userID` INTEGER(10) NOT NULL,
`idObjekDagangan` INTEGER(10) NOT NULL,
- `vending_place` VARCHAR(255),
+ `place` VARCHAR(255),
PRIMARY KEY (`vendorDBID`),
FOREIGN KEY (`userID`) REFERENCES `User`(`userID`)
);
@@ -50,7 +50,7 @@ CREATE TABLE `PublicUser` (
CREATE TABLE `ObjectSell` (
`objectSellID` INTEGER(10) NOT NULL AUTO_INCREMENT,
`vendorDBID` INTEGER(10) NOT NULL,
- `object_name` VARCHAR(255) NOT NULL,
+ `name` VARCHAR(255) NOT NULL,
`price` INTEGER(255),
PRIMARY KEY (`objectSellID`),
FOREIGN KEY (`vendorDBID`) REFERENCES `VendorUser`(`vendorDBID`)
--
GitLab