Merge branch 'feature-product' into development

app/Http/Controllers/ReviewController.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use App\Repositories\Crm\SurveyFeedbackRepository;
+
+class ReviewController extends Controller
+{
+    public function index(Request $request, SurveyFeedbackRepository $surveyFeedbackRepository)
+    {
+
+        $list = $surveyFeedbackRepository->getList([]);
+
+        // dd($list);
+
+        return view('account.reviews',[
+            'list' => $list
+        ]);
+    }
+}

app/Repositories/Crm/SurveyFeedbackRepository.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Repositories\Crm;
+
+use App\Models\Survey;
+use App\Models\SurveyFeedback;
+use App\Models\SurveyFeedbackDetail;
+use App\Models\SurveyQuestion;
+use Carbon\Carbon;
+use Illuminate\Support\Str;
+use DB;
+
+class SurveyFeedbackRepository
+{
+    public function getList(array $params = [])
+    {
+        $limit = @$params["limit"] ? (int) @$params["limit"] : 10;
+        $sortColumn = @$params["sort"]["column"] ? $params["sort"]["column"] : "id";
+        $sortDir = @$params["sort"]["dir"] ? $params["sort"]["dir"] : "desc";
+
+        $results = SurveyFeedback::with([
+            'survey',
+            'detail'
+        ])->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;
+    }
+}

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?',

lang/en/navbar.php

@@ -18,4 +18,5 @@ return [
     'delivery' => 'Delivery',
     'set_your_address' => 'Set your address',
     'gender' => 'Gender',
+    'help' => 'Help',
 ];

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',

lang/id/navbar.php

@@ -18,4 +18,5 @@ return [
     'delivery' => 'Pengiriman',
     'set_your_address' => 'Atur alamat Anda',
     'gender' => 'Gender',
+    'help' => 'Bantuan',
 ];

resources/views/account/reviews.blade.php

@@ -9,24 +9,34 @@
                 <div class="col-sm-6 col-md-7 col-xxl-8 mb-3 mb-md-0">
                     <h1 class="h2 me-3 mb-0">My reviews</h1>
                 </div>
-                <div class="col-sm-6 col-md-5 col-xxl-4">
+                {{-- <div class="col-sm-6 col-md-5 col-xxl-4">
                     <select aria-label="Wishlist sorting" class="form-select" data-select='{"removeItemButton": false}'>
                         <option value="products-reviews">Products and reviews</option>
                         <option value="reviews">My reviews</option>
                         <option value="products">Products awaiting reviews</option>
                     </select>
-                </div>
+                </div> --}}
             </div>
             <!-- Review items (List) -->
+
+            @foreach ($list as $key => $value)
                 <!-- Item -->
                 <div class="d-md-flex align-items-center justify-content-between gap-4 border-bottom py-3">
                     <div class="nav flex-nowrap position-relative align-items-center">
-                    <img alt="Image" class="d-block my-xl-1" src="/img/shop/electronics/thumbs/11.png" width="64" />
-                    <a class="nav-link stretched-link hover-effect-underline ps-3 p-0"
-                        href="{{ route('second', ['shop', 'product-general-electronics']) }}">Apple iPad 10.2" 2021 Wi-Fi 64 GB Space Gray
-                        (MK2K3RK/A)</a>
+                        <img alt="Image" class="d-block my-xl-1" src="{{ asset('logo/logo-app.png') }}" width="64" />
+                        <div>
+                            <a class="nav-link stretched-link hover-effect-underline ps-3 p-0" href="# ">
+                                {{ $value->survey->title ?? '-' }}, {{ $value->survey->content ?? '-' }}
+                            </a>
+
+                            <div>
+                                @foreach ($value->detail as $item)
+                                    {{ $item->description ?? '-' }}
+                                @endforeach
                             </div>
-                <div class="d-flex h6 fs-sm pt-2 pt-md-0 ps-3 ps-md-0 mb-2 mb-md-0">
+                        </div>
+                    </div>
+                    {{-- <div class="d-flex h6 fs-sm pt-2 pt-md-0 ps-3 ps-md-0 mb-2 mb-md-0">
                         <div class="flex-shrink-0 d-md-none" style="width: 64px"></div>
                         <svg class="text-warning flex-shrink-0 me-2" fill="currentColor" height="16" width="16"
                             xmlns="http://www.w3.org/2000/svg">
@@ -41,169 +51,25 @@
                             </path>
                         </svg>
                         +100 bonuses for a review
-                </div>
-                <div class="d-flex pt-2 pt-md-0 ps-3 ps-md-0 mb-2 mb-md-0">
-                    <div class="d-md-none" style="width: 64px"></div>
-                    <button class="btn btn-secondary" data-bs-target="#reviewForm" data-bs-toggle="modal"
-                        type="button">Leave a review</button>
-                </div>
-            </div>
-            <!-- Item -->
-            <div class="d-md-flex align-items-center justify-content-between gap-4 border-bottom py-3">
-                <div class="nav flex-nowrap position-relative align-items-center">
-                    <img alt="Image" class="d-block my-xl-1" src="/img/shop/electronics/thumbs/12.png" width="64" />
-                    <a class="nav-link stretched-link hover-effect-underline ps-3 p-0"
-                        href="{{ route('second', ['shop', 'product-general-electronics']) }}">Laptop Apple MacBook Pro 13 M2</a>
-                </div>
-                <div
-                    class="position-relative d-flex align-items-center text-decoration-none min-w-0 pt-1 pt-md-0 ps-3 ps-md-0 mb-2 mb-md-0">
-                    <div class="flex-shrink-0 d-md-none" style="width: 64px"></div>
-                    <div class="h6 fs-sm text-body-secondary text-truncate p-0 me-3 me-sm-4 mb-0">+100 bonuses
-                        earned</div>
-                    <div class="d-flex gap-1 fs-sm me-2 me-sm-3">
-                        <i class="ci-star-filled text-warning"></i>
-                        <i class="ci-star-filled text-warning"></i>
-                        <i class="ci-star-filled text-warning"></i>
-                        <i class="ci-star-filled text-warning"></i>
-                        <i class="ci-star-filled text-warning"></i>
-                    </div>
-                    <a aria-controls="reviewDetails" aria-label="Show review details"
-                        class="btn btn-icon btn-ghost btn-secondary stretched-link border-0" data-bs-toggle="offcanvas"
-                        href="#reviewDetails">
-                        <i class="ci-chevron-right fs-lg"></i>
-                    </a>
-                </div>
-            </div>
-            <!-- Item -->
-            <div class="d-md-flex align-items-center justify-content-between gap-4 border-bottom py-3">
-                <div class="nav flex-nowrap position-relative align-items-center">
-                    <img alt="Product thumb" class="d-block my-xl-1" src="/img/shop/electronics/thumbs/13.png"
-                        width="64" />
-                    <a class="nav-link stretched-link hover-effect-underline ps-3 p-0"
-                        href="{{ route('second', ['shop', 'product-general-electronics']) }}">Razer Opus X Mercury Headphones
-                        (RZ04-03760200-R3M1)</a>
-                </div>
-                <div class="d-flex pt-2 pt-md-0 ps-3 ps-md-0 mb-2 mb-md-0">
-                    <div class="d-md-none" style="width: 64px"></div>
-                    <button class="btn btn-secondary" data-bs-target="#reviewForm" data-bs-toggle="modal"
-                        type="button">Leave a review</button>
-                </div>
-            </div>
-            <!-- Item -->
-            <div class="d-md-flex align-items-center justify-content-between gap-4 border-bottom py-3">
-                <div class="nav flex-nowrap position-relative align-items-center">
-                    <img alt="Product thumb" class="d-block my-xl-1" src="/img/shop/electronics/thumbs/14.png"
-                        width="64" />
-                    <a class="nav-link stretched-link hover-effect-underline ps-3 p-0"
-                        href="{{ route('second', ['shop', 'product-general-electronics']) }}">3D virtual reality glasses VR Shinecon G10 for
-                        smartphones with a large screen</a>
-                </div>
-                <div class="d-flex pt-2 pt-md-0 ps-3 ps-md-0 mb-2 mb-md-0">
-                    <div class="d-md-none" style="width: 64px"></div>
-                    <button class="btn btn-secondary" data-bs-target="#reviewForm" data-bs-toggle="modal"
-                        type="button">Leave a review</button>
-                </div>
-            </div>
-            <!-- Item -->
-            <div class="d-md-flex align-items-center justify-content-between gap-4 border-bottom py-3">
-                <div class="nav flex-nowrap position-relative align-items-center">
-                    <img alt="Product thumb" class="d-block my-xl-1" src="/img/shop/electronics/thumbs/15.png"
-                        width="64" />
-                    <a class="nav-link stretched-link hover-effect-underline ps-3 p-0"
-                        href="{{ route('second', ['shop', 'product-general-electronics']) }}">Apple iPad Pro M2 2022 64 GB Space Gray</a>
-                </div>
-                <div class="d-flex h6 fs-sm pt-2 pt-md-0 ps-3 ps-md-0 mb-2 mb-md-0">
-                    <div class="flex-shrink-0 d-md-none" style="width: 64px"></div>
-                    <svg class="text-warning flex-shrink-0 me-2" fill="currentColor" height="16" width="16"
-                        xmlns="http://www.w3.org/2000/svg">
-                        <path
-                            d="M1.333 9.667H7.5V16h-5c-.64 0-1.167-.527-1.167-1.167V9.667zm13.334 0v5.167c0 .64-.527 1.167-1.167 1.167h-5V9.667h6.167zM0 5.833V7.5c0 .64.527 1.167 1.167 1.167h.167H7.5v-1-3H1.167C.527 4.667 0 5.193 0 5.833zm14.833-1.166H8.5v3 1h6.167.167C15.473 8.667 16 8.14 16 7.5V5.833c0-.64-.527-1.167-1.167-1.167z">
-                        </path>
-                        <path
-                            d="M8 5.363a.5.5 0 0 1-.495-.573C7.752 3.123 9.054-.03 12.219-.03c1.807.001 2.447.977 2.447 1.813 0 1.486-2.069 3.58-6.667 3.58zM12.219.971c-2.388 0-3.295 2.27-3.595 3.377 1.884-.088 3.072-.565 3.756-.971.949-.563 1.287-1.193 1.287-1.595 0-.599-.747-.811-1.447-.811z">
-                        </path>
-                        <path
-                            d="M8.001 5.363c-4.598 0-6.667-2.094-6.667-3.58 0-.836.641-1.812 2.448-1.812 3.165 0 4.467 3.153 4.713 4.819a.5.5 0 0 1-.495.573zM3.782.971c-.7 0-1.448.213-1.448.812 0 .851 1.489 2.403 5.042 2.566C7.076 3.241 6.169.971 3.782.971z">
-                        </path>
-                    </svg>
-                    +86 bonuses for a review
-                </div>
-                <div class="d-flex pt-2 pt-md-0 ps-3 ps-md-0 mb-2 mb-md-0">
-                    <div class="d-md-none" style="width: 64px"></div>
-                    <button class="btn btn-secondary" data-bs-target="#reviewForm" data-bs-toggle="modal"
-                        type="button">Leave a review</button>
-                </div>
-            </div>
-            <!-- Item -->
-            <div class="d-md-flex align-items-center justify-content-between gap-4 border-bottom py-3">
-                <div class="nav flex-nowrap position-relative align-items-center">
-                    <img alt="Product thumb" class="d-block my-xl-1" src="/img/shop/electronics/thumbs/16.png"
-                        width="64" />
-                    <a class="nav-link stretched-link hover-effect-underline ps-3 p-0"
-                        href="{{ route('second', ['shop', 'product-general-electronics']) }}">Mobile phone Apple iPhone 14 256GB
-                        Starlight</a>
-                </div>
-                <div class="d-flex pt-2 pt-md-0 ps-3 ps-md-0 mb-2 mb-md-0">
-                    <div class="d-md-none" style="width: 64px"></div>
-                    <button class="btn btn-secondary" data-bs-target="#reviewForm" data-bs-toggle="modal"
-                        type="button">Leave a review</button>
-                </div>
-            </div>
-            <!-- Item -->
-            <div class="d-md-flex align-items-center justify-content-between gap-4 border-bottom py-3">
-                <div class="nav flex-nowrap position-relative align-items-center">
-                    <img alt="Product thumb" class="d-block my-xl-1" src="/img/shop/electronics/thumbs/17.png"
-                        width="64" />
-                    <a class="nav-link stretched-link hover-effect-underline ps-3 p-0"
-                        href="{{ route('second', ['shop', 'product-general-electronics']) }}">Power Bank PBS 10000 mAh Black</a>
-                </div>
-                <div
-                    class="position-relative d-flex align-items-center text-decoration-none min-w-0 pt-1 pt-md-0 ps-3 ps-md-0 mb-2 mb-md-0">
-                    <div class="flex-shrink-0 d-md-none" style="width: 64px"></div>
-                    <div class="d-flex gap-1 fs-sm me-2 me-sm-3">
-                        <i class="ci-star-filled text-warning"></i>
-                        <i class="ci-star-filled text-warning"></i>
-                        <i class="ci-star-filled text-warning"></i>
-                        <i class="ci-star-filled text-warning"></i>
-                        <i class="ci-star text-body-tertiary opacity-75"></i>
-                    </div>
-                    <a aria-controls="reviewDetails" aria-label="Show review details"
-                        class="btn btn-icon btn-ghost btn-secondary stretched-link border-0" data-bs-toggle="offcanvas"
-                        href="#reviewDetails">
-                        <i class="ci-chevron-right fs-lg"></i>
-                    </a>
-                </div>
-            </div>
-            <!-- Item -->
-            <div class="d-md-flex align-items-center justify-content-between gap-4 border-bottom py-3">
-                <div class="nav flex-nowrap position-relative align-items-center">
-                    <img alt="Product thumb" class="d-block my-xl-1" src="/img/shop/electronics/thumbs/18.png"
-                        width="64" />
-                    <a class="nav-link stretched-link hover-effect-underline ps-3 p-0"
-                        href="{{ route('second', ['shop', 'product-general-electronics']) }}">Apple iPhone 14 128GB Blue</a>
-                </div>
-                <div class="d-flex pt-2 pt-md-0 ps-3 ps-md-0 mb-2 mb-md-0">
-                    <div class="d-md-none" style="width: 64px"></div>
-                    <button class="btn btn-secondary" data-bs-target="#reviewForm" data-bs-toggle="modal"
-                        type="button">Leave a review</button>
-                </div>
-            </div>
-            <!-- Item -->
-            <div class="d-md-flex align-items-center justify-content-between gap-4 border-bottom py-3">
-                <div class="nav flex-nowrap position-relative align-items-center">
-                    <img alt="Product thumb" class="d-block my-xl-1" src="/img/shop/electronics/thumbs/19.png"
-                        width="64" />
-                    <a class="nav-link stretched-link hover-effect-underline ps-3 p-0"
-                        href="{{ route('second', ['shop', 'product-general-electronics']) }}">VRB01 Camera Nikon Max</a>
-                </div>
+                    </div> --}}
+                    @if (count($value->detail ?? []) == 0)
                         <div class="d-flex pt-2 pt-md-0 ps-3 ps-md-0 mb-2 mb-md-0">
                             <div class="d-md-none" style="width: 64px"></div>
                             <button class="btn btn-secondary" data-bs-target="#reviewForm" data-bs-toggle="modal"
                                 type="button">Leave a review</button>
                         </div> 
+                    @endif
                 </div>
+            @endforeach
+
+
+
+            @if ($list->hasPages())
+                {{ $list->links() }}
+            @endif
+
             <!-- Pagination -->
-            <nav aria-label="Page navigation example" class="pt-3 pb-2 pb-sm-0 mt-2 mt-md-3">
+            {{-- <nav aria-label="Page navigation example" class="pt-3 pb-2 pb-sm-0 mt-2 mt-md-3">
                 <ul class="pagination">
                     <li aria-current="page" class="page-item active">
                         <span class="page-link">
@@ -221,7 +87,7 @@
                         <a class="page-link" href="#">4</a>
                     </li>
                 </ul>
-            </nav>
+            </nav> --}}
         </div>
     </div>
 @endsection

resources/views/help/topics-v2.blade.php

@@ -169,63 +169,54 @@
                         <!-- Returns tab -->
                         <div class="tab-pane" id="returns" role="tabpanel" aria-labelledby="returns-tab">
                             <div class="d-flex border-bottom ps-md-4 pb-3 pb-sm-4">
-                                <h2 class="h5 mb-0">Returns &amp; refunds</h2>
+                                <h2 class="h5 mb-0">{{ __('help.returns_refunds') }}</h2>
                             </div>
                             <div class="position-relative">
                                 <div class="position-absolute top-0 start-0 h-100 border-start d-none d-md-block"></div>
                                 <ul class="nav flex-column gap-3 pt-4 ps-md-4">
                                     <li>
                                         <a class="nav-link hover-effect-underline fw-normal p-0"
-                                            href="{{ route('second', ['help', 'single-article-v2']) }}">How do I initiate a return for a
-                                            product?</a>
+                                            href="{{ route('second', ['help', 'single-article-v2']) }}">{{ __('help.return_policy.what_is_return_policy') }}</a>
                                     </li>
                                     <li>
                                         <a class="nav-link hover-effect-underline fw-normal p-0"
-                                            href="{{ route('second', ['help', 'single-article-v2']) }}">What is your return policy?</a>
+                                            href="{{ route('second', ['help', 'single-article-v2']) }}">{{ __('help.return_policy.return_eligibility') }}</a>
                                     </li>
                                     <li>
                                         <a class="nav-link hover-effect-underline fw-normal p-0"
-                                            href="{{ route('second', ['help', 'single-article-v2']) }}">Can I exchange a product instead of getting
-                                            a refund?</a>
+                                            href="{{ route('second', ['help', 'single-article-v2']) }}">{{ __('help.return_policy.return_timeframe') }}</a>
                                     </li>
                                     <li>
                                         <a class="nav-link hover-effect-underline fw-normal p-0"
-                                            href="{{ route('second', ['help', 'single-article-v2']) }}">How long does it take to process a
-                                            refund?</a>
+                                            href="{{ route('second', ['help', 'single-article-v2']) }}">{{ __('help.return_policy.return_condition') }}</a>
                                     </li>
                                     <li>
                                         <a class="nav-link hover-effect-underline fw-normal p-0"
-                                            href="{{ route('second', ['help', 'single-article-v2']) }}">What should I do if my returned item is
-                                            damaged or defective?</a>
+                                            href="{{ route('second', ['help', 'single-article-v2']) }}">{{ __('help.return_policy.return_process') }}</a>
                                     </li>
                                     <li>
                                         <a class="nav-link hover-effect-underline fw-normal p-0"
-                                            href="{{ route('second', ['help', 'single-article-v2']) }}">Are there any items that are not eligible
-                                            for returns?</a>
+                                            href="{{ route('second', ['help', 'single-article-v2']) }}">{{ __('help.return_policy.refund_method') }}</a>
                                     </li>
                                     <li>
                                         <a class="nav-link hover-effect-underline fw-normal p-0"
-                                            href="{{ route('second', ['help', 'single-article-v2']) }}">Can I return a gift that was purchased for
-                                            me?</a>
+                                            href="{{ route('second', ['help', 'single-article-v2']) }}">{{ __('help.return_policy.refund_timeframe') }}</a>
                                     </li>
                                     <li>
                                         <a class="nav-link hover-effect-underline fw-normal p-0"
-                                            href="{{ route('second', ['help', 'single-article-v2']) }}">Is there a restocking fee for returned
-                                            items?</a>
+                                            href="{{ route('second', ['help', 'single-article-v2']) }}">{{ __('help.return_policy.exchange_policy') }}</a>
                                     </li>
                                     <li>
                                         <a class="nav-link hover-effect-underline fw-normal p-0"
-                                            href="{{ route('second', ['help', 'single-article-v2']) }}">How can I track the status of my return?</a>
+                                            href="{{ route('second', ['help', 'single-article-v2']) }}">{{ __('help.return_policy.shipping_costs') }}</a>
                                     </li>
                                     <li>
                                         <a class="nav-link hover-effect-underline fw-normal p-0"
-                                            href="{{ route('second', ['help', 'single-article-v2']) }}">What do I do if I receive the wrong item in
-                                            my order?</a>
+                                            href="{{ route('second', ['help', 'single-article-v2']) }}">{{ __('help.return_policy.damaged_items') }}</a>
                                     </li>
                                     <li>
                                         <a class="nav-link hover-effect-underline fw-normal p-0"
-                                            href="{{ route('second', ['help', 'single-article-v2']) }}">Are shipping costs refundable for returned
-                                            items?</a>
+                                            href="{{ route('second', ['help', 'single-article-v2']) }}">{{ __('help.return_policy.international_returns') }}</a>
                                     </li>
                                     <li>
                                         <a class="nav-link hover-effect-underline fw-normal p-0"

resources/views/layouts/partials/footer2.blade.php

@@ -34,17 +34,54 @@
 
                 <!-- Subscription + Social buttons -->
                 <div class="col-lg-5 mb-4 mb-sm-5 mb-lg-0">
-                    <h6 class="mb-4">Join our newsletter, get discounts 🔥</h6>
-                    <form class="needs-validation d-flex gap-2 pb-sm-2 pb-lg-0 mb-4 mb-lg-5" novalidate>
+                    <h6 class="mb-4">Hubungi Kami</h6>
+                    {{-- <form class="needs-validation d-flex gap-2 pb-sm-2 pb-lg-0 mb-4 mb-lg-5" novalidate>
                         <input type="email" class="form-control form-control-lg w-100 rounded-pill"
                             placeholder="Your email" style="max-width: 340px" required>
                         <button type="submit" class="btn btn-lg btn-primary rounded-pill">Subscribe</button>
-                    </form>
+                    </form> --}}
+
+
+                    <div class="contact-info mb-4">
+
+                        <div class="mb-1 text-body">
+                            <i class="ci-phone me-2"></i> Phone : (021) 3500703
+                        </div>
+                        <div class="mb-1 text-body">
+                            <i class="ci-mail me-2"></i> Email : sales@asiagolf.id
+                        </div>
+                        <div class="mb-1 text-body d-flex gap-1">
+                            <i class="ci-clock me-2 mt-1"></i>
+                            <div>
+
+                                Mon-Sat : 8.30 AM - 6 PM
+                                <br>
+                                Sun : 9.30 AM - 5 PM
+                                <br>
+                                <div class="text-muted small text-body">
+                                    (Exclude Weekends and Public Holidays)
+                                </div>
+                            </div>
+                        </div>
+
+
+
+                        <div class="mb-1 text-body d-flex gap-1">
+                            <i class="ci-map me-2 mt-1"></i>
+                            <div>
+                                Alamat : Jalan Pintu Air Raya No.11 B,D,E,F,G
+                                <br>RT.8/RW.1, Ps. Baru,
+                                <br>Kecamatan Sawah Besar, Kota Jakarta Pusat,
+                                <br>Daerah Khusus Ibukota Jakarta 10710
+                            </div>
+                        </div>
+                    </div>
                     <div class="d-flex gap-3">
-                        <a class="btn btn-icon btn-secondary rounded-circle" href="#!" aria-label="Instagram">
+                        <a class="btn btn-icon btn-secondary rounded-circle"
+                            href="https://www.instagram.com/asiagolfindonesia/" aria-label="Instagram">
                             <i class="ci-instagram fs-base"></i>
                         </a>
-                        <a class="btn btn-icon btn-secondary rounded-circle" href="#!" aria-label="Facebook">
+                        {{-- <a class="btn btn-icon btn-secondary rounded-circle" href="#!" aria-label="Facebook">
                             <i class="ci-facebook fs-base"></i>
                         </a>
                         <a class="btn btn-icon btn-secondary rounded-circle" href="#!" aria-label="YouTube">
@@ -52,7 +89,7 @@
                         </a>
                         <a class="btn btn-icon btn-secondary rounded-circle" href="#!" aria-label="Telegram">
                             <i class="ci-telegram fs-base"></i>
-                        </a>
+                        </a> --}}
                     </div>
                 </div>
 
@@ -90,24 +127,47 @@
                                 <h6 class="accordion-header" id="supportHeading">
                                     <span class="text-dark-emphasis d-none d-sm-block">Support</span>
                                     <button type="button" class="accordion-button collapsed py-3 d-sm-none"
-                                        data-bs-toggle="collapse" data-bs-target="#supportLinks"
-                                        aria-expanded="false" aria-controls="supportLinks">Support</button>
+                                        data-bs-toggle="collapse" data-bs-target="#supportLinks" aria-expanded="false"
+                                        aria-controls="supportLinks">Support</button>
                                 </h6>
                                 <div class="accordion-collapse collapse d-sm-block" id="supportLinks"
                                     aria-labelledby="supportHeading" data-bs-parent="#footerLinks">
                                     <ul class="nav flex-column gap-2 pt-sm-3 pb-3 pb-sm-0 mt-n1 mb-1 mb-sm-0">
+
                                         <li class="d-flex w-100 pt-1">
                                             <a class="nav-link animate-underline animate-target d-inline fw-normal text-truncate p-0"
-                                                href="#!">FAQs</a>
+                                                href="{{ route('profile') }}">Account</a>
                                         </li>
+
                                         <li class="d-flex w-100 pt-1">
                                             <a class="nav-link animate-underline animate-target d-inline fw-normal text-truncate p-0"
-                                                href="#!">Search guide</a>
+                                                href="#!">Term of Service</a>
                                         </li>
+
+
                                         <li class="d-flex w-100 pt-1">
                                             <a class="nav-link animate-underline animate-target d-inline fw-normal text-truncate p-0"
-                                                href="#!">Contact</a>
+                                                href="{{ route('orders') }}">Orders & Payments</a>
                                         </li>
+
+                                        <li class="d-flex w-100 pt-1">
+                                            <a class="nav-link animate-underline animate-target d-inline fw-normal text-truncate p-0"
+                                                href="#!">Shipping & Delivery</a>
+                                        </li>
+
+
+
+                                        <li class="d-flex w-100 pt-1">
+                                            <a class="nav-link animate-underline animate-target d-inline fw-normal text-truncate p-0"
+                                                href="{{ route('contact') }}">Contact</a>
+                                        </li>
+
+
+                                        <li class="d-flex w-100 pt-1">
+                                            <a class="nav-link animate-underline animate-target d-inline fw-normal text-truncate p-0"
+                                                href="{{ route('help') }}">FAQs</a>
+                                        </li>
+
                                     </ul>
                                 </div>
                                 <hr class="d-sm-none my-0">
@@ -121,8 +181,8 @@
         <!-- Copyright -->
         <p class="fs-xs text-body text-center text-lg-start mb-0">
             &copy; All rights reserved. Made with <i class="ci-heart-filled align-middle"></i> by <span
-                class="animate-underline"><a class="animate-target text-white text-decoration-none"
-                    href="/" target="_blank" rel="noreferrer">{{ config('app.name') }}</a></span>
+                class="animate-underline"><a class="animate-target text-white text-decoration-none" href="/"
+                    target="_blank" rel="noreferrer">{{ config('app.name') }}</a></span>
         </p>
     </div>
 

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');