Added Breadcrumb And Yielding Done In Default Theme

composer.json

@@ -16,6 +16,7 @@
         "bagistobrasil/bagisto-product-social-share": "^0.1.2",
         "barryvdh/laravel-debugbar": "^3.1",
         "barryvdh/laravel-dompdf": "^0.8.5|^0.9.0",
+        "diglactic/laravel-breadcrumbs": "^7.0",
         "doctrine/dbal": "^2.9",
         "enshrined/svg-sanitize": "^0.14.0",
         "facade/ignition": "^2.3.6",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "46b4c37f75642ba14f3a2913f0f345cd",
+    "content-hash": "ad730dd868891497848ecf7836bbff4b",
     "packages": [
         {
             "name": "algolia/algoliasearch-client-php",
@@ -771,6 +771,77 @@
             ],
             "time": "2021-08-15T20:50:18+00:00"
         },
+        {
+            "name": "diglactic/laravel-breadcrumbs",
+            "version": "v7.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/diglactic/laravel-breadcrumbs.git",
+                "reference": "0a14e8785fa9423c878edd3975af2a92dfcdaf42"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/diglactic/laravel-breadcrumbs/zipball/0a14e8785fa9423c878edd3975af2a92dfcdaf42",
+                "reference": "0a14e8785fa9423c878edd3975af2a92dfcdaf42",
+                "shasum": ""
+            },
+            "require": {
+                "facade/ignition-contracts": "^1.0",
+                "laravel/framework": "^6.0 || ^7.0 || ^8.0",
+                "php": "^7.2 || ^8.0"
+            },
+            "conflict": {
+                "davejamesmiller/laravel-breadcrumbs": "*"
+            },
+            "require-dev": {
+                "orchestra/testbench": "^4.10 || ^5.9 || ^6.4",
+                "php-coveralls/php-coveralls": "^2.4",
+                "phpunit/phpunit": "^8.5 || ^9.4",
+                "spatie/phpunit-snapshot-assertions": "^2.2 || ^4.2"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Diglactic\\Breadcrumbs\\ServiceProvider"
+                    ],
+                    "aliases": {
+                        "Breadcrumbs": "Diglactic\\Breadcrumbs\\Breadcrumbs"
+                    }
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Diglactic\\Breadcrumbs\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Sheng Slogar",
+                    "email": "sheng@diglactic.com",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "Dave James Miller",
+                    "email": "dave@davejamesmiller.com",
+                    "role": "Original Creator"
+                }
+            ],
+            "description": "A simple Laravel-style way to create breadcrumbs.",
+            "homepage": "https://github.com/diglactic/laravel-breadcrumbs",
+            "keywords": [
+                "laravel"
+            ],
+            "support": {
+                "issues": "https://github.com/diglactic/laravel-breadcrumbs/issues",
+                "source": "https://github.com/diglactic/laravel-breadcrumbs/tree/v7.0.1"
+            },
+            "time": "2021-09-23T20:31:25+00:00"
+        },
         {
             "name": "doctrine/cache",
             "version": "2.1.1",
@@ -11699,5 +11770,5 @@
         "php": "^7.3|^8.0"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.1.0"
+    "plugin-api-version": "2.0.0"
 }

config/breadcrumbs.php

@@ -0,0 +1,75 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | View Name
+    |--------------------------------------------------------------------------
+    |
+    | Choose a view to display when Breadcrumbs::render() is called.
+    | Built in templates are:
+    |
+    | - 'breadcrumbs::bootstrap5'  - Bootstrap 5
+    | - 'breadcrumbs::bootstrap4'  - Bootstrap 4
+    | - 'breadcrumbs::bulma'       - Bulma
+    | - 'breadcrumbs::foundation6' - Foundation 6
+    | - 'breadcrumbs::json-ld'     - JSON-LD Structured Data
+    | - 'breadcrumbs::materialize' - Materialize
+    | - 'breadcrumbs::tailwind'    - Tailwind CSS
+    | - 'breadcrumbs::uikit'       - UIkit
+    |
+    | Or a custom view, e.g. '_partials/breadcrumbs'.
+    |
+    */
+
+    'view' => 'breadcrumbs::bootstrap5',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Breadcrumbs File(s)
+    |--------------------------------------------------------------------------
+    |
+    | The file(s) where breadcrumbs are defined. e.g.
+    |
+    | - base_path('routes/breadcrumbs.php')
+    | - glob(base_path('breadcrumbs/*.php'))
+    |
+    */
+
+    'files' => base_path('routes/breadcrumbs.php'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Exceptions
+    |--------------------------------------------------------------------------
+    |
+    | Determine when to throw an exception.
+    |
+    */
+
+    // When route-bound breadcrumbs are used but the current route doesn't have a name (UnnamedRouteException)
+    'unnamed-route-exception' => true,
+
+    // When route-bound breadcrumbs are used and the matching breadcrumb doesn't exist (InvalidBreadcrumbException)
+    'missing-route-bound-breadcrumb-exception' => true,
+
+    // When a named breadcrumb is used but doesn't exist (InvalidBreadcrumbException)
+    'invalid-named-breadcrumb-exception' => true,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Classes
+    |--------------------------------------------------------------------------
+    |
+    | Subclass the default classes for more advanced customisations.
+    |
+    */
+
+    // Manager
+    'manager-class' => Diglactic\Breadcrumbs\Manager::class,
+
+    // Generator
+    'generator-class' => Diglactic\Breadcrumbs\Generator::class,
+
+];

packages/Webkul/Shop/src/Resources/views/customers/account/address/country-state.blade.php

@@ -1,7 +1,6 @@
 <country-state></country-state>
 
 @push('scripts')
-
     <script type="text/x-template" id="country-state-template">
         <div>
             <div class="control-group" :class="[errors.has('country') ? 'has-error' : '']">

packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php

@@ -2,137 +2,146 @@
     $currentCustomer = auth()->guard('customer')->user();
 @endphp
 
-@extends('shop::layouts.master')
+@extends('shop::customers.account.index')
 
 @section('page_title')
     {{ __('shop::app.customer.account.address.create.page-title') }}
 @endsection
 
-@section('content-wrapper')
+@section('account-content')
+    <div class="account-layout">
+        <div class="account-head mb-15">
+            <span class="back-icon"><a href="{{ route('customer.address.index') }}"><i class="icon icon-menu-back"></i></a></span>
 
-    <div class="account-content">
+            <span class="account-heading">{{ __('shop::app.customer.account.address.create.title') }}</span>
 
-        @include('shop::customers.account.partials.sidemenu')
+            <span></span>
+        </div>
 
-        <div class="account-layout">
+        {!! view_render_event('bagisto.shop.customers.account.address.create.before') !!}
-            <div class="account-head mb-15">
-                <span class="back-icon"><a href="{{ route('customer.address.index') }}"><i class="icon icon-menu-back"></i></a></span>
-                <span class="account-heading">{{ __('shop::app.customer.account.address.create.title') }}</span>
-                <span></span>
-            </div>
 
-            {!! view_render_event('bagisto.shop.customers.account.address.create.before') !!}
+        <form id="customer-address-form" method="post" action="{{ route('customer.address.store') }}" @submit.prevent="onSubmit">
+            <div class="account-table-content">
+                @csrf
 
-            <form id="customer-address-form" method="post" action="{{ route('customer.address.store') }}" @submit.prevent="onSubmit">
+                {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.before') !!}
 
-                <div class="account-table-content">
+                <div class="control-group" :class="[errors.has('company_name') ? 'has-error' : '']">
-                    @csrf
+                    <label for="company_name">{{ __('shop::app.customer.account.address.create.company_name') }}</label>
 
-                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.before') !!}
+                    <input value="{{ old('company_name') }}" type="text" class="control" name="company_name" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.company_name') }}&quot;">
-
-                    <div class="control-group" :class="[errors.has('company_name') ? 'has-error' : '']">
-                        <label for="company_name">{{ __('shop::app.customer.account.address.create.company_name') }}</label>
-                        <input value="{{ old('company_name') }}" type="text" class="control" name="company_name" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.company_name') }}&quot;">
-                        <span class="control-error" v-if="errors.has('company_name')">@{{ errors.first('company_name') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.company_name.after') !!}
-
-                    <div class="control-group" :class="[errors.has('first_name') ? 'has-error' : '']">
-                        <label for="first_name" class="required">{{ __('shop::app.customer.account.address.create.first_name') }}</label>
-                        <input value="{{ old('first_name') ?? $currentCustomer->first_name }}" type="text" class="control" name="first_name" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.first_name') }}&quot;">
-                        <span class="control-error" v-if="errors.has('first_name')">@{{ errors.first('first_name') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.first_name.after') !!}
-
-                    <div class="control-group" :class="[errors.has('last_name') ? 'has-error' : '']">
-                        <label for="last_name" class="required">{{ __('shop::app.customer.account.address.create.last_name') }}</label>
-                        <input value="{{ old('last_name') ?? $currentCustomer->last_name }}" type="text" class="control" name="last_name" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.last_name') }}&quot;">
-                        <span class="control-error" v-if="errors.has('last_name')">@{{ errors.first('last_name') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.last_name.after') !!}
-
-                    <div class="control-group" :class="[errors.has('vat_id') ? 'has-error' : '']">
-                        <label for="vat_id">{{ __('shop::app.customer.account.address.create.vat_id') }}
-                            <span class="help-note">{{ __('shop::app.customer.account.address.create.vat_help_note') }}</span>
-                        </label>
-                        <input type="text" class="control" name="vat_id" value="{{ old('vat_id') }}"
-                        v-validate="''" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.vat_id') }}&quot;">
-                        <span class="control-error" v-if="errors.has('vat_id')">@{{ errors.first('vat_id') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.vat_id.after') !!}
-
-                    <div class="control-group" :class="[errors.has('address1[]') ? 'has-error' : '']">
-                        <label for="address1" class="required">{{ __('shop::app.customer.account.address.create.street-address') }}</label>
-                        <input type="text" class="control" name="address1[]" value="{{ old('address1') }}" id="address1" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.street-address') }}&quot;">
-                        <span class="control-error" v-if="errors.has('address1[]')">@{{ errors.first('address1[]') }}</span>
-                    </div>
-
-                    @if (core()->getConfigData('customer.settings.address.street_lines') && core()->getConfigData('customer.settings.address.street_lines') > 1)
-                        <div class="control-group" style="margin-top: -25px;">
-                            @for ($i = 1; $i < core()->getConfigData('customer.settings.address.street_lines'); $i++)
-                                <input type="text" class="control" name="address1[{{ $i }}]" id="address_{{ $i }}">
-                            @endfor
-                        </div>
-                    @endif
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.street-address.after') !!}
-
-                    @include ('shop::customers.account.address.country-state', ['countryCode' => old('country'), 'stateCode' => old('state')])
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.country-state.after') !!}
-
-                    <div class="control-group" :class="[errors.has('city') ? 'has-error' : '']">
-                        <label for="city" class="required">{{ __('shop::app.customer.account.address.create.city') }}</label>
-                        <input value="{{ old('city') }}" type="text" class="control" name="city" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.city') }}&quot;">
-                        <span class="control-error" v-if="errors.has('city')">@{{ errors.first('city') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.city.after') !!}
-
-                    <div class="control-group" :class="[errors.has('postcode') ? 'has-error' : '']">
-                        <label for="postcode" class="required">{{ __('shop::app.customer.account.address.create.postcode') }}</label>
-                        <input value="{{ old('postcode') }}" type="text" class="control" name="postcode" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.postcode') }}&quot;">
-                        <span class="control-error" v-if="errors.has('postcode')">@{{ errors.first('postcode') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.postcode.after') !!}
-
-                    <div class="control-group" :class="[errors.has('phone') ? 'has-error' : '']">
-                        <label for="phone" class="required">{{ __('shop::app.customer.account.address.create.phone') }}</label>
-                        <input value="{{ old('phone') }}" type="text" class="control" name="phone" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.phone') }}&quot;">
-                        <span class="control-error" v-if="errors.has('phone')">@{{ errors.first('phone') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.after') !!}
-
-                    <div class="control-group">
-                        <span class="checkbox">
-                            <input type="checkbox" class="control" id="default_address" name="default_address" {{ old('default_address') ? 'checked' : '' }} >
-
-                            <label class="checkbox-view" for="default_address"></label>
-
-                            {{ __('shop::app.customer.account.address.default-address') }}
-                        </span>
-                    </div>
-
-                    <div class="button-group">
-                        <input class="btn btn-primary btn-lg" type="submit" value="{{ __('shop::app.customer.account.address.create.submit') }}">
-                        {{-- <button class="btn btn-primary btn-lg" type="submit">
-                            {{ __('shop::app.customer.account.address.edit.submit') }}
-                        </button> --}}
-                    </div>
 
+                    <span class="control-error" v-if="errors.has('company_name')">@{{ errors.first('company_name') }}</span>
                 </div>
 
-            </form>
+                {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.company_name.after') !!}
 
-            {!! view_render_event('bagisto.shop.customers.account.address.create.after') !!}
+                <div class="control-group" :class="[errors.has('first_name') ? 'has-error' : '']">
+                    <label for="first_name" class="required">{{ __('shop::app.customer.account.address.create.first_name') }}</label>
 
-        </div>
+                    <input value="{{ old('first_name') ?? $currentCustomer->first_name }}" type="text" class="control" name="first_name" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.first_name') }}&quot;">
+
+                    <span class="control-error" v-if="errors.has('first_name')">@{{ errors.first('first_name') }}</span>
+                </div>
+
+                {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.first_name.after') !!}
+
+                <div class="control-group" :class="[errors.has('last_name') ? 'has-error' : '']">
+                    <label for="last_name" class="required">{{ __('shop::app.customer.account.address.create.last_name') }}</label>
+
+                    <input value="{{ old('last_name') ?? $currentCustomer->last_name }}" type="text" class="control" name="last_name" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.last_name') }}&quot;">
+
+                    <span class="control-error" v-if="errors.has('last_name')">@{{ errors.first('last_name') }}</span>
+                </div>
+
+                {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.last_name.after') !!}
+
+                <div class="control-group" :class="[errors.has('vat_id') ? 'has-error' : '']">
+                    <label for="vat_id">{{ __('shop::app.customer.account.address.create.vat_id') }}
+                        <span class="help-note">{{ __('shop::app.customer.account.address.create.vat_help_note') }}</span>
+                    </label>
+
+                    <input
+                        type="text"
+                        class="control"
+                        name="vat_id"
+                        value="{{ old('vat_id') }}"
+                        v-validate="''"
+                        data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.vat_id') }}&quot;">
+
+                    <span class="control-error" v-if="errors.has('vat_id')">@{{ errors.first('vat_id') }}</span>
+                </div>
+
+                {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.vat_id.after') !!}
+
+                <div class="control-group" :class="[errors.has('address1[]') ? 'has-error' : '']">
+                    <label for="address1" class="required">{{ __('shop::app.customer.account.address.create.street-address') }}</label>
+
+                    <input type="text" class="control" name="address1[]" value="{{ old('address1') }}" id="address1" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.street-address') }}&quot;">
+
+                    <span class="control-error" v-if="errors.has('address1[]')">@{{ errors.first('address1[]') }}</span>
+                </div>
+
+                @if (core()->getConfigData('customer.settings.address.street_lines') && core()->getConfigData('customer.settings.address.street_lines') > 1)
+                    <div class="control-group" style="margin-top: -25px;">
+                        @for ($i = 1; $i < core()->getConfigData('customer.settings.address.street_lines'); $i++)
+                            <input type="text" class="control" name="address1[{{ $i }}]" id="address_{{ $i }}">
+                        @endfor
+                    </div>
+                @endif
+
+                {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.street-address.after') !!}
+
+                @include ('shop::customers.account.address.country-state', ['countryCode' => old('country'), 'stateCode' => old('state')])
+
+                {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.country-state.after') !!}
+
+                <div class="control-group" :class="[errors.has('city') ? 'has-error' : '']">
+                    <label for="city" class="required">{{ __('shop::app.customer.account.address.create.city') }}</label>
+
+                    <input value="{{ old('city') }}" type="text" class="control" name="city" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.city') }}&quot;">
+
+                    <span class="control-error" v-if="errors.has('city')">@{{ errors.first('city') }}</span>
+                </div>
+
+                {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.city.after') !!}
+
+                <div class="control-group" :class="[errors.has('postcode') ? 'has-error' : '']">
+                    <label for="postcode" class="required">{{ __('shop::app.customer.account.address.create.postcode') }}</label>
+
+                    <input value="{{ old('postcode') }}" type="text" class="control" name="postcode" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.postcode') }}&quot;">
+
+                    <span class="control-error" v-if="errors.has('postcode')">@{{ errors.first('postcode') }}</span>
+                </div>
+
+                {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.postcode.after') !!}
+
+                <div class="control-group" :class="[errors.has('phone') ? 'has-error' : '']">
+                    <label for="phone" class="required">{{ __('shop::app.customer.account.address.create.phone') }}</label>
+
+                    <input value="{{ old('phone') }}" type="text" class="control" name="phone" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.phone') }}&quot;">
+
+                    <span class="control-error" v-if="errors.has('phone')">@{{ errors.first('phone') }}</span>
+                </div>
+
+                {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.after') !!}
+
+                <div class="control-group">
+                    <span class="checkbox">
+                        <input type="checkbox" class="control" id="default_address" name="default_address" {{ old('default_address') ? 'checked' : '' }} >
+
+                        <label class="checkbox-view" for="default_address"></label>
+
+                        {{ __('shop::app.customer.account.address.default-address') }}
+                    </span>
+                </div>
+
+                <div class="button-group">
+                    <input class="btn btn-primary btn-lg" type="submit" value="{{ __('shop::app.customer.account.address.create.submit') }}">
+                </div>
+            </div>
+        </form>
+
+        {!! view_render_event('bagisto.shop.customers.account.address.create.after') !!}
     </div>
-
 @endsection

packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php

@@ -1,135 +1,149 @@
-@extends('shop::layouts.master')
+@extends('shop::customers.account.index')
 
 @section('page_title')
     {{ __('shop::app.customer.account.address.edit.page-title') }}
 @endsection
 
-@section('content-wrapper')
+@section('account-content')
+    <div class="account-layout">
+        <div class="account-head mb-15">
+            <span class="back-icon"><a href="{{ route('customer.address.index') }}"><i class="icon icon-menu-back"></i></a></span>
 
-    <div class="account-content">
+            <span class="account-heading">{{ __('shop::app.customer.account.address.edit.title') }}</span>
-        @include('shop::customers.account.partials.sidemenu')
 
-        <div class="account-layout">
+            <span></span>
+        </div>
 
-            <div class="account-head mb-15">
+        {!! view_render_event('bagisto.shop.customers.account.address.edit.before', ['address' => $address]) !!}
-                <span class="back-icon"><a href="{{ route('customer.address.index') }}"><i class="icon icon-menu-back"></i></a></span>
-                <span class="account-heading">{{ __('shop::app.customer.account.address.edit.title') }}</span>
-                <span></span>
-            </div>
 
-            {!! view_render_event('bagisto.shop.customers.account.address.edit.before', ['address' => $address]) !!}
+        <form id="customer-address-form" method="post" action="{{ route('customer.address.update', $address->id) }}" @submit.prevent="onSubmit">
 
-            <form id="customer-address-form" method="post" action="{{ route('customer.address.update', $address->id) }}" @submit.prevent="onSubmit">
+            <div class="account-table-content">
+                @method('PUT')
 
-                <div class="account-table-content">
+                @csrf
-                    @method('PUT')
-                    @csrf
 
-                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.before', ['address' => $address]) !!}
+                {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.before', ['address' => $address]) !!}
 
-                    <div class="control-group" :class="[errors.has('company_name') ? 'has-error' : '']">
+                <div class="control-group" :class="[errors.has('company_name') ? 'has-error' : '']">
-                        <label for="company_name">{{ __('shop::app.customer.account.address.edit.company_name') }}</label>
+                    <label for="company_name">{{ __('shop::app.customer.account.address.edit.company_name') }}</label>
-                        <input type="text" value="{{ old('company_name') ?: $address->company_name }}"  class="control" name="company_name" data-vv-as="&quot;{{ __('shop::app.customer.account.address.edit.company_name') }}&quot;">
-                        <span class="control-error" v-if="errors.has('company_name')">@{{ errors.first('company_name') }}</span>
-                    </div>
 
-                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.company_name.after') !!}
+                    <input type="text" value="{{ old('company_name') ?: $address->company_name }}"  class="control" name="company_name" data-vv-as="&quot;{{ __('shop::app.customer.account.address.edit.company_name') }}&quot;">
 
-                    <div class="control-group" :class="[errors.has('first_name') ? 'has-error' : '']">
+                    <span class="control-error" v-if="errors.has('company_name')">@{{ errors.first('company_name') }}</span>
-                        <label for="first_name" class="required">{{ __('shop::app.customer.account.address.create.first_name') }}</label>
-                        <input type="text" class="control" name="first_name" v-validate="'required'" value="{{ old('first_name') ?: $address->first_name }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.first_name') }}&quot;">
-                        <span class="control-error" v-if="errors.has('first_name')">@{{ errors.first('first_name') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.first_name.after') !!}
-
-                    <div class="control-group" :class="[errors.has('last_name') ? 'has-error' : '']">
-                        <label for="last_name" class="required">{{ __('shop::app.customer.account.address.create.last_name') }}</label>
-                        <input type="text" class="control" name="last_name" v-validate="'required'" value="{{ old('last_name') ?: $address->last_name }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.last_name') }}&quot;">
-                        <span class="control-error" v-if="errors.has('last_name')">@{{ errors.first('last_name') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.last_name.after') !!}
-
-                    <div class="control-group" :class="[errors.has('vat_id') ? 'has-error' : '']">
-                        <label for="vat_id">{{ __('shop::app.customer.account.address.create.vat_id') }}
-                            <span class="help-note">{{ __('shop::app.customer.account.address.create.vat_help_note') }}</span>
-                        </label>
-                        <input type="text" class="control" name="vat_id" value="{{ old('vat_id') ?: $address->vat_id }}"
-                        v-validate="''" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.vat_id') }}&quot;">
-                        <span class="control-error" v-if="errors.has('vat_id')">@{{ errors.first('vat_id') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.vat_id.after') !!}
-
-                    <?php $addresses = explode(PHP_EOL, $address->address1); ?>
-
-                    <div class="control-group" :class="[errors.has('address1[]') ? 'has-error' : '']">
-                        <label for="address_0" class="required">{{ __('shop::app.customer.account.address.edit.street-address') }}</label>
-                        <input type="text" class="control" name="address1[]" id="address_0" v-validate="'required'" value="{{ isset($addresses[0]) ? $addresses[0] : '' }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.street-address') }}&quot;">
-                        <span class="control-error" v-if="errors.has('address1[]')">@{{ errors.first('address1[]') }}</span>
-                    </div>
-
-                    @if (core()->getConfigData('customer.settings.address.street_lines') && core()->getConfigData('customer.settings.address.street_lines') > 1)
-                        <div class="control-group" style="margin-top: -25px;">
-                            @for ($i = 1; $i < core()->getConfigData('customer.settings.address.street_lines'); $i++)
-                                <input type="text" class="control" name="address1[{{ $i }}]" id="address_{{ $i }}" value="{{ isset($addresses[$i]) ? $addresses[$i] : '' }}">
-                            @endfor
-                        </div>
-                    @endif
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.street-addres.after') !!}
-
-                    @include ('shop::customers.account.address.country-state', ['countryCode' => old('country') ?? $address->country, 'stateCode' => old('state') ?? $address->state])
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.country-state.after') !!}
-
-                    <div class="control-group" :class="[errors.has('city') ? 'has-error' : '']">
-                        <label for="city" class="required">{{ __('shop::app.customer.account.address.create.city') }}</label>
-                        <input type="text" class="control" name="city" v-validate="'required|regex:^[a-zA-Z \-]*$'" value="{{ old('city') ?: $address->city }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.city') }}&quot;">
-                        <span class="control-error" v-if="errors.has('city')">@{{ errors.first('city') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.create.after') !!}
-
-                    <div class="control-group" :class="[errors.has('postcode') ? 'has-error' : '']">
-                        <label for="postcode" class="required">{{ __('shop::app.customer.account.address.create.postcode') }}</label>
-                        <input type="text" class="control" name="postcode" v-validate="'required'" value="{{ old('postcode') ?: $address->postcode }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.postcode') }}&quot;">
-                        <span class="control-error" v-if="errors.has('postcode')">@{{ errors.first('postcode') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.postcode.after') !!}
-
-                    <div class="control-group" :class="[errors.has('phone') ? 'has-error' : '']">
-                        <label for="phone" class="required">{{ __('shop::app.customer.account.address.create.phone') }}</label>
-                        <input type="text" class="control" name="phone" v-validate="'required'" value="{{ old('phone') ?: $address->phone }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.phone') }}&quot;">
-                        <span class="control-error" v-if="errors.has('phone')">@{{ errors.first('phone') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.after', ['address' => $address]) !!}
-
-                    <div class="control-group">
-                        <span class="checkbox">
-                            <input type="checkbox" class="control" id="default_address" name="default_address" {{ $address->default_address ? 'checked' : '' }} >
-
-                            <label class="checkbox-view" for="default_address"></label>
-
-                            {{ __('shop::app.customer.account.address.default-address') }}
-                        </span>
-                    </div>
-
-                    <div class="button-group">
-                        <button class="btn btn-primary btn-lg" type="submit">
-                            {{ __('shop::app.customer.account.address.create.submit') }}
-                        </button>
-                    </div>
                 </div>
 
-            </form>
+                {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.company_name.after') !!}
 
-            {!! view_render_event('bagisto.shop.customers.account.address.edit.after', ['address' => $address]) !!}
+                <div class="control-group" :class="[errors.has('first_name') ? 'has-error' : '']">
+                    <label for="first_name" class="required">{{ __('shop::app.customer.account.address.create.first_name') }}</label>
 
-        </div>
+                    <input type="text" class="control" name="first_name" v-validate="'required'" value="{{ old('first_name') ?: $address->first_name }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.first_name') }}&quot;">
+
+                    <span class="control-error" v-if="errors.has('first_name')">@{{ errors.first('first_name') }}</span>
+                </div>
+
+                {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.first_name.after') !!}
+
+                <div class="control-group" :class="[errors.has('last_name') ? 'has-error' : '']">
+                    <label for="last_name" class="required">{{ __('shop::app.customer.account.address.create.last_name') }}</label>
+
+                    <input type="text" class="control" name="last_name" v-validate="'required'" value="{{ old('last_name') ?: $address->last_name }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.last_name') }}&quot;">
+
+                    <span class="control-error" v-if="errors.has('last_name')">@{{ errors.first('last_name') }}</span>
+                </div>
+
+                {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.last_name.after') !!}
+
+                <div class="control-group" :class="[errors.has('vat_id') ? 'has-error' : '']">
+                    <label for="vat_id">{{ __('shop::app.customer.account.address.create.vat_id') }}
+                        <span class="help-note">{{ __('shop::app.customer.account.address.create.vat_help_note') }}</span>
+                    </label>
+
+                    <input
+                        type="text"
+                        class="control"
+                        name="vat_id"
+                        value="{{ old('vat_id') ?: $address->vat_id }}"
+                        v-validate="''" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.vat_id') }}&quot;">
+
+                    <span class="control-error" v-if="errors.has('vat_id')">@{{ errors.first('vat_id') }}</span>
+                </div>
+
+                {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.vat_id.after') !!}
+
+                <?php $addresses = explode(PHP_EOL, $address->address1); ?>
+
+                <div class="control-group" :class="[errors.has('address1[]') ? 'has-error' : '']">
+                    <label for="address_0" class="required">{{ __('shop::app.customer.account.address.edit.street-address') }}</label>
+
+                    <input type="text" class="control" name="address1[]" id="address_0" v-validate="'required'" value="{{ isset($addresses[0]) ? $addresses[0] : '' }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.street-address') }}&quot;">
+
+                    <span class="control-error" v-if="errors.has('address1[]')">@{{ errors.first('address1[]') }}</span>
+                </div>
+
+                @if (core()->getConfigData('customer.settings.address.street_lines') && core()->getConfigData('customer.settings.address.street_lines') > 1)
+                    <div class="control-group" style="margin-top: -25px;">
+                        @for ($i = 1; $i < core()->getConfigData('customer.settings.address.street_lines'); $i++)
+                            <input type="text" class="control" name="address1[{{ $i }}]" id="address_{{ $i }}" value="{{ isset($addresses[$i]) ? $addresses[$i] : '' }}">
+                        @endfor
+                    </div>
+                @endif
+
+                {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.street-addres.after') !!}
+
+                @include ('shop::customers.account.address.country-state', ['countryCode' => old('country') ?? $address->country, 'stateCode' => old('state') ?? $address->state])
+
+                {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.country-state.after') !!}
+
+                <div class="control-group" :class="[errors.has('city') ? 'has-error' : '']">
+                    <label for="city" class="required">{{ __('shop::app.customer.account.address.create.city') }}</label>
+
+                    <input type="text" class="control" name="city" v-validate="'required|regex:^[a-zA-Z \-]*$'" value="{{ old('city') ?: $address->city }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.city') }}&quot;">
+
+                    <span class="control-error" v-if="errors.has('city')">@{{ errors.first('city') }}</span>
+                </div>
+
+                {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.create.after') !!}
+
+                <div class="control-group" :class="[errors.has('postcode') ? 'has-error' : '']">
+                    <label for="postcode" class="required">{{ __('shop::app.customer.account.address.create.postcode') }}</label>
+
+                    <input type="text" class="control" name="postcode" v-validate="'required'" value="{{ old('postcode') ?: $address->postcode }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.postcode') }}&quot;">
+
+                    <span class="control-error" v-if="errors.has('postcode')">@{{ errors.first('postcode') }}</span>
+                </div>
+
+                {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.postcode.after') !!}
+
+                <div class="control-group" :class="[errors.has('phone') ? 'has-error' : '']">
+                    <label for="phone" class="required">{{ __('shop::app.customer.account.address.create.phone') }}</label>
+
+                    <input type="text" class="control" name="phone" v-validate="'required'" value="{{ old('phone') ?: $address->phone }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.phone') }}&quot;">
+
+                    <span class="control-error" v-if="errors.has('phone')">@{{ errors.first('phone') }}</span>
+                </div>
+
+                {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.after', ['address' => $address]) !!}
+
+                <div class="control-group">
+                    <span class="checkbox">
+                        <input type="checkbox" class="control" id="default_address" name="default_address" {{ $address->default_address ? 'checked' : '' }} >
+
+                        <label class="checkbox-view" for="default_address"></label>
+
+                        {{ __('shop::app.customer.account.address.default-address') }}
+                    </span>
+                </div>
+
+                <div class="button-group">
+                    <button class="btn btn-primary btn-lg" type="submit">
+                        {{ __('shop::app.customer.account.address.create.submit') }}
+                    </button>
+                </div>
+            </div>
+        </form>
+
+        {!! view_render_event('bagisto.shop.customers.account.address.edit.after', ['address' => $address]) !!}
     </div>
-
 @endsection

packages/Webkul/Shop/src/Resources/views/customers/account/address/index.blade.php

@@ -1,108 +1,108 @@
-@extends('shop::layouts.master')
+@extends('shop::customers.account.index')
 
 @section('page_title')
     {{ __('shop::app.customer.account.address.index.page-title') }}
 @endsection
 
-@section('content-wrapper')
+@section('account-content')
+    <div class="account-layout">
+        <div class="account-head">
+            <span class="back-icon">
+                <a href="{{ route('customer.profile.index') }}">
+                    <i class="icon icon-menu-back"></i>
+                </a>
+            </span>
 
-    <div class="account-content">
+            <span class="account-heading">{{ __('shop::app.customer.account.address.index.title') }}</span>
 
-        @include('shop::customers.account.partials.sidemenu')
+            @if (! $addresses->isEmpty())
-
+                <span class="account-action">
-        <div class="account-layout">
-
-            <div class="account-head">
-                <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
-                <span
-                    class="account-heading">{{ __('shop::app.customer.account.address.index.title') }}</span>
-
-                @if (! $addresses->isEmpty())
-                    <span class="account-action">
                     <a href="{{ route('customer.address.create') }}">{{ __('shop::app.customer.account.address.index.add') }}</a>
                 </span>
-                @else
+            @else
-                    <span></span>
+                <span></span>
-                @endif
+            @endif
-                <div class="horizontal-rule"></div>
-            </div>
 
-            {!! view_render_event('bagisto.shop.customers.account.address.list.before', ['addresses' => $addresses]) !!}
+            <div class="horizontal-rule"></div>
+        </div>
 
-            <div class="account-table-content">
+        {!! view_render_event('bagisto.shop.customers.account.address.list.before', ['addresses' => $addresses]) !!}
-                @if ($addresses->isEmpty())
-                    <div>{{ __('shop::app.customer.account.address.index.empty') }}</div>
-                    <br/>
-                    <a href="{{ route('customer.address.create') }}">{{ __('shop::app.customer.account.address.index.add') }}</a>
-                @else
-                    <div class="address-holder">
-                        @foreach ($addresses as $address)
-                            <div class="address-card">
-                                <div class="details">
-                                    <span
-                                        class="bold">{{ auth()->guard('customer')->user()->name }}</span>
-                                    <ul class="address-card-list">
-                                        <li class="mt-5">
-                                            {{ $address->company_name }}
-                                        </li>
 
-                                        <li class="mt-5">
+        <div class="account-table-content">
-                                            {{ $address->first_name }}
+            @if ($addresses->isEmpty())
-                                        </li>
+                <div>{{ __('shop::app.customer.account.address.index.empty') }}</div>
 
-                                        <li class="mt-5">
+                <br/>
-                                            {{ $address->last_name }}
-                                        </li>
 
-                                        <li class="mt-5">
+                <a href="{{ route('customer.address.create') }}">{{ __('shop::app.customer.account.address.index.add') }}</a>
-                                            {{ $address->address1 }},
+            @else
-                                        </li>
+                <div class="address-holder">
+                    @foreach ($addresses as $address)
+                        <div class="address-card">
+                            <div class="details">
+                                <span class="bold">{{ auth()->guard('customer')->user()->name }}</span>
 
-                                        <li class="mt-5">
+                                <ul class="address-card-list">
-                                            {{ $address->city }}
+                                    <li class="mt-5">
-                                        </li>
+                                        {{ $address->company_name }}
+                                    </li>
 
-                                        <li class="mt-5">
+                                    <li class="mt-5">
-                                            {{ $address->state }}
+                                        {{ $address->first_name }}
-                                        </li>
+                                    </li>
 
-                                        <li class="mt-5">
+                                    <li class="mt-5">
-                                            {{ core()->country_name($address->country) }} {{ $address->postcode }}
+                                        {{ $address->last_name }}
-                                        </li>
+                                    </li>
 
-                                        <li class="mt-10">
+                                    <li class="mt-5">
-                                            {{ __('shop::app.customer.account.address.index.contact') }}
+                                        {{ $address->address1 }},
-                                            : {{ $address->phone }}
+                                    </li>
-                                        </li>
-                                    </ul>
 
-                                    <div class="control-links mt-20">
+                                    <li class="mt-5">
-                                        <span>
+                                        {{ $address->city }}
-                                            <a href="{{ route('customer.address.edit', $address->id) }}">
+                                    </li>
-                                                {{ __('shop::app.customer.account.address.index.edit') }}
-                                            </a>
-                                        </span>
 
-                                        <span>
+                                    <li class="mt-5">
-                                            <a href="javascript:void(0);" onclick="deleteAddress('{{ __('shop::app.customer.account.address.index.confirm-delete') }}')">
+                                        {{ $address->state }}
-                                                {{ __('shop::app.customer.account.address.index.delete') }}
+                                    </li>
-                                            </a>
 
-                                            <form id="deleteAddressForm" action="{{ route('address.delete', $address->id) }}" method="post">
+                                    <li class="mt-5">
-                                                @method('delete')
+                                        {{ core()->country_name($address->country) }} {{ $address->postcode }}
-                                                @csrf
+                                    </li>
-                                            </form>
+
-                                        </span>
+                                    <li class="mt-10">
-                                    </div>
+                                        {{ __('shop::app.customer.account.address.index.contact') }}
+                                        : {{ $address->phone }}
+                                    </li>
+                                </ul>
+
+                                <div class="control-links mt-20">
+                                    <span>
+                                        <a href="{{ route('customer.address.edit', $address->id) }}">
+                                            {{ __('shop::app.customer.account.address.index.edit') }}
+                                        </a>
+                                    </span>
+
+                                    <span>
+                                        <a href="javascript:void(0);" onclick="deleteAddress('{{ __('shop::app.customer.account.address.index.confirm-delete') }}')">
+                                            {{ __('shop::app.customer.account.address.index.delete') }}
+                                        </a>
+
+                                        <form id="deleteAddressForm" action="{{ route('address.delete', $address->id) }}" method="post">
+                                            @method('delete')
+                                            @csrf
+                                        </form>
+                                    </span>
                                 </div>
                             </div>
-                        @endforeach
+                        </div>
-                    </div>
+                    @endforeach
-                @endif
+                </div>
-            </div>
+            @endif
-
-            {!! view_render_event('bagisto.shop.customers.account.address.list.after', ['addresses' => $addresses]) !!}
         </div>
+
+        {!! view_render_event('bagisto.shop.customers.account.address.list.after', ['addresses' => $addresses]) !!}
     </div>
 @endsection
 

packages/Webkul/Shop/src/Resources/views/customers/account/compare/index.blade.php

@@ -1,4 +1,4 @@
-@extends('shop::layouts.master')
+@extends('shop::customers.account.index')
 
 @include('shop::guest.compare.compare-products')
 
@@ -6,24 +6,16 @@
     {{ __('shop::app.customer.compare.compare_similar_items') }}
 @endsection
 
-@section('content-wrapper')
+@section('account-content')
+    <div class="account-layout">
+        {!! view_render_event('bagisto.shop.customers.account.comparison.list.before') !!}
 
-    <div class="account-content">
+        <div class="account-items-list">
-        @include('shop::customers.account.partials.sidemenu')
+            <div class="account-table-content">
-
+                <compare-product></compare-product>
-        <div class="account-layout">
-            {!! view_render_event('bagisto.shop.customers.account.comparison.list.before') !!}
-
-            <div class="account-items-list">
-                <div class="account-table-content">
-                    <compare-product></compare-product>
-                </div>
             </div>
-
-            {!! view_render_event('bagisto.shop.customers.account.comparison.list.after') !!}
-
         </div>
 
+        {!! view_render_event('bagisto.shop.customers.account.comparison.list.after') !!}
     </div>
-
 @endsection

packages/Webkul/Shop/src/Resources/views/customers/account/downloadable_products/index.blade.php

@@ -1,39 +1,29 @@
-@extends('shop::layouts.master')
+@extends('shop::customers.account.index')
 
 @section('page_title')
     {{ __('shop::app.customer.account.downloadable_products.title') }}
 @endsection
 
-@section('content-wrapper')
+@section('account-content')
+    <div class="account-layout">
+        <div class="account-head mb-10">
+            <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
 
-    <div class="account-content">
+            <span class="account-heading">
-        @include('shop::customers.account.partials.sidemenu')
+                {{ __('shop::app.customer.account.downloadable_products.title') }}
-
+            </span>
-        <div class="account-layout">
-
-            <div class="account-head mb-10">
-                <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
-                <span class="account-heading">
-                    {{ __('shop::app.customer.account.downloadable_products.title') }}
-                </span>
-
-                <div class="horizontal-rule"></div>
-            </div>
-
-            {!! view_render_event('bagisto.shop.customers.account.downloadable_products.list.before') !!}
-
-            <div class="account-items-list">
-                <div class="account-table-content">
-
-                    {!! app('Webkul\Shop\DataGrids\DownloadableProductDataGrid')->render() !!}
-
-                </div>
-            </div>
-
-            {!! view_render_event('bagisto.shop.customers.account.downloadable_products.list.after') !!}
 
+            <div class="horizontal-rule"></div>
         </div>
 
-    </div>
+        {!! view_render_event('bagisto.shop.customers.account.downloadable_products.list.before') !!}
 
+        <div class="account-items-list">
+            <div class="account-table-content">
+                {!! app('Webkul\Shop\DataGrids\DownloadableProductDataGrid')->render() !!}
+            </div>
+        </div>
+
+        {!! view_render_event('bagisto.shop.customers.account.downloadable_products.list.after') !!}
+    </div>
 @endsection

packages/Webkul/Shop/src/Resources/views/customers/account/index.blade.php

@@ -3,7 +3,7 @@
 @section('content-wrapper')
     <div class="account-content">
         @include('shop::customers.account.partials.sidemenu')
-        <h1>Account Index Page</h1>
+
+        @yield('account-content')
     </div>
-    
 @endsection

packages/Webkul/Shop/src/Resources/views/customers/account/orders/index.blade.php

@@ -1,39 +1,29 @@
-@extends('shop::layouts.master')
+@extends('shop::customers.account.index')
 
 @section('page_title')
     {{ __('shop::app.customer.account.order.index.page-title') }}
 @endsection
 
-@section('content-wrapper')
+@section('account-content')
+    <div class="account-layout">
+        <div class="account-head mb-10">
+            <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
 
-    <div class="account-content">
+            <span class="account-heading">
-        @include('shop::customers.account.partials.sidemenu')
+                {{ __('shop::app.customer.account.order.index.title') }}
-
+            </span>
-        <div class="account-layout">
-
-            <div class="account-head mb-10">
-                <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
-                <span class="account-heading">
-                    {{ __('shop::app.customer.account.order.index.title') }}
-                </span>
-
-                <div class="horizontal-rule"></div>
-            </div>
-
-            {!! view_render_event('bagisto.shop.customers.account.orders.list.before') !!}
-
-            <div class="account-items-list">
-                <div class="account-table-content">
-
-                    {!! app('Webkul\Shop\DataGrids\OrderDataGrid')->render() !!}
-
-                </div>
-            </div>
-
-            {!! view_render_event('bagisto.shop.customers.account.orders.list.after') !!}
 
+            <div class="horizontal-rule"></div>
         </div>
 
-    </div>
+        {!! view_render_event('bagisto.shop.customers.account.orders.list.before') !!}
 
+        <div class="account-items-list">
+            <div class="account-table-content">
+                {!! app('Webkul\Shop\DataGrids\OrderDataGrid')->render() !!}
+            </div>
+        </div>
+
+        {!! view_render_event('bagisto.shop.customers.account.orders.list.after') !!}
+    </div>
 @endsection

packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php

@@ -83,7 +83,7 @@
                 border-right: solid 1px #d3d3d3;
             }
 
-           .sale-summary {
+            .sale-summary {
                 margin-top: 40px;
                 float: right;
             }
@@ -122,34 +122,43 @@
 
     <body style="background-image: none;background-color: #fff;">
         <div class="container">
-
             <div class="header">
                 <div class="row">
                     <div class="col-12">
                         <h1 class="text-center">{{ __('admin::app.sales.invoices.invoice') }}</h1>
                     </div>
                 </div>
+
                 @if (core()->getConfigData('sales.invoice_setttings.invoice_slip_design.logo'))
                     <div class="image">
                         <img class="logo" src="{{ Storage::url(core()->getConfigData('sales.invoice_setttings.invoice_slip_design.logo')) }}" alt=""/>
                     </div>
                 @endif
+
                 <div class="merchant-details">
                     <div><span class="merchant-details-title">{{ core()->getConfigData('sales.shipping.origin.store_name') ? core()->getConfigData('sales.shipping.origin.store_name') : '' }}</span></div>
+
                     <div>{{ core()->getConfigData('sales.shipping.origin.address1') ? core()->getConfigData('sales.shipping.origin.address1') : '' }}</div>
+
                     <div>
                         <span>{{ core()->getConfigData('sales.shipping.origin.zipcode') ? core()->getConfigData('sales.shipping.origin.zipcode') : '' }}</span>
-                        <span>{{ core()->getConfigData('sales.shipping.origin.city') ? core()->getConfigData('sales.shipping.origin.city') : '' }}</span></div>
+                        <span>{{ core()->getConfigData('sales.shipping.origin.city') ? core()->getConfigData('sales.shipping.origin.city') : '' }}</span>
+                    </div>
+
                     <div>{{ core()->getConfigData('sales.shipping.origin.state') ? core()->getConfigData('sales.shipping.origin.state') : '' }}</div>
+
                     <div>{{ core()->getConfigData('sales.shipping.origin.country') ?  core()->country_name(core()->getConfigData('sales.shipping.origin.country')) : '' }}</div>
                 </div>
+
                 <div class="merchant-details">
                     @if (core()->getConfigData('sales.shipping.origin.contact'))
                         <div><span class="merchant-details-title">{{ __('admin::app.admin.system.contact-number') }}:</span> {{ core()->getConfigData('sales.shipping.origin.contact') }}</div>
                     @endif
+
                     @if (core()->getConfigData('sales.shipping.origin.vat_number'))
                         <div><span class="merchant-details-title">{{ __('admin::app.admin.system.vat-number') }}:</span> {{ core()->getConfigData('sales.shipping.origin.vat_number') }}</div>
                     @endif
+
                     @if (core()->getConfigData('sales.shipping.origin.bank_details'))
                         <div><span class="merchant-details-title">{{ __('admin::app.admin.system.bank-details') }}:</span> {{ core()->getConfigData('sales.shipping.origin.bank_details') }}</div>
                     @endif
@@ -157,7 +166,6 @@
             </div>
 
             <div class="invoice-summary">
-
                 <div class="row">
                     <span class="label">{{ __('shop::app.customer.account.order.view.invoice-id') }} -</span>
                     <span class="value">#{{ $invoice->increment_id ?? $invoice->id }}</span>
@@ -279,7 +287,6 @@
                         </thead>
 
                         <tbody>
-
                             @foreach ($invoice->items as $item)
                                 <tr>
                                     <td>{{ $item->child ? $item->child->sku : $item->sku }}</td>
@@ -309,12 +316,10 @@
                                     <td>{{ core()->formatPrice(($item->total + $item->tax_amount), $invoice->order->order_currency_code) }}</td>
                                 </tr>
                             @endforeach
-
                         </tbody>
                     </table>
                 </div>
 
-
                 <table class="sale-summary">
                     <tr>
                         <td>{{ __('shop::app.customer.account.order.view.subtotal') }}</td>
@@ -348,9 +353,7 @@
                         <td>{{ core()->formatPrice($invoice->grand_total, $invoice->order->order_currency_code) }}</td>
                     </tr>
                 </table>
-
             </div>
-
         </div>
     </body>
 </html>

packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php

@@ -1,568 +1,537 @@
-@extends('shop::layouts.master')
+@extends('shop::customers.account.index')
 
 @section('page_title')
     {{ __('shop::app.customer.account.order.view.page-tile', ['order_id' => $order->increment_id]) }}
 @endsection
 
-@section('content-wrapper')
+@section('account-content')
+    <div class="account-layout">
 
-    <div class="account-content">
+        <div class="account-head">
-        @include('shop::customers.account.partials.sidemenu')
+            <span class="back-icon"><a href="{{ route('customer.orders.index') }}"><i class="icon icon-menu-back"></i></a></span>
 
-        <div class="account-layout">
+            <span class="account-heading">
+                {{ __('shop::app.customer.account.order.view.page-tile', ['order_id' => $order->increment_id]) }}
+            </span>
 
-            <div class="account-head">
+            <span></span>
-                <span class="back-icon"><a href="{{ route('customer.orders.index') }}"><i class="icon icon-menu-back"></i></a></span>
 
-                <span class="account-heading">
+            @if ($order->canCancel())
-                    {{ __('shop::app.customer.account.order.view.page-tile', ['order_id' => $order->increment_id]) }}
+                <form id="cancelOrderForm" action="{{ route('customer.orders.cancel', $order->id) }}" method="post">
-                </span>
+                    @csrf
-                <span></span>
+                </form>
 
+                <a href="javascript:void(0);" class="btn btn-lg btn-primary" onclick="cancelOrder('{{ __('shop::app.customer.account.order.view.cancel-confirm-msg') }}')" style="float: right;">
+                    {{ __('shop::app.customer.account.order.view.cancel-btn-title') }}
+                </a>
+            @endif
+        </div>
 
-                @if ($order->canCancel())
+        {!! view_render_event('bagisto.shop.customers.account.orders.view.before', ['order' => $order]) !!}
-                    <form id="cancelOrderForm" action="{{ route('customer.orders.cancel', $order->id) }}" method="post">
-                        @csrf
-                    </form>
 
-                    <a href="javascript:void(0);" class="btn btn-lg btn-primary" onclick="cancelOrder('{{ __('shop::app.customer.account.order.view.cancel-confirm-msg') }}')" style="float: right;">
+        <div class="sale-container">
-                        {{ __('shop::app.customer.account.order.view.cancel-btn-title') }}
+            <tabs>
-                    </a>
+                <tab name="{{ __('shop::app.customer.account.order.view.info') }}" :selected="true">
-                @endif
+                    <div class="sale-section">
-            </div>
+                        <div class="section-content">
+                            <div class="row">
+                                <span class="title">
+                                    {{ __('shop::app.customer.account.order.view.placed-on') }}
+                                </span>
 
-            {!! view_render_event('bagisto.shop.customers.account.orders.view.before', ['order' => $order]) !!}
+                                <span class="value">
-
+                                    {{ core()->formatDate($order->created_at, 'd M Y') }}
-            <div class="sale-container">
+                                </span>
-
-                <tabs>
-                    <tab name="{{ __('shop::app.customer.account.order.view.info') }}" :selected="true">
-
-                        <div class="sale-section">
-                            <div class="section-content">
-                                <div class="row">
-                                    <span class="title">
-                                        {{ __('shop::app.customer.account.order.view.placed-on') }}
-                                    </span>
-
-                                    <span class="value">
-                                        {{ core()->formatDate($order->created_at, 'd M Y') }}
-                                    </span>
-                                </div>
                             </div>
                         </div>
+                    </div>
 
-                        <div class="sale-section">
+                    <div class="sale-section">
-                            <div class="secton-title">
+                        <div class="secton-title">
-                                <span>{{ __('shop::app.customer.account.order.view.products-ordered') }}</span>
+                            <span>{{ __('shop::app.customer.account.order.view.products-ordered') }}</span>
+                        </div>
+
+                        <div class="section-content">
+                            <div class="table">
+                                <table>
+                                    <thead>
+                                        <tr>
+                                            <th>{{ __('shop::app.customer.account.order.view.SKU') }}</th>
+                                            <th>{{ __('shop::app.customer.account.order.view.product-name') }}</th>
+                                            <th>{{ __('shop::app.customer.account.order.view.price') }}</th>
+                                            <th>{{ __('shop::app.customer.account.order.view.item-status') }}</th>
+                                            <th>{{ __('shop::app.customer.account.order.view.subtotal') }}</th>
+                                            <th>{{ __('shop::app.customer.account.order.view.tax-percent') }}</th>
+                                            <th>{{ __('shop::app.customer.account.order.view.tax-amount') }}</th>
+                                            <th>{{ __('shop::app.customer.account.order.view.grand-total') }}</th>
+                                        </tr>
+                                    </thead>
+
+                                    <tbody>
+                                        @foreach ($order->items as $item)
+                                            <tr>
+                                                <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}">
+                                                    {{ $item->getTypeInstance()->getOrderedItem($item)->sku }}
+                                                </td>
+
+                                                <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}">
+                                                    {{ $item->name }}
+
+                                                    @if (isset($item->additional['attributes']))
+                                                        <div class="item-options">
+
+                                                            @foreach ($item->additional['attributes'] as $attribute)
+                                                                <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
+                                                            @endforeach
+
+                                                        </div>
+                                                    @endif
+                                                </td>
+
+                                                <td data-value="{{ __('shop::app.customer.account.order.view.price') }}">
+                                                    {{ core()->formatPrice($item->price, $order->order_currency_code) }}
+                                                </td>
+
+                                                <td data-value="{{ __('shop::app.customer.account.order.view.item-status') }}">
+                                                    <span class="qty-row">
+                                                        {{ __('shop::app.customer.account.order.view.item-ordered', ['qty_ordered' => $item->qty_ordered]) }}
+                                                    </span>
+
+                                                    <span class="qty-row">
+                                                        {{ $item->qty_invoiced ? __('shop::app.customer.account.order.view.item-invoice', ['qty_invoiced' => $item->qty_invoiced]) : '' }}
+                                                    </span>
+
+                                                    <span class="qty-row">
+                                                        {{ $item->qty_shipped ? __('shop::app.customer.account.order.view.item-shipped', ['qty_shipped' => $item->qty_shipped]) : '' }}
+                                                    </span>
+
+                                                    <span class="qty-row">
+                                                        {{ $item->qty_refunded ? __('shop::app.customer.account.order.view.item-refunded', ['qty_refunded' => $item->qty_refunded]) : '' }}
+                                                    </span>
+
+                                                    <span class="qty-row">
+                                                        {{ $item->qty_canceled ? __('shop::app.customer.account.order.view.item-canceled', ['qty_canceled' => $item->qty_canceled]) : '' }}
+                                                    </span>
+                                                </td>
+
+                                                <td data-value="{{ __('shop::app.customer.account.order.view.subtotal') }}">
+                                                    {{ core()->formatPrice($item->total, $order->order_currency_code) }}
+                                                </td>
+
+                                                <td data-value="{{ __('shop::app.customer.account.order.view.tax-percent') }}">
+                                                    {{ number_format($item->tax_percent, 2) }}%
+                                                </td>
+
+                                                <td data-value="{{ __('shop::app.customer.account.order.view.tax-amount') }}">
+                                                    {{ core()->formatPrice($item->tax_amount, $order->order_currency_code) }}
+                                                </td>
+
+                                                <td data-value="{{ __('shop::app.customer.account.order.view.grand-total') }}">
+                                                    {{ core()->formatPrice($item->total + $item->tax_amount - $item->discount_amount, $order->order_currency_code) }}
+                                                </td>
+                                            </tr>
+                                        @endforeach
+                                    </tbody>
+                                </table>
                             </div>
 
-                            <div class="section-content">
+                            <div class="totals">
-                                <div class="table">
+                                <table class="sale-summary">
-                                    <table>
+                                    <tbody>
-                                        <thead>
+                                        <tr>
+                                            <td>{{ __('shop::app.customer.account.order.view.subtotal') }}</td>
+                                            <td>-</td>
+                                            <td>{{ core()->formatPrice($order->sub_total, $order->order_currency_code) }}</td>
+                                        </tr>
+
+                                        @if ($order->haveStockableItems())
                                             <tr>
-                                                <th>{{ __('shop::app.customer.account.order.view.SKU') }}</th>
+                                                <td>{{ __('shop::app.customer.account.order.view.shipping-handling') }}</td>
-                                                <th>{{ __('shop::app.customer.account.order.view.product-name') }}</th>
+                                                <td>-</td>
-                                                <th>{{ __('shop::app.customer.account.order.view.price') }}</th>
+                                                <td>{{ core()->formatPrice($order->shipping_amount, $order->order_currency_code) }}</td>
-                                                <th>{{ __('shop::app.customer.account.order.view.item-status') }}</th>
-                                                <th>{{ __('shop::app.customer.account.order.view.subtotal') }}</th>
-                                                <th>{{ __('shop::app.customer.account.order.view.tax-percent') }}</th>
-                                                <th>{{ __('shop::app.customer.account.order.view.tax-amount') }}</th>
-                                                <th>{{ __('shop::app.customer.account.order.view.grand-total') }}</th>
                                             </tr>
-                                        </thead>
+                                        @endif
 
-                                        <tbody>
+                                        @if ($order->base_discount_amount > 0)
+                                            <tr>
+                                                <td>{{ __('shop::app.customer.account.order.view.discount') }}
+                                                    @if ($order->coupon_code)
+                                                        ({{ $order->coupon_code }})
+                                                    @endif
+                                                </td>
+                                                <td>-</td>
+                                                <td>{{ core()->formatPrice($order->discount_amount, $order->order_currency_code) }}</td>
+                                            </tr>
+                                        @endif
 
-                                            @foreach ($order->items as $item)
+                                        <tr class="border">
-                                                <tr>
+                                            <td>{{ __('shop::app.customer.account.order.view.tax') }}</td>
-                                                    <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}">
+                                            <td>-</td>
-                                                        {{ $item->getTypeInstance()->getOrderedItem($item)->sku }}
+                                            <td>{{ core()->formatPrice($order->tax_amount, $order->order_currency_code) }}</td>
-                                                    </td>
+                                        </tr>
 
-                                                    <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}">
+                                        <tr class="bold">
-                                                        {{ $item->name }}
+                                            <td>{{ __('shop::app.customer.account.order.view.grand-total') }}</td>
+                                            <td>-</td>
+                                            <td>{{ core()->formatPrice($order->grand_total, $order->order_currency_code) }}</td>
+                                        </tr>
 
-                                                        @if (isset($item->additional['attributes']))
+                                        <tr class="bold">
-                                                            <div class="item-options">
+                                            <td>{{ __('shop::app.customer.account.order.view.total-paid') }}</td>
+                                            <td>-</td>
+                                            <td>{{ core()->formatPrice($order->grand_total_invoiced, $order->order_currency_code) }}</td>
+                                        </tr>
 
-                                                                @foreach ($item->additional['attributes'] as $attribute)
+                                        <tr class="bold">
-                                                                    <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
+                                            <td>{{ __('shop::app.customer.account.order.view.total-refunded') }}</td>
-                                                                @endforeach
+                                            <td>-</td>
+                                            <td>{{ core()->formatPrice($order->grand_total_refunded, $order->order_currency_code) }}</td>
+                                        </tr>
 
-                                                            </div>
+                                        <tr class="bold">
-                                                        @endif
+                                            <td>{{ __('shop::app.customer.account.order.view.total-due') }}</td>
-                                                    </td>
 
-                                                    <td data-value="{{ __('shop::app.customer.account.order.view.price') }}">
+                                            <td>-</td>
-                                                        {{ core()->formatPrice($item->price, $order->order_currency_code) }}
-                                                    </td>
 
-                                                    <td data-value="{{ __('shop::app.customer.account.order.view.item-status') }}">
+                                            @if($order->status !== 'canceled')
-                                                        <span class="qty-row">
+                                                <td>{{ core()->formatPrice($order->total_due, $order->order_currency_code) }}</td>
-                                                            {{ __('shop::app.customer.account.order.view.item-ordered', ['qty_ordered' => $item->qty_ordered]) }}
+                                            @else
-                                                        </span>
+                                                <td>{{ core()->formatPrice(0.00, $order->order_currency_code) }}</td>
+                                            @endif
+                                        </tr>
+                                    <tbody>
+                                </table>
+                            </div>
+                        </div>
+                    </div>
+                </tab>
 
-                                                        <span class="qty-row">
+                @if ($order->invoices->count())
-                                                            {{ $item->qty_invoiced ? __('shop::app.customer.account.order.view.item-invoice', ['qty_invoiced' => $item->qty_invoiced]) : '' }}
+                    <tab name="{{ __('shop::app.customer.account.order.view.invoices') }}">
-                                                        </span>
+                        @foreach ($order->invoices as $invoice)
+                            <div class="sale-section">
+                                <div class="secton-title">
+                                    <span>{{ __('shop::app.customer.account.order.view.individual-invoice', ['invoice_id' => $invoice->increment_id ?? $invoice->id]) }}</span>
 
-                                                        <span class="qty-row">
+                                    <a href="{{ route('customer.orders.print', $invoice->id) }}" class="pull-right">
-                                                            {{ $item->qty_shipped ? __('shop::app.customer.account.order.view.item-shipped', ['qty_shipped' => $item->qty_shipped]) : '' }}
+                                        {{ __('shop::app.customer.account.order.view.print') }}
-                                                        </span>
+                                    </a>
-
-                                                        <span class="qty-row">
-                                                            {{ $item->qty_refunded ? __('shop::app.customer.account.order.view.item-refunded', ['qty_refunded' => $item->qty_refunded]) : '' }}
-                                                        </span>
-
-                                                        <span class="qty-row">
-                                                            {{ $item->qty_canceled ? __('shop::app.customer.account.order.view.item-canceled', ['qty_canceled' => $item->qty_canceled]) : '' }}
-                                                        </span>
-                                                    </td>
-
-                                                    <td data-value="{{ __('shop::app.customer.account.order.view.subtotal') }}">
-                                                        {{ core()->formatPrice($item->total, $order->order_currency_code) }}
-                                                    </td>
-
-                                                    <td data-value="{{ __('shop::app.customer.account.order.view.tax-percent') }}">
-                                                        {{ number_format($item->tax_percent, 2) }}%
-                                                    </td>
-
-                                                    <td data-value="{{ __('shop::app.customer.account.order.view.tax-amount') }}">
-                                                        {{ core()->formatPrice($item->tax_amount, $order->order_currency_code) }}
-                                                    </td>
-
-                                                    <td data-value="{{ __('shop::app.customer.account.order.view.grand-total') }}">
-                                                        {{ core()->formatPrice($item->total + $item->tax_amount - $item->discount_amount, $order->order_currency_code) }}
-                                                    </td>
-                                                </tr>
-                                            @endforeach
-                                        </tbody>
-
-                                    </table>
                                 </div>
 
-                                <div class="totals">
+                                <div class="section-content">
-                                    <table class="sale-summary">
+                                    <div class="table">
-                                        <tbody>
+                                        <table>
+                                            <thead>
+                                                <tr>
+                                                    <th>{{ __('shop::app.customer.account.order.view.SKU') }}</th>
+                                                    <th>{{ __('shop::app.customer.account.order.view.product-name') }}</th>
+                                                    <th>{{ __('shop::app.customer.account.order.view.price') }}</th>
+                                                    <th>{{ __('shop::app.customer.account.order.view.qty') }}</th>
+                                                    <th>{{ __('shop::app.customer.account.order.view.subtotal') }}</th>
+                                                    <th>{{ __('shop::app.customer.account.order.view.tax-amount') }}</th>
+                                                    <th>{{ __('shop::app.customer.account.order.view.grand-total') }}</th>
+                                                </tr>
+                                            </thead>
+
+                                            <tbody>
+                                                @foreach ($invoice->items as $item)
+                                                    <tr>
+                                                        <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}">
+                                                            {{ $item->getTypeInstance()->getOrderedItem($item)->sku }}
+                                                        </td>
+
+                                                        <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}">
+                                                            {{ $item->name }}
+                                                        </td>
+
+                                                        <td data-value="{{ __('shop::app.customer.account.order.view.price') }}">
+                                                            {{ core()->formatPrice($item->price, $order->order_currency_code) }}
+                                                        </td>
+
+                                                        <td data-value="{{ __('shop::app.customer.account.order.view.qty') }}">
+                                                            {{ $item->qty }}
+                                                        </td>
+
+                                                        <td data-value="{{ __('shop::app.customer.account.order.view.subtotal') }}">
+                                                            {{ core()->formatPrice($item->total, $order->order_currency_code) }}
+                                                        </td>
+
+                                                        <td data-value="{{ __('shop::app.customer.account.order.view.tax-amount') }}">
+                                                            {{ core()->formatPrice($item->tax_amount, $order->order_currency_code) }}
+                                                        </td>
+
+                                                        <td data-value="{{ __('shop::app.customer.account.order.view.grand-total') }}">
+                                                            {{ core()->formatPrice($item->total + $item->tax_amount, $order->order_currency_code) }}
+                                                        </td>
+                                                    </tr>
+                                                @endforeach
+                                            </tbody>
+                                        </table>
+                                    </div>
+
+                                    <div class="totals">
+                                        <table class="sale-summary">
                                             <tr>
                                                 <td>{{ __('shop::app.customer.account.order.view.subtotal') }}</td>
                                                 <td>-</td>
-                                                <td>{{ core()->formatPrice($order->sub_total, $order->order_currency_code) }}</td>
+                                                <td>{{ core()->formatPrice($invoice->sub_total, $order->order_currency_code) }}</td>
                                             </tr>
 
-                                            @if ($order->haveStockableItems())
+                                            <tr>
-                                                <tr>
+                                                <td>{{ __('shop::app.customer.account.order.view.shipping-handling') }}</td>
-                                                    <td>{{ __('shop::app.customer.account.order.view.shipping-handling') }}</td>
+                                                <td>-</td>
-                                                    <td>-</td>
+                                                <td>{{ core()->formatPrice($invoice->shipping_amount, $order->order_currency_code) }}</td>
-                                                    <td>{{ core()->formatPrice($order->shipping_amount, $order->order_currency_code) }}</td>
+                                            </tr>
-                                                </tr>
-                                            @endif
 
                                             @if ($order->base_discount_amount > 0)
                                                 <tr>
-                                                    <td>{{ __('shop::app.customer.account.order.view.discount') }}
+                                                    <td>{{ __('shop::app.customer.account.order.view.discount') }}</td>
-                                                        @if ($order->coupon_code)
-                                                            ({{ $order->coupon_code }})
-                                                        @endif
-                                                    </td>
                                                     <td>-</td>
                                                     <td>{{ core()->formatPrice($order->discount_amount, $order->order_currency_code) }}</td>
                                                 </tr>
                                             @endif
 
-                                            <tr class="border">
+                                            <tr>
                                                 <td>{{ __('shop::app.customer.account.order.view.tax') }}</td>
                                                 <td>-</td>
-                                                <td>{{ core()->formatPrice($order->tax_amount, $order->order_currency_code) }}</td>
+                                                <td>{{ core()->formatPrice($invoice->tax_amount, $order->order_currency_code) }}</td>
                                             </tr>
 
                                             <tr class="bold">
                                                 <td>{{ __('shop::app.customer.account.order.view.grand-total') }}</td>
                                                 <td>-</td>
-                                                <td>{{ core()->formatPrice($order->grand_total, $order->order_currency_code) }}</td>
+                                                <td>{{ core()->formatPrice($invoice->grand_total, $order->order_currency_code) }}</td>
                                             </tr>
-
+                                        </table>
-                                            <tr class="bold">
+                                    </div>
-                                                <td>{{ __('shop::app.customer.account.order.view.total-paid') }}</td>
-                                                <td>-</td>
-                                                <td>{{ core()->formatPrice($order->grand_total_invoiced, $order->order_currency_code) }}</td>
-                                            </tr>
-
-                                            <tr class="bold">
-                                                <td>{{ __('shop::app.customer.account.order.view.total-refunded') }}</td>
-                                                <td>-</td>
-                                                <td>{{ core()->formatPrice($order->grand_total_refunded, $order->order_currency_code) }}</td>
-                                            </tr>
-
-                                            <tr class="bold">
-                                                <td>{{ __('shop::app.customer.account.order.view.total-due') }}</td>
-
-                                                <td>-</td>
-
-                                                @if($order->status !== 'canceled')
-                                                    <td>{{ core()->formatPrice($order->total_due, $order->order_currency_code) }}</td>
-                                                @else
-                                                    <td>{{ core()->formatPrice(0.00, $order->order_currency_code) }}</td>
-                                                @endif
-                                            </tr>
-                                        <tbody>
-                                    </table>
                                 </div>
                             </div>
-                        </div>
+                        @endforeach
                     </tab>
+                @endif
 
-                    @if ($order->invoices->count())
+                @if ($order->shipments->count())
-                        <tab name="{{ __('shop::app.customer.account.order.view.invoices') }}">
+                    <tab name="{{ __('shop::app.customer.account.order.view.shipments') }}">
+                        @foreach ($order->shipments as $shipment)
+                            <div class="sale-section">
+                                <div class="section-content">
+                                    <div class="row">
+                                        <span class="title">
+                                            {{ __('shop::app.customer.account.order.view.tracking-number') }}
+                                        </span>
 
-                            @foreach ($order->invoices as $invoice)
+                                        <span class="value">
+                                            {{  $shipment->track_number }}
+                                        </span>
+                                    </div>
+                                </div>
+                            </div>
 
-                                <div class="sale-section">
+                            <div class="sale-section">
-                                    <div class="secton-title">
+                                <div class="secton-title">
-                                        <span>{{ __('shop::app.customer.account.order.view.individual-invoice', ['invoice_id' => $invoice->increment_id ?? $invoice->id]) }}</span>
+                                    <span>{{ __('shop::app.customer.account.order.view.individual-shipment', ['shipment_id' => $shipment->id]) }}</span>
+                                </div>
 
-                                        <a href="{{ route('customer.orders.print', $invoice->id) }}" class="pull-right">
+                                <div class="section-content">
-                                            {{ __('shop::app.customer.account.order.view.print') }}
+
-                                        </a>
+                                    <div class="table">
+                                        <table>
+                                            <thead>
+                                                <tr>
+                                                    <th>{{ __('shop::app.customer.account.order.view.SKU') }}</th>
+                                                    <th>{{ __('shop::app.customer.account.order.view.product-name') }}</th>
+                                                    <th>{{ __('shop::app.customer.account.order.view.qty') }}</th>
+                                                </tr>
+                                            </thead>
+
+                                            <tbody>
+                                                @foreach ($shipment->items as $item)
+                                                    <tr>
+                                                        <td data-value="{{  __('shop::app.customer.account.order.view.SKU') }}">{{ $item->sku }}</td>
+                                                        <td data-value="{{  __('shop::app.customer.account.order.view.product-name') }}">{{ $item->name }}</td>
+                                                        <td data-value="{{  __('shop::app.customer.account.order.view.qty') }}">{{ $item->qty }}</td>
+                                                    </tr>
+                                                @endforeach
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                </div>
+                            </div>
+                        @endforeach
+                    </tab>
+                @endif
+
+                @if ($order->refunds->count())
+                    <tab name="{{ __('shop::app.customer.account.order.view.refunds') }}">
+                        @foreach ($order->refunds as $refund)
+                            <div class="sale-section">
+                                <div class="secton-title">
+                                    <span>{{ __('shop::app.customer.account.order.view.individual-refund', ['refund_id' => $refund->id]) }}</span>
+                                </div>
+
+                                <div class="section-content">
+                                    <div class="table">
+                                        <table>
+                                            <thead>
+                                                <tr>
+                                                    <th>{{ __('shop::app.customer.account.order.view.SKU') }}</th>
+                                                    <th>{{ __('shop::app.customer.account.order.view.product-name') }}</th>
+                                                    <th>{{ __('shop::app.customer.account.order.view.price') }}</th>
+                                                    <th>{{ __('shop::app.customer.account.order.view.qty') }}</th>
+                                                    <th>{{ __('shop::app.customer.account.order.view.subtotal') }}</th>
+                                                    <th>{{ __('shop::app.customer.account.order.view.tax-amount') }}</th>
+                                                    <th>{{ __('shop::app.customer.account.order.view.grand-total') }}</th>
+                                                </tr>
+                                            </thead>
+
+                                            <tbody>
+                                                @foreach ($refund->items as $item)
+                                                    <tr>
+                                                        <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}">{{ $item->child ? $item->child->sku : $item->sku }}</td>
+                                                        <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}">{{ $item->name }}</td>
+                                                        <td data-value="{{ __('shop::app.customer.account.order.view.price') }}">{{ core()->formatPrice($item->price, $order->order_currency_code) }}</td>
+                                                        <td data-value="{{ __('shop::app.customer.account.order.view.qty') }}">{{ $item->qty }}</td>
+                                                        <td data-value="{{ __('shop::app.customer.account.order.view.subtotal') }}">{{ core()->formatPrice($item->total, $order->order_currency_code) }}</td>
+                                                        <td data-value="{{ __('shop::app.customer.account.order.view.tax-amount') }}">{{ core()->formatPrice($item->tax_amount, $order->order_currency_code) }}</td>
+                                                        <td data-value="{{ __('shop::app.customer.account.order.view.grand-total') }}">{{ core()->formatPrice($item->total + $item->tax_amount, $order->order_currency_code) }}</td>
+                                                    </tr>
+                                                @endforeach
+
+                                                @if (! $refund->items->count())
+                                                    <tr>
+                                                        <td class="empty" colspan="7">{{ __('shop::app.common.no-result-found') }}</td>
+                                                    <tr>
+                                                @endif
+                                            </tbody>
+                                        </table>
                                     </div>
 
-                                    <div class="section-content">
+                                    <div class="totals">
-                                        <div class="table">
+                                        <table class="sale-summary">
-                                            <table>
+                                            <tr>
-                                                <thead>
+                                                <td>{{ __('shop::app.customer.account.order.view.subtotal') }}</td>
-                                                    <tr>
+                                                <td>-</td>
-                                                        <th>{{ __('shop::app.customer.account.order.view.SKU') }}</th>
+                                                <td>{{ core()->formatPrice($refund->sub_total, $order->order_currency_code) }}</td>
-                                                        <th>{{ __('shop::app.customer.account.order.view.product-name') }}</th>
+                                            </tr>
-                                                        <th>{{ __('shop::app.customer.account.order.view.price') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.qty') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.subtotal') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.tax-amount') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.grand-total') }}</th>
-                                                    </tr>
-                                                </thead>
-
-                                                <tbody>
-
-                                                    @foreach ($invoice->items as $item)
-                                                        <tr>
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}">
-                                                                {{ $item->getTypeInstance()->getOrderedItem($item)->sku }}
-                                                            </td>
-
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}">
-                                                                {{ $item->name }}
-                                                            </td>
-
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.price') }}">
-                                                                {{ core()->formatPrice($item->price, $order->order_currency_code) }}
-                                                            </td>
-
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.qty') }}">
-                                                                {{ $item->qty }}
-                                                            </td>
-
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.subtotal') }}">
-                                                                {{ core()->formatPrice($item->total, $order->order_currency_code) }}
-                                                            </td>
-
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.tax-amount') }}">
-                                                                {{ core()->formatPrice($item->tax_amount, $order->order_currency_code) }}
-                                                            </td>
-
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.grand-total') }}">
-                                                                {{ core()->formatPrice($item->total + $item->tax_amount, $order->order_currency_code) }}
-                                                            </td>
-                                                        </tr>
-                                                    @endforeach
-                                                </tbody>
-                                            </table>
-                                        </div>
-
-                                        <div class="totals">
-                                            <table class="sale-summary">
-                                                <tr>
-                                                    <td>{{ __('shop::app.customer.account.order.view.subtotal') }}</td>
-                                                    <td>-</td>
-                                                    <td>{{ core()->formatPrice($invoice->sub_total, $order->order_currency_code) }}</td>
-                                                </tr>
 
+                                            @if ($refund->shipping_amount > 0)
                                                 <tr>
                                                     <td>{{ __('shop::app.customer.account.order.view.shipping-handling') }}</td>
                                                     <td>-</td>
-                                                    <td>{{ core()->formatPrice($invoice->shipping_amount, $order->order_currency_code) }}</td>
+                                                    <td>{{ core()->formatPrice($refund->shipping_amount, $order->order_currency_code) }}</td>
                                                 </tr>
+                                            @endif
 
-                                                @if ($order->base_discount_amount > 0)
+                                            @if ($refund->discount_amount > 0)
-                                                    <tr>
+                                                <tr>
-                                                        <td>{{ __('shop::app.customer.account.order.view.discount') }}</td>
+                                                    <td>{{ __('shop::app.customer.account.order.view.discount') }}</td>
-                                                        <td>-</td>
+                                                    <td>-</td>
-                                                        <td>{{ core()->formatPrice($order->discount_amount, $order->order_currency_code) }}</td>
+                                                    <td>{{ core()->formatPrice($order->discount_amount, $order->order_currency_code) }}</td>
-                                                    </tr>
+                                                </tr>
-                                                @endif
+                                            @endif
 
+                                            @if ($refund->tax_amount > 0)
                                                 <tr>
                                                     <td>{{ __('shop::app.customer.account.order.view.tax') }}</td>
                                                     <td>-</td>
-                                                    <td>{{ core()->formatPrice($invoice->tax_amount, $order->order_currency_code) }}</td>
+                                                    <td>{{ core()->formatPrice($refund->tax_amount, $order->order_currency_code) }}</td>
                                                 </tr>
+                                            @endif
 
-                                                <tr class="bold">
+                                            <tr>
-                                                    <td>{{ __('shop::app.customer.account.order.view.grand-total') }}</td>
+                                                <td>{{ __('shop::app.customer.account.order.view.adjustment-refund') }}</td>
-                                                    <td>-</td>
+                                                <td>-</td>
-                                                    <td>{{ core()->formatPrice($invoice->grand_total, $order->order_currency_code) }}</td>
+                                                <td>{{ core()->formatPrice($refund->adjustment_refund, $order->order_currency_code) }}</td>
-                                                </tr>
+                                            </tr>
-                                            </table>
+
-                                        </div>
+                                            <tr>
+                                                <td>{{ __('shop::app.customer.account.order.view.adjustment-fee') }}</td>
+                                                <td>-</td>
+                                                <td>{{ core()->formatPrice($refund->adjustment_fee, $order->order_currency_code) }}</td>
+                                            </tr>
+
+                                            <tr class="bold">
+                                                <td>{{ __('shop::app.customer.account.order.view.grand-total') }}</td>
+                                                <td>-</td>
+                                                <td>{{ core()->formatPrice($refund->grand_total, $order->order_currency_code) }}</td>
+                                            </tr>
+                                        </table>
                                     </div>
                                 </div>
+                            </div>
+                        @endforeach
+                    </tab>
+                @endif
+            </tabs>
 
-                            @endforeach
+            <div class="sale-section">
+                <div class="section-content" style="border-bottom: 0">
+                    <div class="order-box-container">
+                        <div class="box">
+                            <div class="box-title">
+                                {{ __('shop::app.customer.account.order.view.billing-address') }}
+                            </div>
 
-                        </tab>
+                            <div class="box-content">
-                    @endif
+                                @include ('admin::sales.address', ['address' => $order->billing_address])
 
-                    @if ($order->shipments->count())
+                                {!! view_render_event('bagisto.shop.customers.account.orders.view.billing-address.after', ['order' => $order]) !!}
-                        <tab name="{{ __('shop::app.customer.account.order.view.shipments') }}">
+                            </div>
+                        </div>
 
-                            @foreach ($order->shipments as $shipment)
+                        @if ($order->shipping_address)
-
-                                <div class="sale-section">
-                                    <div class="section-content">
-                                        <div class="row">
-                                            <span class="title">
-                                                {{ __('shop::app.customer.account.order.view.tracking-number') }}
-                                            </span>
-
-                                            <span class="value">
-                                                {{  $shipment->track_number }}
-                                            </span>
-                                        </div>
-                                    </div>
-                                </div>
-
-                                <div class="sale-section">
-                                    <div class="secton-title">
-                                        <span>{{ __('shop::app.customer.account.order.view.individual-shipment', ['shipment_id' => $shipment->id]) }}</span>
-                                    </div>
-
-                                    <div class="section-content">
-
-                                        <div class="table">
-                                            <table>
-                                                <thead>
-                                                    <tr>
-                                                        <th>{{ __('shop::app.customer.account.order.view.SKU') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.product-name') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.qty') }}</th>
-                                                    </tr>
-                                                </thead>
-
-                                                <tbody>
-
-                                                    @foreach ($shipment->items as $item)
-
-                                                        <tr>
-                                                            <td data-value="{{  __('shop::app.customer.account.order.view.SKU') }}">{{ $item->sku }}</td>
-                                                            <td data-value="{{  __('shop::app.customer.account.order.view.product-name') }}">{{ $item->name }}</td>
-                                                            <td data-value="{{  __('shop::app.customer.account.order.view.qty') }}">{{ $item->qty }}</td>
-                                                        </tr>
-
-                                                    @endforeach
-
-                                                </tbody>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-
-                            @endforeach
-
-                        </tab>
-                    @endif
-
-                    @if ($order->refunds->count())
-                        <tab name="{{ __('shop::app.customer.account.order.view.refunds') }}">
-
-                            @foreach ($order->refunds as $refund)
-
-                                <div class="sale-section">
-                                    <div class="secton-title">
-                                        <span>{{ __('shop::app.customer.account.order.view.individual-refund', ['refund_id' => $refund->id]) }}</span>
-                                    </div>
-
-                                    <div class="section-content">
-                                        <div class="table">
-                                            <table>
-                                                <thead>
-                                                    <tr>
-                                                        <th>{{ __('shop::app.customer.account.order.view.SKU') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.product-name') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.price') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.qty') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.subtotal') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.tax-amount') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.grand-total') }}</th>
-                                                    </tr>
-                                                </thead>
-
-                                                <tbody>
-
-                                                    @foreach ($refund->items as $item)
-                                                        <tr>
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}">{{ $item->child ? $item->child->sku : $item->sku }}</td>
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}">{{ $item->name }}</td>
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.price') }}">{{ core()->formatPrice($item->price, $order->order_currency_code) }}</td>
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.qty') }}">{{ $item->qty }}</td>
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.subtotal') }}">{{ core()->formatPrice($item->total, $order->order_currency_code) }}</td>
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.tax-amount') }}">{{ core()->formatPrice($item->tax_amount, $order->order_currency_code) }}</td>
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.grand-total') }}">{{ core()->formatPrice($item->total + $item->tax_amount, $order->order_currency_code) }}</td>
-                                                        </tr>
-                                                    @endforeach
-
-                                                    @if (! $refund->items->count())
-                                                        <tr>
-                                                            <td class="empty" colspan="7">{{ __('shop::app.common.no-result-found') }}</td>
-                                                        <tr>
-                                                    @endif
-                                                </tbody>
-                                            </table>
-                                        </div>
-
-                                        <div class="totals">
-                                            <table class="sale-summary">
-                                                <tr>
-                                                    <td>{{ __('shop::app.customer.account.order.view.subtotal') }}</td>
-                                                    <td>-</td>
-                                                    <td>{{ core()->formatPrice($refund->sub_total, $order->order_currency_code) }}</td>
-                                                </tr>
-
-                                                @if ($refund->shipping_amount > 0)
-                                                    <tr>
-                                                        <td>{{ __('shop::app.customer.account.order.view.shipping-handling') }}</td>
-                                                        <td>-</td>
-                                                        <td>{{ core()->formatPrice($refund->shipping_amount, $order->order_currency_code) }}</td>
-                                                    </tr>
-                                                @endif
-
-                                                @if ($refund->discount_amount > 0)
-                                                    <tr>
-                                                        <td>{{ __('shop::app.customer.account.order.view.discount') }}</td>
-                                                        <td>-</td>
-                                                        <td>{{ core()->formatPrice($order->discount_amount, $order->order_currency_code) }}</td>
-                                                    </tr>
-                                                @endif
-
-                                                @if ($refund->tax_amount > 0)
-                                                    <tr>
-                                                        <td>{{ __('shop::app.customer.account.order.view.tax') }}</td>
-                                                        <td>-</td>
-                                                        <td>{{ core()->formatPrice($refund->tax_amount, $order->order_currency_code) }}</td>
-                                                    </tr>
-                                                @endif
-
-                                                <tr>
-                                                    <td>{{ __('shop::app.customer.account.order.view.adjustment-refund') }}</td>
-                                                    <td>-</td>
-                                                    <td>{{ core()->formatPrice($refund->adjustment_refund, $order->order_currency_code) }}</td>
-                                                </tr>
-
-                                                <tr>
-                                                    <td>{{ __('shop::app.customer.account.order.view.adjustment-fee') }}</td>
-                                                    <td>-</td>
-                                                    <td>{{ core()->formatPrice($refund->adjustment_fee, $order->order_currency_code) }}</td>
-                                                </tr>
-
-                                                <tr class="bold">
-                                                    <td>{{ __('shop::app.customer.account.order.view.grand-total') }}</td>
-                                                    <td>-</td>
-                                                    <td>{{ core()->formatPrice($refund->grand_total, $order->order_currency_code) }}</td>
-                                                </tr>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-
-                            @endforeach
-
-                        </tab>
-                    @endif
-                </tabs>
-
-                <div class="sale-section">
-                    <div class="section-content" style="border-bottom: 0">
-                        <div class="order-box-container">
                             <div class="box">
                                 <div class="box-title">
-                                    {{ __('shop::app.customer.account.order.view.billing-address') }}
+                                    {{ __('shop::app.customer.account.order.view.shipping-address') }}
                                 </div>
 
                                 <div class="box-content">
-                                    @include ('admin::sales.address', ['address' => $order->billing_address])
+                                    @include ('admin::sales.address', ['address' => $order->shipping_address])
 
-                                    {!! view_render_event('bagisto.shop.customers.account.orders.view.billing-address.after', ['order' => $order]) !!}
+                                    {!! view_render_event('bagisto.shop.customers.account.orders.view.shipping-address.after', ['order' => $order]) !!}
                                 </div>
                             </div>
 
-                            @if ($order->shipping_address)
-                                <div class="box">
-                                    <div class="box-title">
-                                        {{ __('shop::app.customer.account.order.view.shipping-address') }}
-                                    </div>
-
-                                    <div class="box-content">
-                                        @include ('admin::sales.address', ['address' => $order->shipping_address])
-
-                                        {!! view_render_event('bagisto.shop.customers.account.orders.view.shipping-address.after', ['order' => $order]) !!}
-                                    </div>
-                                </div>
-
-                                <div class="box">
-                                    <div class="box-title">
-                                        {{ __('shop::app.customer.account.order.view.shipping-method') }}
-                                    </div>
-
-                                    <div class="box-content">
-                                        {{ $order->shipping_title }}
-
-                                        {!! view_render_event('bagisto.shop.customers.account.orders.view.shipping-method.after', ['order' => $order]) !!}
-                                    </div>
-                                </div>
-                            @endif
-
                             <div class="box">
                                 <div class="box-title">
-                                    {{ __('shop::app.customer.account.order.view.payment-method') }}
+                                    {{ __('shop::app.customer.account.order.view.shipping-method') }}
                                 </div>
 
                                 <div class="box-content">
-                                    {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
+                                    {{ $order->shipping_title }}
 
-                                    @php $additionalDetails = \Webkul\Payment\Payment::getAdditionalDetails($order->payment->method); @endphp
+                                    {!! view_render_event('bagisto.shop.customers.account.orders.view.shipping-method.after', ['order' => $order]) !!}
-
-                                    @if (! empty($additionalDetails))
-                                        <div class="instructions">
-                                            <label>{{ $additionalDetails['title'] }}</label>
-                                            <p>{{ $additionalDetails['value'] }}</p>
-                                        </div>
-                                    @endif
-
-                                    {!! view_render_event('bagisto.shop.customers.account.orders.view.payment-method.after', ['order' => $order]) !!}
                                 </div>
                             </div>
+                        @endif
+
+                        <div class="box">
+                            <div class="box-title">
+                                {{ __('shop::app.customer.account.order.view.payment-method') }}
+                            </div>
+
+                            <div class="box-content">
+                                {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
+
+                                @php $additionalDetails = \Webkul\Payment\Payment::getAdditionalDetails($order->payment->method); @endphp
+
+                                @if (! empty($additionalDetails))
+                                    <div class="instructions">
+                                        <label>{{ $additionalDetails['title'] }}</label>
+                                        <p>{{ $additionalDetails['value'] }}</p>
+                                    </div>
+                                @endif
+
+                                {!! view_render_event('bagisto.shop.customers.account.orders.view.payment-method.after', ['order' => $order]) !!}
+                            </div>
                         </div>
                     </div>
                 </div>
-
             </div>
-
-            {!! view_render_event('bagisto.shop.customers.account.orders.view.after', ['order' => $order]) !!}
-
         </div>
 
+        {!! view_render_event('bagisto.shop.customers.account.orders.view.after', ['order' => $order]) !!}
     </div>
-
 @endsection
 
 @push('scripts')

packages/Webkul/Shop/src/Resources/views/customers/account/partials/sidemenu.blade.php

@@ -43,20 +43,20 @@
 </div>
 
 @push('scripts')
-<script>
+    <script>
-    $(document).ready(function() {
+        $(document).ready(function() {
-        $(".icon.icon-arrow-down.right").on('click', function(e){
+            $(".icon.icon-arrow-down.right").on('click', function(e){
-            var currentElement = $(e.currentTarget);
+                var currentElement = $(e.currentTarget);
-            if (currentElement.hasClass('icon-arrow-down')) {
+                if (currentElement.hasClass('icon-arrow-down')) {
-                $(this).parents('.menu-block').find('.menubar').show();
+                    $(this).parents('.menu-block').find('.menubar').show();
-                currentElement.removeClass('icon-arrow-down');
+                    currentElement.removeClass('icon-arrow-down');
-                currentElement.addClass('icon-arrow-up');
+                    currentElement.addClass('icon-arrow-up');
-            } else {
+                } else {
-                $(this).parents('.menu-block').find('.menubar').hide();
+                    $(this).parents('.menu-block').find('.menubar').hide();
-                currentElement.removeClass('icon-arrow-up');
+                    currentElement.removeClass('icon-arrow-up');
-                currentElement.addClass('icon-arrow-down');
+                    currentElement.addClass('icon-arrow-down');
-            }
+                }
+            });
         });
-    });
+    </script>
-</script>
 @endpush

packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php

@@ -1,132 +1,136 @@
-@extends('shop::layouts.master')
+@extends('shop::customers.account.index')
 
 @section('page_title')
     {{ __('shop::app.customer.account.profile.edit-profile.page-title') }}
 @endsection
 
-@section('content-wrapper')
+@section('account-content')
-    <div class="account-content">
+    <div class="account-layout">
+        <div class="account-head mb-10">
+            <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
 
-        @include('shop::customers.account.partials.sidemenu')
+            <span class="account-heading">{{ __('shop::app.customer.account.profile.edit-profile.title') }}</span>
-
-        <div class="account-layout">
-
-            <div class="account-head mb-10">
-                <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
-
-                <span class="account-heading">{{ __('shop::app.customer.account.profile.edit-profile.title') }}</span>
-
-                <span></span>
-            </div>
-
-            {!! view_render_event('bagisto.shop.customers.account.profile.edit.before', ['customer' => $customer]) !!}
-
-            <form method="post" action="{{ route('customer.profile.store') }}" @submit.prevent="onSubmit">
-
-                <div class="edit-form">
-                    @csrf
-
-                    {!! view_render_event('bagisto.shop.customers.account.profile.edit_form_controls.before', ['customer' => $customer]) !!}
-
-                    <div class="control-group" :class="[errors.has('first_name') ? 'has-error' : '']">
-                        <label for="first_name" class="required">{{ __('shop::app.customer.account.profile.fname') }}</label>
-
-                        <input type="text" class="control" name="first_name" value="{{ old('first_name') ?? $customer->first_name }}" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.fname') }}&quot;">
-                        <span class="control-error" v-if="errors.has('first_name')">@{{ errors.first('first_name') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.profile.edit.first_name.after') !!}
-
-                    <div class="control-group" :class="[errors.has('last_name') ? 'has-error' : '']">
-                        <label for="last_name" class="required">{{ __('shop::app.customer.account.profile.lname') }}</label>
-
-                        <input type="text" class="control" name="last_name" value="{{ old('last_name') ?? $customer->last_name }}" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.lname') }}&quot;">
-                        <span class="control-error" v-if="errors.has('last_name')">@{{ errors.first('last_name') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.profile.edit.last_name.after') !!}
-
-                    <div class="control-group" :class="[errors.has('gender') ? 'has-error' : '']">
-                        <label for="email" class="required">{{ __('shop::app.customer.account.profile.gender') }}</label>
-
-                        <select name="gender" class="control" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.gender') }}&quot;">
-                            <option value=""  @if ($customer->gender == "") selected @endif></option>
-                            <option value="Other"  @if ($customer->gender == "Other") selected @endif>{{ __('shop::app.customer.account.profile.other') }}</option>
-                            <option value="Male"  @if ($customer->gender == "Male") selected @endif>{{ __('shop::app.customer.account.profile.male') }}</option>
-                            <option value="Female" @if ($customer->gender == "Female") selected @endif>{{ __('shop::app.customer.account.profile.female') }}</option>
-                        </select>
-                        <span class="control-error" v-if="errors.has('gender')">@{{ errors.first('gender') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.profile.edit.gender.after') !!}
-
-                    <div class="control-group"  :class="[errors.has('date_of_birth') ? 'has-error' : '']">
-                        <label for="date_of_birth">{{ __('shop::app.customer.account.profile.dob') }}</label>
-                        <input type="date" class="control" name="date_of_birth" value="{{ old('date_of_birth') ?? $customer->date_of_birth }}" v-validate="" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.dob') }}&quot;">
-                        <span class="control-error" v-if="errors.has('date_of_birth')">@{{ errors.first('date_of_birth') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.profile.edit.date_of_birth.after') !!}
-
-                    <div class="control-group" :class="[errors.has('email') ? 'has-error' : '']">
-                        <label for="email" class="required">{{ __('shop::app.customer.account.profile.email') }}</label>
-                        <input type="email" class="control" name="email" value="{{ old('email') ?? $customer->email }}" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.email') }}&quot;">
-                        <span class="control-error" v-if="errors.has('email')">@{{ errors.first('email') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.profile.edit.email.after') !!}
-
-                    <div class="control-group" :class="[errors.has('phone') ? 'has-error' : '']">
-                        <label for="phone">{{ __('shop::app.customer.account.profile.phone') }}</label>
-                        <input type="text" class="control" name="phone" value="{{ old('phone') ?? $customer->phone }}" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.phone') }}&quot;">
-                        <span class="control-error" v-if="errors.has('phone')">@{{ errors.first('phone') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.profile.edit.phone.after') !!}
-
-                    <div class="control-group" :class="[errors.has('oldpassword') ? 'has-error' : '']">
-                        <label for="password">{{ __('shop::app.customer.account.profile.opassword') }}</label>
-                        <input type="password" class="control" name="oldpassword" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.opassword') }}&quot;" v-validate="'min:6'">
-                        <span class="control-error" v-if="errors.has('oldpassword')">@{{ errors.first('oldpassword') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.profile.edit.oldpassword.after') !!}
-
-                    <div class="control-group" :class="[errors.has('password') ? 'has-error' : '']">
-                        <label for="password">{{ __('shop::app.customer.account.profile.password') }}</label>
-
-                        <input type="password" id="password" class="control" name="password" ref="password" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.password') }}&quot;" v-validate="'min:6'">
-                        <span class="control-error" v-if="errors.has('password')">@{{ errors.first('password') }}</span>
-                    </div>
-
-                    {!! view_render_event('bagisto.shop.customers.account.profile.edit.password.after') !!}
-
-                    <div class="control-group" :class="[errors.has('password_confirmation') ? 'has-error' : '']">
-                        <label for="password">{{ __('shop::app.customer.account.profile.cpassword') }}</label>
-
-                        <input type="password" id="password_confirmation" class="control" name="password_confirmation" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.cpassword') }}&quot;" v-validate="'min:6|confirmed:password'">
-                        <span class="control-error" v-if="errors.has('password_confirmation')">@{{ errors.first('password_confirmation') }}</span>
-                    </div>
-
-                    @if (core()->getConfigData('customer.settings.newsletter.subscription'))
-                        <div class="control-group">
-                            <input type="checkbox" id="checkbox2" name="subscribed_to_news_letter"@if (isset($customer->subscription)) value="{{ $customer->subscription->is_subscribed }}" {{ $customer->subscription->is_subscribed ? 'checked' : ''}} @endif>
-                            <span>{{ __('shop::app.customer.signup-form.subscribe-to-newsletter') }}</span>
-                        </div>
-                    @endif
-
-                    {!! view_render_event('bagisto.shop.customers.account.profile.edit_form_controls.after', ['customer' => $customer]) !!}
-
-                    <div class="button-group">
-                        <input class="btn btn-primary btn-lg" type="submit" value="{{ __('shop::app.customer.account.profile.submit') }}">
-                    </div>
-                </div>
-
-            </form>
-
-            {!! view_render_event('bagisto.shop.customers.account.profile.edit.after', ['customer' => $customer]) !!}
 
+            <span></span>
         </div>
 
+        {!! view_render_event('bagisto.shop.customers.account.profile.edit.before', ['customer' => $customer]) !!}
+
+        <form method="post" action="{{ route('customer.profile.store') }}" @submit.prevent="onSubmit">
+            <div class="edit-form">
+                @csrf
+
+                {!! view_render_event('bagisto.shop.customers.account.profile.edit_form_controls.before', ['customer' => $customer]) !!}
+
+                <div class="control-group" :class="[errors.has('first_name') ? 'has-error' : '']">
+                    <label for="first_name" class="required">{{ __('shop::app.customer.account.profile.fname') }}</label>
+
+                    <input type="text" class="control" name="first_name" value="{{ old('first_name') ?? $customer->first_name }}" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.fname') }}&quot;">
+
+                    <span class="control-error" v-if="errors.has('first_name')">@{{ errors.first('first_name') }}</span>
+                </div>
+
+                {!! view_render_event('bagisto.shop.customers.account.profile.edit.first_name.after') !!}
+
+                <div class="control-group" :class="[errors.has('last_name') ? 'has-error' : '']">
+                    <label for="last_name" class="required">{{ __('shop::app.customer.account.profile.lname') }}</label>
+
+                    <input type="text" class="control" name="last_name" value="{{ old('last_name') ?? $customer->last_name }}" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.lname') }}&quot;">
+
+                    <span class="control-error" v-if="errors.has('last_name')">@{{ errors.first('last_name') }}</span>
+                </div>
+
+                {!! view_render_event('bagisto.shop.customers.account.profile.edit.last_name.after') !!}
+
+                <div class="control-group" :class="[errors.has('gender') ? 'has-error' : '']">
+                    <label for="email" class="required">{{ __('shop::app.customer.account.profile.gender') }}</label>
+
+                    <select name="gender" class="control" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.gender') }}&quot;">
+                        <option value=""  @if ($customer->gender == "") selected @endif></option>
+                        <option value="Other"  @if ($customer->gender == "Other") selected @endif>{{ __('shop::app.customer.account.profile.other') }}</option>
+                        <option value="Male"  @if ($customer->gender == "Male") selected @endif>{{ __('shop::app.customer.account.profile.male') }}</option>
+                        <option value="Female" @if ($customer->gender == "Female") selected @endif>{{ __('shop::app.customer.account.profile.female') }}</option>
+                    </select>
+
+                    <span class="control-error" v-if="errors.has('gender')">@{{ errors.first('gender') }}</span>
+                </div>
+
+                {!! view_render_event('bagisto.shop.customers.account.profile.edit.gender.after') !!}
+
+                <div class="control-group"  :class="[errors.has('date_of_birth') ? 'has-error' : '']">
+                    <label for="date_of_birth">{{ __('shop::app.customer.account.profile.dob') }}</label>
+
+                    <input type="date" class="control" name="date_of_birth" value="{{ old('date_of_birth') ?? $customer->date_of_birth }}" v-validate="" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.dob') }}&quot;">
+
+                    <span class="control-error" v-if="errors.has('date_of_birth')">@{{ errors.first('date_of_birth') }}</span>
+                </div>
+
+                {!! view_render_event('bagisto.shop.customers.account.profile.edit.date_of_birth.after') !!}
+
+                <div class="control-group" :class="[errors.has('email') ? 'has-error' : '']">
+                    <label for="email" class="required">{{ __('shop::app.customer.account.profile.email') }}</label>
+
+                    <input type="email" class="control" name="email" value="{{ old('email') ?? $customer->email }}" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.email') }}&quot;">
+
+                    <span class="control-error" v-if="errors.has('email')">@{{ errors.first('email') }}</span>
+                </div>
+
+                {!! view_render_event('bagisto.shop.customers.account.profile.edit.email.after') !!}
+
+                <div class="control-group" :class="[errors.has('phone') ? 'has-error' : '']">
+                    <label for="phone">{{ __('shop::app.customer.account.profile.phone') }}</label>
+
+                    <input type="text" class="control" name="phone" value="{{ old('phone') ?? $customer->phone }}" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.phone') }}&quot;">
+
+                    <span class="control-error" v-if="errors.has('phone')">@{{ errors.first('phone') }}</span>
+                </div>
+
+                {!! view_render_event('bagisto.shop.customers.account.profile.edit.phone.after') !!}
+
+                <div class="control-group" :class="[errors.has('oldpassword') ? 'has-error' : '']">
+                    <label for="password">{{ __('shop::app.customer.account.profile.opassword') }}</label>
+
+                    <input type="password" class="control" name="oldpassword" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.opassword') }}&quot;" v-validate="'min:6'">
+
+                    <span class="control-error" v-if="errors.has('oldpassword')">@{{ errors.first('oldpassword') }}</span>
+                </div>
+
+                {!! view_render_event('bagisto.shop.customers.account.profile.edit.oldpassword.after') !!}
+
+                <div class="control-group" :class="[errors.has('password') ? 'has-error' : '']">
+                    <label for="password">{{ __('shop::app.customer.account.profile.password') }}</label>
+
+                    <input type="password" id="password" class="control" name="password" ref="password" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.password') }}&quot;" v-validate="'min:6'">
+
+                    <span class="control-error" v-if="errors.has('password')">@{{ errors.first('password') }}</span>
+                </div>
+
+                {!! view_render_event('bagisto.shop.customers.account.profile.edit.password.after') !!}
+
+                <div class="control-group" :class="[errors.has('password_confirmation') ? 'has-error' : '']">
+                    <label for="password">{{ __('shop::app.customer.account.profile.cpassword') }}</label>
+
+                    <input type="password" id="password_confirmation" class="control" name="password_confirmation" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.cpassword') }}&quot;" v-validate="'min:6|confirmed:password'">
+
+                    <span class="control-error" v-if="errors.has('password_confirmation')">@{{ errors.first('password_confirmation') }}</span>
+                </div>
+
+                @if (core()->getConfigData('customer.settings.newsletter.subscription'))
+                    <div class="control-group">
+                        <input type="checkbox" id="checkbox2" name="subscribed_to_news_letter"@if (isset($customer->subscription)) value="{{ $customer->subscription->is_subscribed }}" {{ $customer->subscription->is_subscribed ? 'checked' : ''}} @endif>
+
+                        <span>{{ __('shop::app.customer.signup-form.subscribe-to-newsletter') }}</span>
+                    </div>
+                @endif
+
+                {!! view_render_event('bagisto.shop.customers.account.profile.edit_form_controls.after', ['customer' => $customer]) !!}
+
+                <div class="button-group">
+                    <input class="btn btn-primary btn-lg" type="submit" value="{{ __('shop::app.customer.account.profile.submit') }}">
+                </div>
+            </div>
+        </form>
+
+        {!! view_render_event('bagisto.shop.customers.account.profile.edit.after', ['customer' => $customer]) !!}
     </div>
 @endsection

packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php

@@ -1,19 +1,12 @@
-@extends('shop::layouts.master')
+@extends('shop::customers.account.index')
 
 @section('page_title')
     {{ __('shop::app.customer.account.profile.index.title') }}
 @endsection
 
-@section('content-wrapper')
+@section('account-content')
-
-<div class="account-content">
-
-    @include('shop::customers.account.partials.sidemenu')
-
     <div class="account-layout">
-
         <div class="account-head">
-
             <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
 
             <span class="account-heading">{{ __('shop::app.customer.account.profile.index.title') }}</span>
@@ -25,14 +18,13 @@
             <div class="horizontal-rule"></div>
         </div>
 
-         {!! view_render_event('bagisto.shop.customers.account.profile.view.before', ['customer' => $customer]) !!}
+        {!! view_render_event('bagisto.shop.customers.account.profile.view.before', ['customer' => $customer]) !!}
 
         <div class="account-table-content" style="width: 50%;">
             <table style="color: #5E5E5E;">
                 <tbody>
-                    {!! view_render_event(
+                    {!! view_render_event('bagisto.shop.customers.account.profile.view.table.before', ['customer' => $customer]) !!}
-                    'bagisto.shop.customers.account.profile.view.table.before', ['customer' => $customer])
+
-                    !!}
                     <tr>
                         <td>{{ __('shop::app.customer.account.profile.fname') }}</td>
                         <td>{{ $customer->first_name }}</td>
@@ -65,22 +57,11 @@
                         <td>{{ __('shop::app.customer.account.profile.email') }}</td>
                         <td>{{ $customer->email }}</td>
                     </tr>
-                    {!! view_render_event(
-                    'bagisto.shop.customers.account.profile.view.table.after', ['customer' => $customer])
-                    !!}
 
-                    {{-- @if ($customer->subscribed_to_news_letter == 1)
+                    {!! view_render_event('bagisto.shop.customers.account.profile.view.table.after', ['customer' => $customer]) !!}
-                        <tr>
-                            <td> {{ __('shop::app.footer.subscribe-newsletter') }}</td>
-                            <td>
-                                <a class="btn btn-sm btn-primary" href="{{ route('shop.unsubscribe', $customer->email) }}">{{ __('shop::app.subscription.unsubscribe') }} </a>
-                            </td>
-                        </tr>
-                    @endif --}}
                 </tbody>
             </table>
 
-
             <button type="submit" @click="showModal('deleteProfile')" class="btn btn-lg btn-primary mt-10">
                 {{ __('shop::app.customer.account.address.index.delete') }}
             </button>
@@ -110,5 +91,4 @@
 
         {!! view_render_event('bagisto.shop.customers.account.profile.view.after', ['customer' => $customer]) !!}
     </div>
-</div>
 @endsection

packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php

@@ -1,95 +1,92 @@
-@extends('shop::layouts.master')
+@extends('shop::customers.account.index')
 
 @section('page_title')
     {{ __('shop::app.customer.account.review.index.page-title') }}
 @endsection
 
-@section('content-wrapper')
+@section('account-content')
-    <div class="account-content">
+    <div class="account-layout">
-        @include('shop::customers.account.partials.sidemenu')
+        <div class="account-head">
+            <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
 
-        <div class="account-layout">
+            <span class="account-heading">{{ __('shop::app.customer.account.review.index.title') }}</span>
 
-            <div class="account-head">
+            @if (count($reviews) > 1)
-                <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
+                <div class="account-action">
+                    <form id="deleteAllReviewForm" action="{{ route('customer.review.deleteall') }}" method="post">
+                        @method('delete')
 
-                <span class="account-heading">{{ __('shop::app.customer.account.review.index.title') }}</span>
+                        @csrf
+                    </form>
 
-                @if (count($reviews) > 1)
+                    <a href="javascript:void(0);" onclick="confirm('{{ __('shop::app.customer.account.review.delete-all.confirmation-message') }}') ? document.getElementById('deleteAllReviewForm').submit() : null;">
-                    <div class="account-action">
+                        {{ __('shop::app.customer.account.review.delete-all.title') }}
-                        <form id="deleteAllReviewForm" action="{{ route('customer.review.deleteall') }}" method="post">
+                    </a>
-                            @method('delete')
+                </div>
-                            @csrf
+            @endif
-                        </form>
 
-                        <a href="javascript:void(0);" onclick="confirm('{{ __('shop::app.customer.account.review.delete-all.confirmation-message') }}') ? document.getElementById('deleteAllReviewForm').submit() : null;">
+            <span></span>
-                            {{ __('shop::app.customer.account.review.delete-all.title') }}
+            
-                        </a>
+            <div class="horizontal-rule"></div>
-                    </div>
+        </div>
-                @endif
 
-                <span></span>
+        {!! view_render_event('bagisto.shop.customers.account.reviews.list.before', ['reviews' => $reviews]) !!}
-                <div class="horizontal-rule"></div>
-            </div>
 
-            {!! view_render_event('bagisto.shop.customers.account.reviews.list.before', ['reviews' => $reviews]) !!}
+        <div class="account-items-list">
+            @if (! $reviews->isEmpty())
+                @foreach ($reviews as $review)
+                    <div class="account-item-card mt-15 mb-15">
+                        <div class="media-info">
+                            @php $image = productimage()->getProductBaseImage($review->product); @endphp
 
-            <div class="account-items-list">
+                            <a href="{{ route('shop.productOrCategory.index', $review->product->url_key) }}" title="{{ $review->product->name }}">
-                @if (! $reviews->isEmpty())
+                                <img class="media" src="{{ $image['small_image_url'] }}" alt=""/>
-                    @foreach ($reviews as $review)
+                            </a>
-                        <div class="account-item-card mt-15 mb-15">
-                            <div class="media-info">
-                                <?php $image = productimage()->getProductBaseImage($review->product); ?>
-                                <a href="{{ route('shop.productOrCategory.index', $review->product->url_key) }}" title="{{ $review->product->name }}">
-                                    <img class="media" src="{{ $image['small_image_url'] }}" alt=""/>
-                                </a>
 
-                                <div class="info">
+                            <div class="info">
-                                    <div class="product-name">
+                                <div class="product-name">
-                                        <a href="{{ route('shop.productOrCategory.index', $review->product->url_key) }}" title="{{ $review->product->name }}">
+                                    <a href="{{ route('shop.productOrCategory.index', $review->product->url_key) }}" title="{{ $review->product->name }}">
-                                            {{$review->product->name}}
+                                        {{$review->product->name}}
-                                        </a>
+                                    </a>
-                                    </div>
-
-                                    <div class="stars mt-10">
-                                        @for($i=0 ; $i < $review->rating ; $i++)
-                                            <span class="icon star-icon"></span>
-                                        @endfor
-                                    </div>
-
-                                    <div class="mt-10">
-                                        {{ $review->comment }}
-                                    </div>
                                 </div>
-                            </div>
 
-                            <div class="operations">
+                                <div class="stars mt-10">
-                                <form id="deleteReviewForm" action="{{ route('customer.review.delete', $review->id) }}" method="post">
+                                    @for($i=0 ; $i < $review->rating ; $i++)
-                                    @method('delete')
+                                        <span class="icon star-icon"></span>
-                                    @csrf
+                                    @endfor
-                                </form>
+                                </div>
 
-                                <a class="mb-50" href="javascript:void(0);" onclick="confirm('{{ __('shop::app.customer.account.review.delete.confirmation-message') }}') ? document.getElementById('deleteReviewForm').submit() : null;">
+                                <div class="mt-10">
-                                    <span class="icon trash-icon"></span>
+                                    {{ $review->comment }}
-                                </a>
+                                </div>
                             </div>
                         </div>
 
-                        <div class="horizontal-rule mb-10 mt-10"></div>
+                        <div class="operations">
-                    @endforeach
+                            <form id="deleteReviewForm" action="{{ route('customer.review.delete', $review->id) }}" method="post">
+                                @method('delete')
+                                @csrf
+                            </form>
 
-                    <div class="bottom-toolbar">
+                            <a class="mb-50" href="javascript:void(0);" onclick="confirm('{{ __('shop::app.customer.account.review.delete.confirmation-message') }}') ? document.getElementById('deleteReviewForm').submit() : null;">
-                        {{ $reviews->links()  }}
+                                <span class="icon trash-icon"></span>
+                            </a>
+                        </div>
                     </div>
-                @else
-                    <div class="empty mt-15">
-                        {{ __('customer::app.reviews.empty') }}
-                    </div>
-                @endif
 
-            </div>
+                    <div class="horizontal-rule mb-10 mt-10"></div>
+                @endforeach
 
-            {!! view_render_event('bagisto.shop.customers.account.reviews.list.after', ['reviews' => $reviews]) !!}
+                <div class="bottom-toolbar">
+                    {{ $reviews->links()  }}
+                </div>
+            @else
+                <div class="empty mt-15">
+                    {{ __('customer::app.reviews.empty') }}
+                </div>
+            @endif
         </div>
+
+        {!! view_render_event('bagisto.shop.customers.account.reviews.list.after', ['reviews' => $reviews]) !!}
     </div>
 @endsection

packages/Webkul/Shop/src/Resources/views/customers/account/reviews/reviews.blade.php

@@ -1,22 +1,19 @@
-@extends('shop::layouts.master')
+@extends('shop::customers.account.index')
 
 @section('page_title')
     {{ __('shop::app.customer.account.review.view.page-title') }}
 @endsection
 
-@section('content-wrapper')
+@section('account-content')
-    <div class="account-content">
+    <div class="account-layout">
-        @include('shop::customers.account.partials.sidemenu')
+        <div class="account-head">
+            <span class="account-heading">Reviews</span>
+            <div class="horizontal-rule"></div>
+        </div>
 
-        <div class="account-layout">
+        <div class="account-items-list">
-            <div class="account-head">
+            @if (count($reviews))
-                <span class="account-heading">Reviews</span>
+                @foreach ($reviews as $review)
-                <div class="horizontal-rule"></div>
-            </div>
-
-            <div class="account-items-list">
-                @if (count($reviews))
-                    @foreach ($reviews as $review)
                     <div class="account-item-card mt-15 mb-15">
                         <div class="media-info">
                             <?php $image = productimage()->getGalleryImages($review->product); ?>
@@ -37,14 +34,14 @@
                             </div>
                         </div>
                     </div>
+
                     <div class="horizontal-rule mb-10 mt-10"></div>
-                    @endforeach
+                @endforeach
-                @else
+            @else
-                    <div class="empty">
+                <div class="empty">
-                        {{ __('customer::app.reviews.empty') }}
+                    {{ __('customer::app.reviews.empty') }}
-                    </div>
+                </div>
-                @endif
+            @endif
-            </div>
         </div>
     </div>
 @endsection

packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php

@@ -1,111 +1,104 @@
-@extends('shop::layouts.master')
+@extends('shop::customers.account.index')
 
 @section('page_title')
     {{ __('shop::app.customer.account.wishlist.page-title') }}
 @endsection
 
-@section('content-wrapper')
+@section('account-content')
-    <div class="account-content">
+    @inject ('reviewHelper', 'Webkul\Product\Helpers\Review')
-        @include('shop::customers.account.partials.sidemenu')
 
-        @inject ('reviewHelper', 'Webkul\Product\Helpers\Review')
+    <div class="account-layout">
+        <div class="account-head mb-15">
+            <span class="account-heading">{{ __('shop::app.customer.account.wishlist.title') }}</span>
 
-        <div class="account-layout">
+            @if (count($items))
+                <div class="account-action">
+                    <form id="remove-all-wishlist" action="{{ route('customer.wishlist.removeall') }}" method="POST">
+                        @method('DELETE')
 
-            <div class="account-head mb-15">
+                        @csrf
-                <span class="account-heading">{{ __('shop::app.customer.account.wishlist.title') }}</span>
+                    </form>
 
-                @if (count($items))
+                    <a
-                    <div class="account-action">
+                        href="javascript:void(0);"
-                        <form id="remove-all-wishlist" action="{{ route('customer.wishlist.removeall') }}" method="POST">
+                        onclick="document.getElementById('remove-all-wishlist').submit();">
-                            @method('DELETE')
+                        {{ __('shop::app.customer.account.wishlist.deleteall') }}
+                    </a>
+                </div>
+            @endif
 
-                            @csrf
+            <div class="horizontal-rule"></div>
-                        </form>
+        </div>
 
-                        <a
+        {!! view_render_event('bagisto.shop.customers.account.wishlist.list.before', ['wishlist' => $items]) !!}
-                            href="javascript:void(0);"
-                            onclick="document.getElementById('remove-all-wishlist').submit();">
-                            {{ __('shop::app.customer.account.wishlist.deleteall') }}
-                        </a>
-                    </div>
-                @endif
 
-                <div class="horizontal-rule"></div>
+        <div class="account-items-list">
-            </div>
+            @if ($items->count())
+                @foreach ($items as $item)
+                    <div class="account-item-card mt-15 mb-15">
+                        <div class="media-info">
+                            @php
+                                $image = $item->product->getTypeInstance()->getBaseImage($item);
+                            @endphp
 
-            {!! view_render_event('bagisto.shop.customers.account.wishlist.list.before', ['wishlist' => $items]) !!}
+                            <img class="media" src="{{ $image['small_image_url'] }}" alt="" />
 
-            <div class="account-items-list">
+                            <div class="info">
+                                <div class="product-name">
+                                    {{ $item->product->name }}
 
-                @if ($items->count())
+                                    @if (isset($item->additional['attributes']))
-                    @foreach ($items as $item)
+                                        <div class="item-options">
-                        <div class="account-item-card mt-15 mb-15">
-                            <div class="media-info">
-                                @php
-                                    $image = $item->product->getTypeInstance()->getBaseImage($item);
-                                @endphp
 
-                                <img class="media" src="{{ $image['small_image_url'] }}" alt="" />
+                                            @foreach ($item->additional['attributes'] as $attribute)
+                                                <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
+                                            @endforeach
 
-                                <div class="info">
+                                        </div>
-                                    <div class="product-name">
+                                    @endif
-                                        {{ $item->product->name }}
-
-                                        @if (isset($item->additional['attributes']))
-                                            <div class="item-options">
-
-                                                @foreach ($item->additional['attributes'] as $attribute)
-                                                    <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
-                                                @endforeach
-
-                                            </div>
-                                        @endif
-                                    </div>
-
-                                    <span class="stars" style="display: inline">
-                                        @for ($i = 1; $i <= $reviewHelper->getAverageRating($item->product); $i++)
-                                            <span class="icon star-icon"></span>
-                                        @endfor
-                                    </span>
                                 </div>
-                            </div>
 
-                            <div class="operations">
+                                <span class="stars" style="display: inline">
-                                <form id="wishlist-{{ $item->id }}" action="{{ route('customer.wishlist.remove', $item->id) }}" method="POST">
+                                    @for ($i = 1; $i <= $reviewHelper->getAverageRating($item->product); $i++)
-                                    @method('DELETE')
+                                        <span class="icon star-icon"></span>
-
+                                    @endfor
-                                    @csrf
+                                </span>
-                                </form>
-
-                                <a
-                                    class="mb-50"
-                                    href="javascript:void(0);"
-                                    onclick="document.getElementById('wishlist-{{ $item->id }}').submit();">
-                                    <span class="icon trash-icon"></span>
-                                </a>
-
-                                <a href="{{ route('customer.wishlist.move', $item->id) }}" class="btn btn-primary btn-md">
-                                    {{ __('shop::app.customer.account.wishlist.move-to-cart') }}
-                                </a>
                             </div>
                         </div>
 
-                        <div class="horizontal-rule mb-10 mt-10"></div>
+                        <div class="operations">
-                    @endforeach
+                            <form id="wishlist-{{ $item->id }}" action="{{ route('customer.wishlist.remove', $item->id) }}" method="POST">
+                                @method('DELETE')
 
-                    <div class="bottom-toolbar">
+                                @csrf
-                        {{ $items->links()  }}
+                            </form>
+
+                            <a
+                                class="mb-50"
+                                href="javascript:void(0);"
+                                onclick="document.getElementById('wishlist-{{ $item->id }}').submit();">
+                                <span class="icon trash-icon"></span>
+                            </a>
+
+                            <a href="{{ route('customer.wishlist.move', $item->id) }}" class="btn btn-primary btn-md">
+                                {{ __('shop::app.customer.account.wishlist.move-to-cart') }}
+                            </a>
+                        </div>
                     </div>
-                @else
-                    <div class="empty">
-                        {{ __('customer::app.wishlist.empty') }}
-                    </div>
-                @endif
-            </div>
 
-            {!! view_render_event('bagisto.shop.customers.account.wishlist.list.after', ['wishlist' => $items]) !!}
+                    <div class="horizontal-rule mb-10 mt-10"></div>
+                @endforeach
 
+                <div class="bottom-toolbar">
+                    {{ $items->links()  }}
+                </div>
+            @else
+                <div class="empty">
+                    {{ __('customer::app.wishlist.empty') }}
+                </div>
+            @endif
         </div>
+
+        {!! view_render_event('bagisto.shop.customers.account.wishlist.list.after', ['wishlist' => $items]) !!}
     </div>
 @endsection

packages/Webkul/Velocity/src/Resources/views/shop/customers/account/index.blade.php

@@ -7,6 +7,8 @@
         </div>
 
         <div class="account-layout right mt10">
+            {{ Breadcrumbs::render() }}
+
             @yield('page-detail-wrapper')
         </div>
     </div>

routes/breadcrumbs.php

@@ -0,0 +1,90 @@
+<?php
+
+use Diglactic\Breadcrumbs\Breadcrumbs;
+
+use Diglactic\Breadcrumbs\Generator as BreadcrumbTrail;
+
+/**
+ * Profile routes.
+ */
+Breadcrumbs::for('customer.profile.index', function (BreadcrumbTrail $trail) {
+    $trail->push(trans('shop::app.customer.account.profile.index.title'), route('customer.profile.index'));
+});
+
+Breadcrumbs::for('customer.profile.edit', function (BreadcrumbTrail $trail) {
+    $trail->parent('customer.profile.index');
+
+    $trail->push(trans('velocity::app.shop.general.update'), route('customer.profile.edit'));
+});
+
+/**
+ * Order routes.
+ */
+Breadcrumbs::for('customer.orders.index', function (BreadcrumbTrail $trail) {
+    $trail->parent('customer.profile.index');
+
+    $trail->push(trans('shop::app.customer.account.order.index.page-title'), route('customer.orders.index'));
+});
+
+Breadcrumbs::for('customer.orders.view', function (BreadcrumbTrail $trail, $id) {
+    $trail->parent('customer.orders.index');
+
+    $trail->push(trans('velocity::app.shop.general.view'), route('customer.orders.view', $id));
+});
+
+/**
+ * Downloadable products.
+ */
+Breadcrumbs::for('customer.downloadable_products.index', function (BreadcrumbTrail $trail) {
+    $trail->parent('customer.profile.index');
+
+    $trail->push(trans('shop::app.customer.account.downloadable_products.title'), route('customer.downloadable_products.index'));
+});
+
+/**
+ * Wishlists.
+ */
+Breadcrumbs::for('customer.wishlist.index', function (BreadcrumbTrail $trail) {
+    $trail->parent('customer.profile.index');
+
+    $trail->push(trans('shop::app.customer.account.wishlist.page-title'), route('customer.wishlist.index'));
+});
+
+/**
+ * Compare.
+ */
+Breadcrumbs::for('velocity.customer.product.compare', function (BreadcrumbTrail $trail) {
+    $trail->parent('customer.profile.index');
+
+    $trail->push(trans('velocity::app.customer.compare.compare_similar_items'), route('velocity.customer.product.compare'));
+});
+
+/**
+ * Reviews.
+ */
+Breadcrumbs::for('customer.reviews.index', function (BreadcrumbTrail $trail) {
+    $trail->parent('customer.profile.index');
+
+    $trail->push(trans('shop::app.customer.account.review.index.page-title'), route('customer.reviews.index'));
+});
+
+/**
+ * Addresses.
+ */
+Breadcrumbs::for('customer.address.index', function (BreadcrumbTrail $trail) {
+    $trail->parent('customer.profile.index');
+    
+    $trail->push(trans('shop::app.customer.account.address.index.page-title'), route('customer.address.index'));
+});
+
+Breadcrumbs::for('customer.address.create', function (BreadcrumbTrail $trail) {
+    $trail->parent('customer.address.index');
+
+    $trail->push(trans('shop::app.customer.account.address.create.page-title'), route('customer.address.create'));
+});
+
+Breadcrumbs::for('customer.address.edit', function (BreadcrumbTrail $trail, $id) {
+    $trail->parent('customer.address.index');
+
+    $trail->push(trans('shop::app.customer.account.address.edit.page-title'), route('customer.address.edit', $id));
+});