Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Salsabila Fithriyah
go-wisata
Commits
a3109277
Commit
a3109277
authored
2 years ago
by
ridwannhd0705
Browse files
Options
Download
Email Patches
Plain Diff
first commit
parent
f26de632
main
salsabilifee-main-patch-01625
No related merge requests found
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
app/Http/Controllers/FrontendController.php
+5
-4
app/Http/Controllers/FrontendController.php
app/Http/Controllers/TiketController.php
+1
-1
app/Http/Controllers/TiketController.php
app/Models/Detail_transaksi.php
+3
-4
app/Models/Detail_transaksi.php
public/images/l7BoUEEMWamTEfs4j3u7enCSJXyEEUAtVZTsNp8L.jpg
+0
-0
public/images/l7BoUEEMWamTEfs4j3u7enCSJXyEEUAtVZTsNp8L.jpg
public/images/oBS131l7CB1YBPtbFDUB4HTlCwDAkB3VGOXNhdhb.jpg
+0
-0
public/images/oBS131l7CB1YBPtbFDUB4HTlCwDAkB3VGOXNhdhb.jpg
resources/views/FrontEnd/welcome.blade.php
+2
-0
resources/views/FrontEnd/welcome.blade.php
with
11 additions
and
9 deletions
+11
-9
app/Http/Controllers/FrontendController.php
View file @
a3109277
...
...
@@ -44,10 +44,11 @@ class FrontendController extends Controller
*/
public
function
index
()
{
$tempat
=
Tempat
::
where
(
'kategori'
,
'
des
a'
)
->
orderby
(
'id'
,
'DESC'
)
->
where
(
'status'
,
'1'
)
->
get
();
$tempat
=
Tempat
::
where
(
'kategori'
,
'
wisat
a'
)
->
orderby
(
'id'
,
'DESC'
)
->
where
(
'status'
,
'1'
)
->
get
();
$setting
=
Setting
::
first
();
$kegiatan
=
Kegiatan
::
latest
()
->
get
();
// return $kegiatan;
// return $tempat;
return
view
(
'FrontEnd/welcome'
,
[
"title"
=>
"Home"
,
"tempat"
=>
$tempat
,
...
...
@@ -224,7 +225,7 @@ class FrontendController extends Controller
$camp1
=
Camp
::
where
(
'tempat_id'
,
$tempatini
)
->
where
(
'status'
,
1
)
->
get
();
$makanan
=
Kuliner
::
where
(
'tempat_id'
,
$tempat
->
id
)
->
where
(
'status'
,
1
)
->
get
();
$katalogkm
=
KatalogMerchandise
::
where
(
'tempat_id'
,
$tempat
->
id
)
->
where
(
'status'
,
1
)
->
get
();
return
view
(
'FrontEnd/showtempat'
,
compact
(
'ez'
,
'tempat'
,
'nama'
,
'wahana'
,
'kuliner'
,
'makanan'
,
'katalogmerchandise'
,
'katalogkm'
,
'camp'
,
'camp1'
,
'penginapan'
));
return
view
(
'FrontEnd/showtempat'
,
compact
(
'tempat2'
,
'ez'
,
'tempat'
,
'wahana'
,
'kuliner'
,
'makanan'
,
'katalogmerchandise'
,
'katalogkm'
,
'camp'
,
'camp1'
,
'penginapan'
));
//nama
}
if
(
$tempat
->
kategori
==
"desa"
)
{
...
...
@@ -243,7 +244,7 @@ class FrontendController extends Controller
// Tempat Kuliner makanan
$makanan
=
Kuliner
::
where
(
'tempat_id'
,
$tempat
->
id
)
->
where
(
'status'
,
1
)
->
get
();
$katalog
=
KatalogMerchandise
::
where
(
'tempat_id'
,
$tempat
->
id
)
->
where
(
'status'
,
1
)
->
get
();
return
view
(
'FrontEnd/showtempatd'
,
compact
(
'ez'
,
'tempat'
,
'nama'
,
'wahana'
,
'kuliner'
,
'makanan'
,
'camp'
,
'camp1'
,
'katalog'
,
'katalogmerchandise'
,
'penginapan'
));
return
view
(
'FrontEnd/showtempatd'
,
compact
(
'tempat2'
,
'ez'
,
'tempat'
,
'nama'
,
'wahana'
,
'kuliner'
,
'makanan'
,
'camp'
,
'camp1'
,
'katalog'
,
'katalogmerchandise'
,
'penginapan'
));
}
...
...
This diff is collapsed.
Click to expand it.
app/Http/Controllers/TiketController.php
View file @
a3109277
...
...
@@ -831,7 +831,7 @@ class TiketController extends Controller
session
([
"penginapan"
=>
$penginapan
]);
return
redirect
(
"/cart/booking"
);
}
function
do_hapus_cart_katalogmerch
(
$kode
)
{
//
...
...
This diff is collapsed.
Click to expand it.
app/Models/Detail_transaksi.php
View file @
a3109277
...
...
@@ -12,7 +12,7 @@ class Detail_transaksi extends Model
protected
$table
=
"tb_detailtransaksi"
;
protected
$guarded
=
[];
static
function
tambah_detail_transaksi
(
$
user_id
,
$kategori
,
$tempat_id
,
$subtotal
,
$kode_tiket
,
$
kode
,
$jumlah
,
$
count
,
$name
,
$durasi
,
$tanggal_a
,
$ta
nggal_b
)
static
function
tambah_detail_transaksi
(
$
name
,
$durasi
,
$user_id
,
$tanggal_a
,
$tanggal_b
,
$kode_tiket
,
$
id_produk
,
$jumlah
,
$
grandtotal
,
$tempat_id
,
$kategori
,
$type_bayar
,
$
s
ta
tus
,
$count
)
{
Detail_transaksi
::
create
([
"name"
=>
$name
,
...
...
@@ -25,7 +25,7 @@ class Detail_transaksi extends Model
"harga"
=>
$grandtotal
,
"jumlah"
=>
$jumlah
,
"count"
=>
$count
,
"harga"
=>
$
sub
total
,
"harga"
=>
$
grand
total
,
"tempat_id"
=>
$tempat_id
,
"kategori"
=>
$kategori
,
"tempat_id"
=>
$tempat_id
,
...
...
@@ -50,9 +50,8 @@ class Detail_transaksi extends Model
{
return
$this
->
belongsTo
(
Ruang
::
class
,
'id_produk'
);
}
public
function
reviewkuliner
()
public
function
reviewkuliner
()
{
return
$this
->
hasOne
(
ReviewKuliner
::
class
,
'rating_id'
);
}
}
This diff is collapsed.
Click to expand it.
public/images/l7BoUEEMWamTEfs4j3u7enCSJXyEEUAtVZTsNp8L.jpg
0 → 100644
View file @
a3109277
62.9 KB
This diff is collapsed.
Click to expand it.
public/images/oBS131l7CB1YBPtbFDUB4HTlCwDAkB3VGOXNhdhb.jpg
0 → 100644
View file @
a3109277
95.2 KB
This diff is collapsed.
Click to expand it.
resources/views/FrontEnd/welcome.blade.php
View file @
a3109277
...
...
@@ -110,6 +110,8 @@
</div>
</section>
<!--==================== DISCOVER ====================-->
<!--==================== DISCOVER ====================-->
@if (count($tempat) > 0)
<section
class=
"place section"
id=
"place"
>
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help