Skip to content

S
ServerLivePA2D4TI07
Commit 5aa72300 by rizky
Options

Merge branch 'master' of https://gitlab.del.ac.id/rizky/ServerLivePA2D4TI07

parents f237a8ad 8be07886
Showing with 131 additions and 66 deletions
app/Http/Controllers/RegistrationController.php
......@@ -19,8 +19,8 @@ class RegistrationController extends Controller
$this->validate($request, [
'first_name' => 'required|max:255',
'last_name' => 'required|max:255',
'email' => 'required|unique:users',
'password' => 'confirmed|required|min:6',
'password_confirmation' => 'confirmed|required|same:password'
]);
$user = Sentinel::registerAndActivate($request->all());
......
app/Http/Controllers/TicketController.php
......@@ -25,15 +25,26 @@ class TicketController extends Controller
{
$orders = Order::find($id);
// $this -> validate($request, [
// 'images' => 'mime: jpg, jpeg, png | max:2024',
// ]);
if ($request->file('images') == "")
{
$orders->images = $orders->images;
return redirect('data_order')->with('alert-success', 'Resi pembayaran belum diupload');
}
else{
$file = $request->file('images');
$fileName = $file->getClientOriginalName();
$request->file('images')->move("image/", $fileName);
$orders->images = $fileName;
$orders->update();
return redirect('data_order')->with('alert-success', 'Resi pembayaran berhasil diunggah. Silahkan menunggu konfirmasi pembayaran anda');
}
}
public function destroy($id)
{
$tickets = Ticket::findOrFail($id);
......@@ -57,10 +68,11 @@ class TicketController extends Controller
public function storeorder(Request $request)
{
$orders = new Order();
$orders->id_ticket = $request->id_ticket;
$orders->user_id = $request->user_id;
$orders->first_name = $request->first_name;
$orders->nama = $request->nama;
$orders->nama = $request->nama_ticket;
$orders->tanggal_kunjung = $request->tanggal_kunjung;
$orders->jumlah = $request->jumlah;
$jumlah = $request->jumlah;
$harga = $request->harga;
......@@ -68,7 +80,7 @@ class TicketController extends Controller
$orders->harga = $total;
$orders->save();
return redirect()->route('ticket.index')->with('alert-success', 'Ticket Success Ordered.
Please pay by transfer bank to 1234567890 (ABC Bank).
Please pay by transfer bank to 111-111-111 (ABC Bank).
Then, upload it in Data Pemesanan ');
}
......@@ -88,6 +100,7 @@ class TicketController extends Controller
$trans->user_id = $input->user_id;
$trans->first_name = $input->first_name;
$trans->nama = $input->nama;
$trans->tanggal_kunjung = $input->tanggal_kunjung;
$trans->jumlah = $input->jumlah;
$trans->harga = $input->harga;
$trans->status = $input->status;
......
resources/views/authentication/login.blade.php
......@@ -48,7 +48,7 @@
<div>
<a href="{{url('/')}}"><h1><i class="fa fa-paw"></i> TB Silalahi Center</h1></a>
<p>Copyright © 2017 - All Rights Reserved. Privacy and Terms</p>
<p>Copyright © 2017 TB Silalahi Center. All Rights Reserved.</p>
</div>
</div>
</form>
......
resources/views/authentication/register.blade.php
......@@ -54,7 +54,7 @@
<div>
<a href="{{url('/')}}"><h1><i class="fa fa-paw"></i> TB Silalahi Center</h1></a>
<p>Copyright © 2017 - All Rights Reserved. Privacy and Terms</p>
<p>Copyright © 2017 TB Silalahi Center. All Rights Reserved.</p>
</div>
</div>
</form>
......
resources/views/customers/ticket/beli/index.blade.php
......@@ -12,10 +12,10 @@
<div class="clearfix"></div>
<div class="row">
<div class="col-md-12 col-sm-12 col-xs-12">
<div class="col-md-6 col-sm-12 col-xs-12">
<div class="x_panel">
<div class="x_title">
<h2>Jumlah Pesanan</h2>
<h2>Jumlah Pesanan tiket tersedia <b>"{{$tickets->name}}"</b></h2>
<div class="clearfix"></div>
</div>
<div class="x_content">
......@@ -27,12 +27,12 @@
<input type="text" value="{{Sentinel::getUser()->id}}" class="form-control" name="user_id" readonly>
<label class="col-md-4 control-label">Name</label>
<input type="text" value="{{Sentinel::getUser()->first_name}}" class="form-control" name="first_name" readonly>
<label class="col-md-4 control-label">ID Ticket</label>
<input type="text" value="{{$tickets->id}}" class="form-control" name="id_ticket" readonly>
<label class="col-md-4 control-label">Nama Ticket</label>
<input type="text" value="{{$tickets->name}}" class="form-control" name="nama" readonly>
<label class="col-md-4 control-label">Harga (IDR)</label>
<label class="col-md-4 control-label">Ticket</label>
<input type="text" value="{{$tickets->name}}" class="form-control" name="nama_ticket" readonly>
<label class="col-md-4 control-label">Harga / ticket (IDR)</label>
<input type="number" value="{{$tickets->price}}" class="form-control" name="harga" readonly>
<label class="col-md-4 control-label">Tanggal berkunjung</label>
<input type="date" class="form-control" name="tanggal_kunjung">
<label class="col-md-4 control-label">Jumlah</label>
<input type="number" onkeyup="Harga(this.value)" min="1" class="form-control" name="jumlah" placeholder="masukkan jumlah tiket yang ingin dipesan" required>
<label class="col-md-4 control-label">Total Harga (IDR)</label><br>
......@@ -48,6 +48,21 @@
</div>
</div>
</div>
<div class="col-md-6 col-sm-12 col-xs-12">
<div class="x_panel">
<div class="x_title">
<h2>Keterangan</h2>
<div class="clearfix"></div>
</div>
<div class="x_content">
<h2> Tiket yang tersedia saat ini adalah Tiket Umum</h2>
<h2>Dengan harga IDR10000 untuk satu tiket.</h2>
<h2>Satu tiket berlaku untuk 1 orang.</h2>
<h2>Dengan 1 tiket, Anda dapat menikmati fasilitas Museum TB Silalahi Center dalam 1 hari</h2>
</div>
</div>
</div>
</div>
</div>
</div>
......
resources/views/customers/ticket/data_konfirmasi.blade.php
......@@ -36,7 +36,8 @@
<th>Jumlah</th>
<th>Total Harga</th>
<th>Status dan Waktu Konfirmasi</th>
<th>Tiket download</th>
<td>Tanggal Berkunjung</td>
<th>Image</th>
<th>Keterangan</th>
</tr>
</thead>
......@@ -50,7 +51,8 @@
<td>{{$trans->first_name}}</td>
<td>{{$trans->jumlah}}</td>
<td>{{$trans->harga}}</td>
<td><button type="button" class="btn btn-success">Dikonfirmasi</button> <br>{{$trans->created_at}}</td>
<td><p style="color: #00A000">Dikonfirmasi</p> <br>{{$trans->created_at}}</td>
<td>{{$trans->tanggal_kunjung}}</td>
<td><img src="{{ asset('image/ticket/ticket.png') }}" style="height: 150px; width: 200px; "> </td>
<td>Tiket berlaku paling lama 2 hari sejak dikonfirmasinya pemesanan tiket</td>
</tr>
......
resources/views/customers/ticket/data_order.blade.php
......@@ -15,6 +15,36 @@
<div class="col-md-12 col-sm-12 col-xs-12">
<div class="x_panel">
<div class="x_title">
<h2>Hint</h2>
<div class="clearfix"></div>
</div>
<div class="x_content">
<h2>
<ul>
<li>
Pesan tiket terlebih dahulu. Pembayaran tiket dilakukan melalui via transfer bank ke nomor Rekening 111-111-111 (Bank ABC)
atas nama Museum TB Silalahi Center.
</li>
<li>
Foto atau screenshot bukti pembayaran.
</li>
<li>
Upload bukti pembayaran melalui tombol upload yang tersedia untuk dikonfirmasi.
</li>
<li>
Tombol Cancel untuk membatalkan pemesanan.
</li>
</ul>
</h2>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12 col-sm-12 col-xs-12">
<div class="x_panel">
<div class="x_title">
<h1>Data Pemesanan tiket <small>Upload resi pembayaran</small></h1>
<div class="clearfix"></div>
......@@ -29,12 +59,13 @@
<thead>
<tr>
<th>#</th>
<th>Jenis Tiket</th>
<th>Ticket</th>
<th>Tanggal berkunjung</th>
<th>Jumlah</th>
<th>Harga</th>
<th>Resi Pembayaran</th>
<th>Status</th>
<th>Action</th>
<th>Status</th>
</tr>
</thead>
<tbody>
......@@ -43,15 +74,16 @@
<tr>
<td>{{$no++}}</td>
<td>{{$order->nama}}</td>
<td>{{$order->tanggal_kunjung}}</td>
<td>{{$order->jumlah}}</td>
<td>Rp {{$order->harga}},-</td>
<td><img src="{{ asset('image/'. $order->images) }}" style="height: 150px; width: 200px; "> </td>
<td><button class="btn btn-danger">Belum Dikonfirmasi</button> </td>
<td>
<a href="{{url('data_order/upload', $order->id)}}" class="btn btn-primary">Upload Resi Pembayaran</a>
<a href="{{url('/data_order/destroy',$order->id)}}" class="btn btn-danger"
onclick="return confirm('Are you sure to cancel order??')">Cancel</a>
</td>
<td><p style="font-size: 12pt; color: red"><b>Belum Dikonfirmasi</b></p></td>
</tr>
@endforeach
</tbody>
......
resources/views/customers/ticket/upload.blade.php
......@@ -14,14 +14,7 @@
<div class="col-md-12 col-sm-12 col-xs-12">
<div class="x_panel">
<div class="x_title">
<h2>Hover rows <small>Try hovering over the rows</small></h2>
<ul class="nav navbar-right panel_toolbox">
<li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-wrench"></i></a>
</li>
</ul>
<h2>Upload Resi Pembayaran</h2>
<div class="clearfix"></div>
</div>
<div class="x_content">
......@@ -29,7 +22,7 @@
<input name="_method" type="hidden" value="PUT">
{{csrf_field()}}
<label>Jenis Tiket</label>
<label>Tiket</label>
<div class="form-group{{ $errors->has('nama') ? ' has-error' : '' }}">
<input type="text" name="nama" class="form-control" value="{{$orders->nama}}" readonly>
{!! $errors->first('nama', '<p class="help-block">:message</p>') !!}
......@@ -43,7 +36,7 @@
<label>Total Harga</label>
<div class="form-group{{ $errors->has('harga') ? ' has-error' : '' }}">
<input type="text" name="harga" class="form-control" value="{{$orders->harga}}" readonly>
<input type="text" name="harga" class="form-control" value="IDR{{$orders->harga}},-" readonly>
{!! $errors->first('harga', '<p class="help-block">:message</p>') !!}
</div>
......
resources/views/index.blade.php
......@@ -344,7 +344,7 @@
<aside class="bg-dark">
<div class="container text-center">
<p>Copyright 2017 Museum TB Silalahi Center</p>
<p>Copyright © 2017 TB Silalahi Center. All Rights Reserved.</p>
</div>
</aside>
......@@ -358,8 +358,7 @@
<!-- Plugin JavaScript -->
<script src="{{asset('https://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.3/jquery.easing.min.js')}}"></script>
<script src="{{asset('vendor/scrollreveal/scrollreveal.min.js')}}"></script>
<script src="{{asset
('vendor/magnific-popup/jquery.magnific-popup.min.js')}}"></script>
<script src="{{asset('vendor/magnific-popup/jquery.magnific-popup.min.js')}}"></script>
<!-- Theme JavaScript -->
<script src="{{asset('js/creative.min.js')}}"></script>
......
resources/views/layouts/master-customer.blade.php
......@@ -45,7 +45,7 @@
<!-- menu profile quick info -->
<div class="profile clearfix">
<div class="profile_pic">
<img src="images/user.png" alt="..." class="img-circle profile_img">
<img src="{{asset('images/user.png')}}" alt="..." class="img-circle profile_img">
</div>
<div class="profile_info">
<span>Welcome,</span>
......@@ -113,7 +113,7 @@
<ul class="nav navbar-nav navbar-right">
<li class="">
<a href="javascript:;" class="user-profile dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
<img src="images/user.png" alt="">{{Sentinel::getUser()->first_name}}
<img src="{{asset('images/user.png')}}" alt="">{{Sentinel::getUser()->first_name}}
<span class=" fa fa-angle-down"></span>
</a>
<ul class="dropdown-menu dropdown-usermenu pull-right">
......@@ -139,7 +139,7 @@
<!-- footer content -->
<footer>
<div class="pull-right">
Copyright © 2017 - TB Silalahi Center
<p>Copyright © 2017 TB Silalahi Center. All Rights Reserved.</p>
</div>
<div class="clearfix"></div>
</footer>
......
resources/views/layouts/master-manager.blade.php
......@@ -45,7 +45,7 @@
<!-- menu profile quick info -->
<div class="profile clearfix">
<div class="profile_pic">
<img src="images/user.png" alt="..." class="img-circle profile_img">
<img src="{{asset('images/user.png')}}" alt="..." class="img-circle profile_img">
</div>
<div class="profile_info">
<span>Welcome,</span>
......@@ -112,7 +112,7 @@
<ul class="nav navbar-nav navbar-right">
<li class="">
<a href="javascript:;" class="user-profile dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
<img src="images/user.png" alt="">{{Sentinel::getUser()->first_name}}
<img src="{{asset('images/user.png')}}" alt="">{{Sentinel::getUser()->first_name}}
<span class=" fa fa-angle-down"></span>
</a>
<ul class="dropdown-menu dropdown-usermenu pull-right">
......@@ -136,7 +136,7 @@
<!-- footer content -->
<footer>
<div class="pull-right">
Copyright © 2017 - TB Silalahi Center
<p>Copyright © 2017 TB Silalahi Center. All Rights Reserved.</p>
</div>
<div class="clearfix"></div>
</footer>
......
resources/views/layouts/master-staff.blade.php
......@@ -45,7 +45,7 @@
<!-- menu profile quick info -->
<div class="profile clearfix">
<div class="profile_pic">
<img src="images/user.png" alt="..." class="img-circle profile_img">
<img src="{{asset('images/user.png')}}" alt="..." class="img-circle profile_img">
</div>
<div class="profile_info">
<span>Welcome,</span>
......@@ -117,7 +117,7 @@
<ul class="nav navbar-nav navbar-right">
<li class="">
<a href="javascript:;" class="user-profile dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
<img src="images/user.png" alt="">{{Sentinel::getUser()->first_name}}
<img src="{{asset('images/user.png')}}" alt="">{{Sentinel::getUser()->first_name}}
<span class=" fa fa-angle-down"></span>
</a>
<ul class="dropdown-menu dropdown-usermenu pull-right">
......@@ -141,7 +141,7 @@
<!-- footer content -->
<footer>
<div class="pull-right">
Copyright © 2017 - TB Silalahi Center
<p>Copyright © 2017 TB Silalahi Center. All Rights Reserved.</p>
</div>
<div class="clearfix"></div>
</footer>
......
resources/views/managers/daftar_feedback.blade.php
......@@ -31,7 +31,6 @@
<th>Customer Name</th>
<th>Subjects</th>
<th>Feedback</th>
<th>Action</th>
</tr>
</thead>
<tbody>
......@@ -43,7 +42,6 @@
<td>{{$feedback->first_name}}</td>
<td>{{$feedback->subjects}}</td>
<td>{{$feedback->description}}</td>
<td></td>
</tr>
@endforeach
</tbody>
......
resources/views/managers/data_penjualan.blade.php
......@@ -44,6 +44,7 @@
<th>Nama Customer</th>
<th>Jumlah</th>
<th>Total Harga</th>
<th>Tanggal Berkunjung</th>
<th>Status</th>
</tr>
</thead>
......@@ -57,6 +58,7 @@
<td>{{$trans->first_name}}</td>
<td>{{$trans->jumlah}}</td>
<td>{{$trans->harga}}</td>
<td>{{$trans->tanggal_kunjung}}</td>
<td>Dibayar</td>
</tr>
@endforeach
......
resources/views/managers/pengunjung.blade.php
......@@ -42,6 +42,7 @@
<th>Nama Pengunjung</th>
<th>Jumlah Tiket</th>
<th>Total harga</th>
<th>Tanggal Berkunjung</th>
<th>Status</th>
</tr>
</thead>
......@@ -53,6 +54,7 @@
<td>{{$pengunjung->nama_pengunjung}}</td>
<td>{{$pengunjung->jumlah}}</td>
<td>{{$pengunjung->total_harga}}</td>
<td>{{$pengunjung->created_at}}</td>
<td>Dibayar</td>
</tr>
@endforeach
......
resources/views/staffs/daftar_member.blade.php
......@@ -44,11 +44,6 @@
<td>{{$member->first_name}}</td>
<td>{{$member->last_name}}</td>
<td>{{$member->email}}</td>
<td>
<form method="POST" action="{{}}" accept-charset="UTF-8">
<a href="#" class="btn btn-danger" >Block User</a>
</form>
</td>
</tr>
@endforeach
</tbody>
......
resources/views/staffs/data_pemesanan.blade.php
......@@ -32,9 +32,10 @@
<th>#</th>
<th>User ID</th>
<th>Nama Customer</th>
<th>Jumlah</th>
<th>Harga</th>
<th>Jumlah Tiket</th>
<th>Total Harga</th>
<th>Resi Pembayaran</th>
<th>Tanggal Berkunjung</th>
<th>Action</th>
</tr>
</thead>
......@@ -48,6 +49,7 @@
<td>{{$order->jumlah}}</td>
<td>{{$order->harga}}</td>
<td><img src="{{ asset('image/'. $order->images) }}" style="height: 150px; width: 200px; "> </td>
<td>{{$order->tanggal_kunjung}}</td>
<td>
<a href="{{url('/lunas',$order->id)}}" class="btn btn-primary"
onclick="return confirm('Are you sure to confirm now??')">Konfirmasi</a>
......
resources/views/staffs/data_transaksi.blade.php
......@@ -35,6 +35,7 @@
<th>Nama Customer</th>
<th>Jumlah</th>
<th>Total Harga</th>
<th>Tanggal Berkunjung</th>
<th>Status</th>
</tr>
</thead>
......@@ -48,7 +49,8 @@
<td>{{$trans->first_name}}</td>
<td>{{$trans->jumlah}}</td>
<td>{{$trans->harga}}</td>
<td>Lunas/Dikonfirmasi</td>
<td>{{$trans->tanggal_kunjung}}</td>
<td><p style="color: blue">Lunas/Dikonfirmasi</p></td>
</tr>
@endforeach
</tbody>
......
resources/views/staffs/pengunjung.blade.php
......@@ -105,6 +105,7 @@
<th>Nama</th>
<th>Jumlah Tiket</th>
<th>Total Harga</th>
<th>Tanggal Berkunjung</th>
<th>Status</th>
</tr>
</thead>
......@@ -116,6 +117,7 @@
<td>{{$peng->nama_pengunjung}}</td>
<td>{{$peng->jumlah}}</td>
<td>{{$peng->total_harga}}</td>
<td>{{$peng->created_at}}</td>
<td>Lunas</td>
</tr>
@endforeach
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment