diff --git a/IES-Bandung/app/Http/Controllers/ObjectSellController.php b/IES-Bandung/app/Http/Controllers/ObjectSellController.php
index f45b98d4034305044453dd2f21edb52abc95fa5f..628fab6f72348bd14f4f876eaa58b14ddecfda0e 100644
--- a/IES-Bandung/app/Http/Controllers/ObjectSellController.php
+++ b/IES-Bandung/app/Http/Controllers/ObjectSellController.php
@@ -15,7 +15,7 @@ class ObjectSellController extends Controller
{
public static $rules = [
'name' => 'required',
- 'objectTypeName' => 'required',
+ 'type' => 'required',
'price' => 'required|numeric'
];
@@ -24,10 +24,9 @@ class ObjectSellController extends Controller
if ($v->fails())
return redirect()->back()->withErrors($v->errors());
- $objectType = ObjectType::getOrCreate($request->name);
+ $objectType = ObjectType::getOrCreate($request->type);
$userId = Auth::user()['id'];
- $vendorUserModel = new VendorUser;
- $vendorUserId = $vendorUserModel->getFullProfile($userId)['vendor_user_id'];
+ $vendorUserId = VendorUser::getFullProfile($userId)['id'];
$item = new ObjectSell;
$item->vendor_user_id = $vendorUserId;
diff --git a/IES-Bandung/app/Http/Controllers/VendorUserController.php b/IES-Bandung/app/Http/Controllers/VendorUserController.php
index fced3066de920779ad78b2aa91e961d3a8e3a539..e3295fcbe1ae653ac759bef463c515a6ad5ee869 100644
--- a/IES-Bandung/app/Http/Controllers/VendorUserController.php
+++ b/IES-Bandung/app/Http/Controllers/VendorUserController.php
@@ -18,8 +18,8 @@ class VendorUserController extends Controller
$user = VendorUser::getFullProfile($userId);
$objects = ObjectSell::
join('object_types', 'object_sells.object_type_id', '=', 'object_types.id')->
- where('vendor_user_id', '=', $user->vendor_user_id)->
- select('object_sells.*', 'object_types.name')
+ where('vendor_user_id', '=', $user->id)->
+ select('object_sells.*', 'object_types.name as type')
->get();
return view('vendorUser', [
diff --git a/IES-Bandung/app/Model/ObjectType.php b/IES-Bandung/app/Model/ObjectType.php
index 82088160681da675f60e5819f87bfd29ac9bf8f6..6ce46991229052b3146e70415071c6e416b8acf7 100644
--- a/IES-Bandung/app/Model/ObjectType.php
+++ b/IES-Bandung/app/Model/ObjectType.php
@@ -15,12 +15,11 @@ class ObjectType extends Model
}
public static function getOrCreate($name) {
- $objectType = ObjectType::where('objectTypeName', $name)->first();
+ $objectType = ObjectType::where('name', $name)->first();
if (is_null($objectType)) {
$objectType = new ObjectType;
- $objectType->objectTypeName = $request->objectTypeName;
+ $objectType->name = $name;
$objectType->save();
- $objectType->objectTypeID = $objectType->id;
}
return $objectType;
}
diff --git a/IES-Bandung/resources/views/vendorUser.blade.php b/IES-Bandung/resources/views/vendorUser.blade.php
index 9ce83ca9ad06f0bd1a6503d55c76bb19b0fe65a7..9ada91fd8b37515c90077cfd87a06d3d7cbad088 100755
--- a/IES-Bandung/resources/views/vendorUser.blade.php
+++ b/IES-Bandung/resources/views/vendorUser.blade.php
@@ -2,167 +2,167 @@
@section('content')
<div class="app app-header-fixed ">
- @include('layouts.header')
- @include('layouts.aside')
+ @include('layouts.header')
+ @include('layouts.aside')
- <!-- content -->
- <div id="content" class="app-content" role="main">
- <div class="hbox hbox-auto-xs hbox-auto-sm ng-scope">
- <div class="col">
- <div class="app-content-body ">
+ <!-- content -->
+ <div id="content" class="app-content" role="main">
+ <div class="hbox hbox-auto-xs hbox-auto-sm ng-scope">
+ <div class="col">
+ <div class="app-content-body ">
- <div class="bg-light lter">
- <ul class="breadcrumb bg-grey-breadcrumb m-b-none">
- <li><a href="#" class="btn no-shadow" ui-toggle-class="app-aside-folded" target=".app">
- <i class="icon-bdg_expand1 text"></i>
- <i class="icon-bdg_expand2 text-active"></i>
- </a></li>
- <li><a href>Home</a></li>
- <li><i class="fa fa-angle-right"></i><a href="#">Pages</a></li>
- <li class="active"><i class="fa fa-angle-right"></i>Profile</li>
- </ul>
+ <div class="bg-light lter">
+ <ul class="breadcrumb bg-grey-breadcrumb m-b-none">
+ <li><a href="#" class="btn no-shadow" ui-toggle-class="app-aside-folded" target=".app">
+ <i class="icon-bdg_expand1 text"></i>
+ <i class="icon-bdg_expand2 text-active"></i>
+ </a></li>
+ <li><a href>Home</a></li>
+ <li><i class="fa fa-angle-right"></i><a href="#">Pages</a></li>
+ <li class="active"><i class="fa fa-angle-right"></i>Profile</li>
+ </ul>
+ </div>
+ <div style="background:url({{ asset('img/bg-profile.jpg') }}) center center; background-size:cover">
+ <div class="no-padder bg-dark-ov-80">
+ <div class="row wrapper-xl">
+ <div class="col-sm-12 m-t-lg">
+ <a href class="thumb-md pull-left m-r avatar ">
+ <img src=" {{ asset('img/profile.jpg') }}" class="img-circle b-3x b-white">
+ </a>
+ <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="#">{{ $user->email }}</a></small>
</div>
- <div style="background:url({{ asset('img/bg-profile.jpg') }}) center center; background-size:cover">
- <div class="no-padder bg-dark-ov-80">
- <div class="row wrapper-xl">
- <div class="col-sm-12 m-t-lg">
- <a href class="thumb-md pull-left m-r avatar ">
- <img src=" {{ asset('img/profile.jpg') }}" class="img-circle b-3x b-white">
- </a>
- <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="#">{{ $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> {{ $user->place }}</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>
- <a href class="m-r-sm text-white btn-icon"><i class="text16 fa fa-facebook-square"></i></a>
- <a href class="m-r-sm text-white btn-icon"><i class="text16 fa fa-instagram"></i></a>
- </p>
- </div>
- </div>
- </div>
-
- <div class="row padder-lg m-l-none m-r-none bg-dark-ov-30 text-white">
- <div class="col-sm-12">
- <div class="pull-left pull-none-xs text-center profile-stats">
- <a href class="inline padder-v padder-md">
- <span class="h3 block font-bold m-b-xs">1k</span>
- <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">{{ count($objects) }}</span>
- <small class="text-10 text-grey">Barang Dagangan</small>
- </a>
- <a href class="inline padder-v padder-md">
- <span class="h3 block font-bold m-b-xs">155</span>
- <small class="text-10 text-grey">Rekomendasi</small>
- </a>
- </div>
-
- <div class="pull-right text-right">
- <button class="btn btn-sm inline m-t-lg m-r-sm btn-default"><i class="m-r-xs fa fa-envelope"></i>Message</button>
- <button class="btn btn-sm inline m-t-lg btn-warning "><i class="m-r-xs fa fa-star"></i>Rekomendasikan</button>
- </div>
- </div>
- </div>
- </div>
+ <div class="">
+ <span class="text12 m-b-md text-grey"><i class="text-white fa fa-map-marker text14 m-r-xs"></i> {{ $user->place }}</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>
+ <a href class="m-r-sm text-white btn-icon"><i class="text16 fa fa-facebook-square"></i></a>
+ <a href class="m-r-sm text-white btn-icon"><i class="text16 fa fa-instagram"></i></a>
+ </p>
+ </div>
+ </div>
+ </div>
- <div class="wrapper-lg m-t ">
- <div class="row">
- <div class="col-md-12">
- <div class="panel panel-default">
- <form method="POST" action="/item/update">
- {{ csrf_field() }}
- <div class="panel-heading font-semibold">
- <div class="row">
- <h5 class="col-sm-9">
- Barang Dagangan
- </h5>
- <div class="fz-right">
- <button id="editDagangBtn" class="btn m-b-sm m-r-sm btn-default btn-sm" onclick="return false;">Edit</button>
- </div>
- </div>
- </div>
- <div>
- <table class="table">
- <thead>
- <tr>
- <th>Nama Barang</th>
- <th>Harga</th>
- <th data-breakpoints="xs sm">Jenis</th>
- <th data-breakpoints="xs">Update</th>
- </tr>
- </thead>
- <tbody>
- @foreach ($objects as $object)
- <tr>
- <td>
- <input type="text" value="{{ $object->name }}" class="fedit-barang toggle-display" name="name[{{ $object->id }}]"></input>
- <p class="tedit-barang toggle-display displayit">{{ $object->name }}</p>
- </td>
- <td>
- <input type="text" value="{{ $object->price }}" class="fedit-barang toggle-display" name="price[{{ $object->id }}]"></input>
- <p class="tedit-barang toggle-display displayit">{{ $object->price }}</p>
- </td>
- <td>
- <input type="text" value="{{ $object->objectTypeName }}" class="suggest fedit-barang toggle-display" name="objectTypeName[{{ $object->id }}]"></input>
- <p class="tedit-barang toggle-display displayit">{{ $object->objectTypeName }}</p>
- </td>
- <td>{{ $object->updated_at }}</td>
- </tr>
- @endforeach
- </tbody>
- </table>
- </div>
- </form>
- </div>
- </div>
-
- @if ($editable)
- <div class="col-sm-12">
- <button id="btn-toggle1" class="btn m-b-sm m-r-sm btn-default btn-addon"><i class="fa fa-plus"></i>Tambah Dagangan</button>
- </div>
+ <div class="row padder-lg m-l-none m-r-none bg-dark-ov-30 text-white">
+ <div class="col-sm-12">
+ <div class="pull-left pull-none-xs text-center profile-stats">
+ <a href class="inline padder-v padder-md">
+ <span class="h3 block font-bold m-b-xs">1k</span>
+ <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">{{ count($objects) }}</span>
+ <small class="text-10 text-grey">Barang Dagangan</small>
+ </a>
+ <a href class="inline padder-v padder-md">
+ <span class="h3 block font-bold m-b-xs">155</span>
+ <small class="text-10 text-grey">Rekomendasi</small>
+ </a>
+ </div>
- <div id="win-toggle1" class="col-sm-6 toggle-display">
- <div class="panel panel-default">
- <div class="panel-heading font-bold">Tambah Dagangan</div>
- <div class="panel-body">
- <form role="form" method="POST" action="/item/add">
- {{ csrf_field() }}
- <div class="form-group">
- <label>Nama Barang</label>
- <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="name" class="suggest form-control" placeholder="Masukkan Jenis Barang">
- <p class="fz-tsize-small">This form support suggestion</p>
- </div>
- <div class="form-group">
- <label>Harga</label>
- <input type="text" name="price" class="form-control form-currency" placeholder="Harga Barang">
- </div>
- <button type="submit" class="btn btn-sm btn-success">Tambahkan</button>
- </form>
- </div>
- </div>
- </div>
- @endif
+ <div class="pull-right text-right">
+ <button class="btn btn-sm inline m-t-lg m-r-sm btn-default"><i class="m-r-xs fa fa-envelope"></i>Message</button>
+ <button class="btn btn-sm inline m-t-lg btn-warning "><i class="m-r-xs fa fa-star"></i>Rekomendasikan</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
- </div>
+ <div class="wrapper-lg m-t ">
+ <div class="row">
+ <div class="col-md-12">
+ <div class="panel panel-default">
+ <form method="POST" action="/item/update">
+ {{ csrf_field() }}
+ <div class="panel-heading font-semibold">
+ <div class="row">
+ <h5 class="col-sm-9">
+ Barang Dagangan
+ </h5>
+ <div class="fz-right">
+ <button id="editDagangBtn" class="btn m-b-sm m-r-sm btn-default btn-sm" onclick="return false;">Edit</button>
+ </div>
</div>
+ </div>
+ <div>
+ <table class="table">
+ <thead>
+ <tr>
+ <th>Nama Barang</th>
+ <th>Harga</th>
+ <th data-breakpoints="xs sm">Jenis</th>
+ <th data-breakpoints="xs">Update</th>
+ </tr>
+ </thead>
+ <tbody>
+ @foreach ($objects as $object)
+ <tr>
+ <td>
+ <input type="text" value="{{ $object->name }}" class="fedit-barang toggle-display" name="name[{{ $object->id }}]"></input>
+ <p class="tedit-barang toggle-display displayit">{{ $object->name }}</p>
+ </td>
+ <td>
+ <input type="text" value="{{ $object->price }}" class="fedit-barang toggle-display" name="price[{{ $object->id }}]"></input>
+ <p class="tedit-barang toggle-display displayit">{{ $object->price }}</p>
+ </td>
+ <td>
+ <input type="text" value="{{ $object->type }}" class="suggest fedit-barang toggle-display" name="type[{{ $object->id }}]"></input>
+ <p class="tedit-barang toggle-display displayit">{{ $object->type }}</p>
+ </td>
+ <td>{{ $object->updated_at }}</td>
+ </tr>
+ @endforeach
+ </tbody>
+ </table>
+ </div>
+ </form>
</div>
- <!-- App Content body -->
+ </div>
+
+ @if ($editable)
+ <div class="col-sm-12">
+ <button id="btn-toggle1" class="btn m-b-sm m-r-sm btn-default btn-addon"><i class="fa fa-plus"></i>Tambah Dagangan</button>
+ </div>
+
+ <div id="win-toggle1" class="col-sm-6 toggle-display">
+ <div class="panel panel-default">
+ <div class="panel-heading font-bold">Tambah Dagangan</div>
+ <div class="panel-body">
+ <form role="form" method="POST" action="/item/add">
+ {{ csrf_field() }}
+ <div class="form-group">
+ <label>Nama Barang</label>
+ <input type="text" name="name" class="form-control" placeholder="Masukan Nama Barang" required>
+ </div>
+ <div class="form-group">
+ <label>Jenis</label>
+ <input id="suggest" type="text" name="type" class="suggest form-control" placeholder="Masukkan Jenis Barang" required>
+ <p class="fz-tsize-small">This form support suggestion</p>
+ </div>
+ <div class="form-group">
+ <label>Harga</label>
+ <input type="text" name="price" class="form-control form-currency" placeholder="Harga Barang" required>
+ </div>
+ <button type="submit" class="btn btn-sm btn-success">Tambahkan</button>
+ </form>
+ </div>
+ </div>
+ </div>
+ @endif
+
</div>
- <!-- col -->
+ </div>
</div>
+ <!-- App Content body -->
+ </div>
+ <!-- col -->
</div>
+ </div>
- @include('layouts.footer')
+ @include('layouts.footer')
</div>
@endsection