From 479eeafaaa50013c33f3acf639ea801133600b49 Mon Sep 17 00:00:00 2001 From: Bayu Lukman Yusuf Date: Mon, 2 Mar 2026 14:54:55 +0700 Subject: [PATCH 1/2] setup menu footer --- lang/en/help.php | 18 ++++ lang/en/navbar.php | 1 + lang/id/help.php | 19 +++- lang/id/navbar.php | 1 + resources/views/help/topics-v2.blade.php | 33 +++---- .../views/layouts/partials/footer2.blade.php | 90 +++++++++++++++---- 6 files changed, 125 insertions(+), 37 deletions(-) diff --git a/lang/en/help.php b/lang/en/help.php index da73fb1..9b59109 100644 --- a/lang/en/help.php +++ b/lang/en/help.php @@ -25,6 +25,24 @@ return [ 'express_delivery' => 'Is there an option for express delivery?', 'customs_charges' => 'Will my parcel be charged customs charges?' ], + 'returns' => 'Returns & Refunds', + 'return_policy' => [ + 'how_to_initiate_return' => 'How do I initiate a return for a product?', + 'what_is_return_policy' => 'What is your return policy?', + 'return_eligibility' => 'What items are eligible for return?', + 'return_timeframe' => 'How long do I have to initiate a return?', + 'return_condition' => 'What condition should items be in for return?', + 'return_process' => 'How does the return process work?', + 'refund_method' => 'How will I receive my refund?', + 'refund_timeframe' => 'How long does it take to process a refund?', + 'exchange_policy' => 'Can I exchange a product instead of getting a refund?', + 'shipping_costs' => 'Are shipping costs refundable for returned items?', + 'damaged_items' => 'What should I do if my returned item is damaged or defective?', + 'international_returns' => 'Do you provide return labels for international customers?', + 'wrong_item' => 'What do I do if I receive the wrong item in my order?', + 'is_there_restocking_fee' => 'Is there a restocking fee for returned items?', + 'how_can_i_track_return' => 'How can I track the status of my return?' + ], 'contact_us' => 'Contact us', 'popular_faqs' => 'Popular FAQs', 'still_have_questions' => 'Still have unanswered questions and need to get in touch?', diff --git a/lang/en/navbar.php b/lang/en/navbar.php index 0a2389e..32298ba 100644 --- a/lang/en/navbar.php +++ b/lang/en/navbar.php @@ -18,4 +18,5 @@ return [ 'delivery' => 'Delivery', 'set_your_address' => 'Set your address', 'gender' => 'Gender', + 'help' => 'Help', ]; diff --git a/lang/id/help.php b/lang/id/help.php index 2dc2f32..e2aa023 100644 --- a/lang/id/help.php +++ b/lang/id/help.php @@ -7,7 +7,24 @@ return [ 'search' => 'Cari', 'common_topics' => 'Topik umum:', 'payments' => 'pembayaran', - 'refunds' => 'pengembalian', + 'returns' => 'Pengembalian & Pengembalian', + 'return_policy' => [ + 'how_to_initiate_return' => 'Bagaimana cara memulai pengembalian produk?', + 'what_is_return_policy' => 'Apa kebijakan pengembalian Anda?', + 'return_eligibility' => 'Produk apa saja yang memenuhi syarat untuk pengembalian?', + 'return_timeframe' => 'Berapa lama saya harus memulai pengembalian?', + 'return_condition' => 'Kondisi apa yang harus dipenuhi oleh produk untuk pengembalian?', + 'return_process' => 'Bagaimana proses pengembalian bekerja?', + 'refund_method' => 'Bagaimana saya akan menerima pengembalian uang?', + 'refund_timeframe' => 'Berapa lama waktu yang dibutuhkan untuk memproses pengembalian uang?', + 'exchange_policy' => 'Bisakah saya menukar produk sebagai ganti pengembalian uang?', + 'shipping_costs' => 'Apakah biaya pengiriman dapat dikembalikan untuk barang yang dikembalikan?', + 'damaged_items' => 'Apa yang harus saya lakukan jika barang yang dikembalikan rusak atau cacat?', + 'international_returns' => 'Apakah Anda menyediakan label pengembalian untuk pelanggan internasional?', + 'wrong_item' => 'Apa yang harus saya lakukan jika saya menerima barang yang salah dalam pesanan saya?', + 'is_there_restocking_fee' => 'Apakah ada biaya pengisian ulang untuk barang yang dikembalikan?', + 'how_can_i_track_return' => 'Bagaimana cara saya melacak status pengembalian saya?' + ], 'delivery' => 'pengiriman', 'dashboard' => 'dasbor', 'help_topics' => 'Topik bantuan', diff --git a/lang/id/navbar.php b/lang/id/navbar.php index 69defed..ad3378b 100644 --- a/lang/id/navbar.php +++ b/lang/id/navbar.php @@ -18,4 +18,5 @@ return [ 'delivery' => 'Pengiriman', 'set_your_address' => 'Atur alamat Anda', 'gender' => 'Gender', + 'help' => 'Bantuan', ]; diff --git a/resources/views/help/topics-v2.blade.php b/resources/views/help/topics-v2.blade.php index 1afaaae..51558eb 100644 --- a/resources/views/help/topics-v2.blade.php +++ b/resources/views/help/topics-v2.blade.php @@ -169,63 +169,54 @@
-

Returns & refunds

+

{{ __('help.returns_refunds') }}

@@ -82,7 +119,7 @@
@@ -90,24 +127,47 @@
Support + data-bs-toggle="collapse" data-bs-target="#supportLinks" aria-expanded="false" + aria-controls="supportLinks">Support
@@ -121,8 +181,8 @@

© All rights reserved. Made with by {{ config('app.name') }} + class="animate-underline">{{ config('app.name') }}

From 089308d86c51b0e386d04cdb08243d8f91db1f43 Mon Sep 17 00:00:00 2001 From: Bayu Lukman Yusuf Date: Mon, 2 Mar 2026 16:38:30 +0700 Subject: [PATCH 2/2] feedback list --- app/Http/Controllers/ReviewController.php | 21 ++ .../Crm/SurveyFeedbackRepository.php | 57 +++++ resources/views/account/reviews.blade.php | 238 ++++-------------- routes/web.php | 5 + 4 files changed, 135 insertions(+), 186 deletions(-) create mode 100644 app/Http/Controllers/ReviewController.php create mode 100644 app/Repositories/Crm/SurveyFeedbackRepository.php diff --git a/app/Http/Controllers/ReviewController.php b/app/Http/Controllers/ReviewController.php new file mode 100644 index 0000000..2221bee --- /dev/null +++ b/app/Http/Controllers/ReviewController.php @@ -0,0 +1,21 @@ +getList([]); + + // dd($list); + + return view('account.reviews',[ + 'list' => $list + ]); + } +} diff --git a/app/Repositories/Crm/SurveyFeedbackRepository.php b/app/Repositories/Crm/SurveyFeedbackRepository.php new file mode 100644 index 0000000..1e669b1 --- /dev/null +++ b/app/Repositories/Crm/SurveyFeedbackRepository.php @@ -0,0 +1,57 @@ +select('survey_feedback.*') + ->leftJoin('customers', 'survey_feedback.customer_id', 'customers.id') + ->leftJoin('survey', 'survey_feedback.survey_id', 'survey.id') + ->when(@$params["filter"]['start'], function($query) use ($params){ + $query->whereDate("survey_feedback.time", '>=', $params['filter']['start']); + }) + ->when(@$params["filter"]['end'], function($query) use ($params){ + $query->whereDate("survey_feedback.time", '<=', $params['filter']['end']); + }) + ->when(@$params["filter"]['survey_id'], function($query) use ($params){ + $query->where("survey_id", $params['filter']['survey_id']); + }) + ->when(@$params["filter"]['status'], function($query) use ($params){ + if($params['filter']['status'] == 'BELUM DIISI') { + $query->whereNull("survey_feedback.time"); + } + + if($params['filter']['status'] == 'SUDAH DIISI') { + $query->whereNotNull("survey_feedback.time"); + } + }) + ->when(@$params["search"], function($query) use ($params){ + $query->where(function($query) use ($params) { + $query->where("survey.name","ilike","%". $params["search"] . "%") + ->orWhere("customers.name","ilike","%". $params["search"] . "%"); + }); + }) + ->where("survey_feedback.customer_id", auth()->user()->customer->id) + ->orderBy($sortColumn, $sortDir) + ->paginate($limit); + + return $results; + } +} \ No newline at end of file diff --git a/resources/views/account/reviews.blade.php b/resources/views/account/reviews.blade.php index a6b81af..1affa02 100644 --- a/resources/views/account/reviews.blade.php +++ b/resources/views/account/reviews.blade.php @@ -9,201 +9,67 @@

My reviews

-
+ {{--
-
+
--}} - -
-
- Image - Apple iPad 10.2" 2021 Wi-Fi 64 GB Space Gray - (MK2K3RK/A) -
-
-
- - - - - - - - - +100 bonuses for a review -
-
-
- -
-
- -
-
- Image - Laptop Apple MacBook Pro 13 M2 -
-
-
-
+100 bonuses - earned
-
- - - - - + + @foreach ($list as $key => $value) + +
+
+ Image +
+ + {{ $value->survey->title ?? '-' }}, {{ $value->survey->content ?? '-' }} + + +
+ @foreach ($value->detail as $item) + {{ $item->description ?? '-' }} + @endforeach +
+
- - - + {{--
+
+ + + + + + + + + +100 bonuses for a review +
--}} + @if (count($value->detail ?? []) == 0) +
+
+ +
+ @endif
-
- -
-
- Product thumb - Razer Opus X Mercury Headphones - (RZ04-03760200-R3M1) -
-
-
- -
-
- -
-
- Product thumb - 3D virtual reality glasses VR Shinecon G10 for - smartphones with a large screen -
-
-
- -
-
- -
-
- Product thumb - Apple iPad Pro M2 2022 64 GB Space Gray -
-
-
- - - - - - - - - +86 bonuses for a review -
-
-
- -
-
- -
-
- Product thumb - Mobile phone Apple iPhone 14 256GB - Starlight -
-
-
- -
-
- -
-
- Product thumb - Power Bank PBS 10000 mAh Black -
-
-
-
- - - - - -
- - - -
-
- -
-
- Product thumb - Apple iPhone 14 128GB Blue -
-
-
- -
-
- -
-
- Product thumb - VRB01 Camera Nikon Max -
-
-
- -
-
+ @endforeach + + + + @if ($list->hasPages()) + {{ $list->links() }} + @endif + - --}}
@endsection diff --git a/routes/web.php b/routes/web.php index 7b5cd3b..a11e415 100644 --- a/routes/web.php +++ b/routes/web.php @@ -20,6 +20,7 @@ use App\Http\Controllers\HelpController; use App\Http\Controllers\VoucherEventController; use App\Http\Controllers\ContactController; use App\Http\Controllers\WishController; +use App\Http\Controllers\ReviewController; use Illuminate\Support\Facades\Route; @@ -146,6 +147,10 @@ Route::middleware(['auth'])->prefix('/account/wishlist')->group(function () { }); +Route::middleware(['auth'])->prefix('/account/reviews')->group(function () { + Route::get('/', [ReviewController::class, 'index'])->name('reviews'); +}); + Route::get('/terms-and-conditions', [TncController::class, 'index'])->name('terms-and-conditions'); Route::get('/help', [HelpController::class, 'index'])->name('help'); Route::get('/contact', [ContactController::class, 'index'])->name('contact');