Cart page issues fixedx

2018-09-27 15:31:25 +05:30 · 2018-09-27 15:31:25 +05:30 · 9e57c5117b
parent 19775a4017
commit 9e57c5117b
18 changed files with 648 additions and 825 deletions
--- a/composer.json
+++ b/composer.json
@ -42,7 +42,8 @@
        "webkul/laravel-shop": "self.version",
        "webkul/laravel-theme": "self.version",
        "webkul/laravel-shipping": "self.version",
-        "webkul/laravel-payment": "self.version"
+        "webkul/laravel-payment": "self.version",
+        "webkul/laravel-sales": "self.version"
    },
    "autoload": {
        "classmap": [
@ -64,7 +65,8 @@
            "Webkul\\Product\\": "packages/Webkul/Product/src",
            "Webkul\\Theme\\": "packages/Webkul/Theme/src",
            "Webkul\\Shipping\\": "packages/Webkul/Shipping/src",
-            "Webkul\\Payment\\": "packages/Webkul/Payment/src"
+            "Webkul\\Payment\\": "packages/Webkul/Payment/src",
+            "Webkul\\Sales\\": "packages/Webkul/Sales/src"
        }
    },
    "autoload-dev": {
--- a/config/app.php
+++ b/config/app.php
@ -191,6 +191,7 @@ return [
        Webkul\Cart\Providers\CartServiceProvider::class,
        Webkul\Shipping\Providers\ShippingServiceProvider::class,
        Webkul\Payment\Providers\PaymentServiceProvider::class,
+        Webkul\Sales\Providers\SalesServiceProvider::class,
    ],

    /*
--- a/packages/Webkul/Cart/src/Cart.php
+++ b/packages/Webkul/Cart/src/Cart.php
@ -269,6 +269,27 @@ class Cart {
        return $this->cart->find($cart->id);
    }

+    /**
+     * Returns cart
+     *
+     * @return Mixed
+     */
+    public function getItemAttributeOptionDetails($item)
+    {
+        $data = [];
+
+        foreach($item->product->super_attributes as $attribute) {
+            $option = $attribute->options()->where('id', $item->child->{$attribute->code})->first();
+
+            $data['attributes'][$attribute->code] = [
+                'attribute_name' => $attribute->name,
+                'option_label' => $option->label,
+            ];
+        }
+
+        return $data;
+    }
+
    /**
     * Save customer address
     *
--- a/packages/Webkul/Cart/src/Helpers/Checkout.php
+++ b/packages/Webkul/Cart/src/Helpers/Checkout.php
@ -1,43 +0,0 @@
-<?php
-
-namespace Webkul\Cart\Helpers;
-
-use Webkul\Attribute\Repositories\AttributeOptionRepository as AttributeOption;
-
-class Checkout
-{
-    /**
-     * AttributeOptionRepository object
-     *
-     * @var array
-     */
-    protected $attributeOption;
-
-    /**
-     * Create a new helper instance.
-     *
-     * @param  Webkul\Attribute\Repositories\AttributeOptionRepository $attributeOption
-     * @return void
-     */
-    public function __construct(AttributeOption $attributeOption)
-    {
-        $this->attributeOption = $attributeOption;
-    }
-
-    /**
-     * Returns the allowed variants
-     *
-     * @param CartItem $item
-     * @return array
-     */
-    public function getItemOptionDetails($item)
-    {
-        $data = [];
-
-        foreach ($item->product->super_attributes as $attribute) {
-
-        }
-
-        return $data;
-    }
-}
--- a/packages/Webkul/Cart/src/Http/helpers.php
+++ b/packages/Webkul/Cart/src/Http/helpers.php
@ -0,0 +1,10 @@
+<?php
+    use Webkul\Cart\Cart;
+    
+    if (! function_exists('cart')) {
+        function cart()
+        {
+            return new Cart;
+        }
+    }
+?>
--- a/packages/Webkul/Cart/src/Models/Cart.php
+++ b/packages/Webkul/Cart/src/Models/Cart.php
@ -4,6 +4,7 @@ namespace Webkul\Cart\Models;

 use Illuminate\Database\Eloquent\Model;
 use Webkul\Product\Models\Product;
+use Webkul\Cart\Models\CartItem;
 use Webkul\Cart\Models\CartAddress;
 use Webkul\Cart\Models\CartPayment;
 use Webkul\Cart\Models\CartShippingRate;
@ -17,7 +18,7 @@ class Cart extends Model
    protected $hidden = ['coupon_code'];

    public function items() {
-        return $this->hasMany('Webkul\Cart\Models\CartItem');
+        return $this->hasMany(CartItem::class)->whereNull('parent_id');
    }

    /**
--- a/packages/Webkul/Cart/src/Models/CartItem.php
+++ b/packages/Webkul/Cart/src/Models/CartItem.php
@ -14,4 +14,20 @@ class CartItem extends Model
    public function product() {
        return $this->hasOne('Webkul\Product\Models\Product', 'id', 'product_id');
    }
+
+    /**
+     * Get the phone record associated with the user.
+     */
+    public function parent()
+    {
+        return $this->hasOne(self::class, 'parent_id');
+    }
+
+    /**
+     * Get the phone record associated with the user.
+     */
+    public function child()
+    {
+        return $this->belongsTo(self::class, 'parent_id');
+    }
 }
--- a/packages/Webkul/Cart/src/Providers/CartServiceProvider.php
+++ b/packages/Webkul/Cart/src/Providers/CartServiceProvider.php
@ -16,6 +16,8 @@ class CartServiceProvider extends ServiceProvider

    public function boot(Router $router)
    {
+        include __DIR__ . '/../Http/helpers.php';
+        
        $this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations');

        $router->aliasMiddleware('admin', RedirectIfNotAdmin::class);
--- a/packages/Webkul/Sales/composer.json
+++ b/packages/Webkul/Sales/composer.json
@ -0,0 +1,25 @@
+{
+    "name": "webkul/laravel-sales",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Jitendra Singh",
+            "email": "jitendra@webkul.com"
+        }
+    ],
+    "require": {},
+    "autoload": {
+        "psr-4": {
+            "Webkul\\Sales\\": "src/"
+        }
+    },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "Webkul\\Sales\\Providers\\SalesServiceProvider"
+            ],
+            "aliases": {}
+        }
+    },
+    "minimum-stability": "dev"
+}
--- a/packages/Webkul/Sales/src/Providers/SalesServiceProvider.php
+++ b/packages/Webkul/Sales/src/Providers/SalesServiceProvider.php
@ -0,0 +1,26 @@
+<?php
+
+namespace Webkul\Sales\Providers;
+
+use Illuminate\Support\ServiceProvider;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Routing\Router;
+use Illuminate\Foundation\AliasLoader;
+
+class SalesServiceProvider extends ServiceProvider
+{
+
+    public function boot(Router $router)
+    {
+        $this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations');
+    }
+
+    /**
+     * Register services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+    }
+}
--- a/packages/Webkul/Shop/src/Http/routes.php
+++ b/packages/Webkul/Shop/src/Http/routes.php
@ -4,7 +4,7 @@ Route::group(['middleware' => ['web']], function () {

    Route::get('/', 'Webkul\Shop\Http\Controllers\HomeController@index')->defaults('_config', [
        'view' => 'shop::home.index'
-    ])->name('store.home');
+    ])->name('shop.home.index');

    Route::get('/categories/{slug}', 'Webkul\Shop\Http\Controllers\CategoryController@index')->defaults('_config', [
        'view' => 'shop::products.index'
--- a/packages/Webkul/Shop/src/Resources/assets/sass/_variables.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/_variables.scss
@ -2,7 +2,7 @@
 $font-color: #242424;
 $font-size-base: 16px;
 $border-color: #E8E8E8;
-$brand-color: #0031f0;
+$brand-color: #0041FF;
 //shop variables ends here


--- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
@ -1941,135 +1941,39 @@ section.product-detail {

 /* cart pages and elements css begins here */
 section.cart {
+    width: 100%;
    color: $font-color;
    margin-bottom: 80px;
+    margin-top: 20px;

    .title {
        font-size: 24px;
    }

    .cart-content {
-        margin-top: 21px;
-        padding: 1px;
-        display: flex;
-        flex-direction: row;
-    }
-}
+        margin-top: 20px;
+        width: 100%;
+        display: inline-block;

-.cart {
        .left-side {
-        width: 68.6%;
-        margin-right: 2.4%;
+            width: 70%;
+            float: left;
+
+            .misc-controls {
+                float: right;
+                margin-top: 20px;
+
+                a.link {
+                    margin-right: 15px;
+                }
+            }
        }

        .right-side {
-        width: 29%;
-        display: block;
-
-        .price-section {
-            width: 100%;
-            padding: 10px 10px 18px 18px;
-            margin-bottom: 20px;
-
-            .title {
-                font-weight: bold;
-                padding-bottom: 8px;
-                margin-bottom: 10px;
+            width: 30%;
+            display: inline-block;
+            padding-left: 40px;
        }
-
-            .all-item-details {
-                margin-bottom: 17px;
-
-                .item-details {
-                    margin-bottom: 10px;
-
-                    .name {
-                    }
-
-                    .price {
-                        float: right;
-                    }
-                }
-            }
-            .horizontal-rule {
-                width: 100%;
-                height: 1px;
-                vertical-align: middle;
-                background: $border-color;
-            }
-
-            .total-details {
-                margin-top: 10px;
-
-                .amount {
-                    float: right;
-                }
-            }
-        }
-
-        .coupon-section {
-            padding: 10px 10px 18px 18px;
-
-            .title {
-                font-weight: bold;
-                margin-bottom: 10px;
-            }
-
-            .control-group {
-                margin-bottom: 12px !important;
-
-                input.coupon-input::-moz-placeholder {
-                    font-family: "montserrat", sans-serif;
-                    color: $font-color;
-                }
-
-                input.coupon-input::-webkit-input-placeholder {
-                    font-family: "montserrat", sans-serif;
-                    color: $font-color;
-                }
-
-            }
-
-            button {
-                margin-bottom: 10px;
-                background-color: #000;
-                border-radius: 0px;
-            }
-
-            .coupon-details {
-
-                .coupon {
-                    margin-bottom: 8px;
-
-                    .discount {
-                        float: right;
-                    }
-                }
-            }
-
-            .horizontal-rule {
-                width: 100%;
-                height: 1px;
-                vertical-align: middle;
-                background: $border-color;
-                margin-bottom: 9px;
-            }
-
-            .after-coupon-amount {
-
-                .name {
-                    font-weight: bold;
-                }
-
-                .amount {
-                    float: right;
-                    font-weight: bold;
-                }
-
-            }
-
-        }
-
    }
 }

@ -2078,10 +1982,12 @@ section.cart {
    padding: 1px;

    .item {
-        padding: 1.1%;
+        padding: 10px;
        margin-bottom: 20px;
        display: flex;
        flex-direction: row;
+        border: 1px solid $border-color;
+        border-radius: 3px;

        .item-image {
            height: 160px;
@ -2095,24 +2001,13 @@ section.cart {
            .item-title {
                font-size: 18px;
                margin-bottom: 10px;
+                font-weight: 600;
            }

            .price {
                margin-bottom: 10px;
-
-                .main-price {
                font-size: 18px;
-                    margin-right: 4px;
-                }
-
-                .real-price {
-                    margin-right: 4px;
-                    text-decoration-line: line-through;
-                }
-
-                .discount {
-                    color: #FF6472;
-                }
+                font-weight: 600;
            }

            .summary {
@ -2151,20 +2046,242 @@ section.cart {
            }
        }
    }
+}

-    .misc-controls {
-        float: right;
-
-        span {
-            margin-right: 15px;
+.order-summary {
+    h3 {
+        font-size: 16px;
+        margin-top: 0;
    }

-        button {
-            border-radius: 0px;
+    .item-detail {
+        margin-top:12px;
+
+        label {
+            &.right {
+                float: right;
+            }
+        }
+    }
+
+    .payble-amount {
+        margin-top: 17px;
+        border-top: 1px solid $border-color;
+        padding-top: 12px;
+
+        label {
+            font-weight: bold;
+
+            &.right {
+                float:right;
+            }
        }
    }
 }

+// checkout starts here
+.checkout-process {
+    display: flex;
+    flex-direction: row;
+    width: 100%;
+    margin-top: 20px;
+    margin-bottom: 20px;
+
+    .col-main {
+        width: 65%;
+        padding-right: 40px;
+
+        ul.checkout-steps {
+            width: 100%;
+            display: inline-flex;
+            justify-content: space-between;
+            width: 100%;
+            padding-bottom: 15px;
+            border-bottom: 1px solid $border-color;
+
+            li {
+                height: 48px;
+                display:flex;
+
+                .decorator {
+                    height: 48px;
+                    width: 48px;
+                    border: 1px solid black;
+                    border-radius: 50%;
+                    display: inline-flex;
+                    border: 1px solid $border-color;
+                    background-repeat: no-repeat;
+                    background-position: center;
+
+                    &.address-info {
+                        background-image: url('../images/address.svg');
+                    }
+
+                    &.shipping {
+                        background-image: url('../images/shipping.svg');
+                    }
+
+                    &.payment {
+                        background-image: url('../images/payment.svg');
+                    }
+
+                    &.review {
+                        background-image: url('../images/finish.svg');
+                    }
+                }
+
+                &.completed {
+                    cursor: pointer;
+
+                    .decorator {
+                        background-image: url('../images/complete.svg');
+                    }
+                }
+
+                span {
+                    margin-left: 7px;
+                    margin-top: auto;
+                    margin-bottom: auto;
+                }
+
+                &.active {
+                    color: #2650EF;
+
+                    .decorator {
+                        border: 1px solid #2650EF;
+                    }
+                }
+            }
+        }
+
+        .step-content {
+            padding-top: 20px;
+
+            .form-header {
+                width: 100%;
+                display: inline-block;
+
+                h1 {
+                    float: left;
+                }
+
+                .btn {
+                    float: right;
+                }
+            }
+
+            .form-container {
+                border-bottom: 1px solid $border-color;
+                padding-top: 20px;
+                padding-bottom: 20px;
+            }
+
+            .shipping-methods {
+                h4 {
+                    margin: 0;
+                }
+            }
+
+            .payment-methods {
+                .radio {
+                    font-weight: 600;
+                }
+
+                .control-info {
+                    margin-left: 28px;
+                }
+            }
+
+            .address {
+                display: inline-block;
+                width: 100%;
+
+                .address-card {
+                    width: 50%;
+                    float: left;
+
+                    .card-title span {
+                        font-weight: 600;
+                    }
+
+                    .card-content {
+                        margin-top: 15px;
+                        color: #121212;
+                        line-height: 25px;
+
+                        .horizontal-rule {
+                            margin: 12px 0;
+                            display: block;
+                            width: 25px;
+                            background: #121212;
+                        }
+                    }
+                }
+            }
+
+            .cart-item-list {
+                .item {
+                    .row {
+                        .title {
+                            width: 100px;
+                            display: inline-block;
+                            color: #5E5E5E;
+                            font-weight: 500;
+                            margin-bottom: 10px;
+                        }
+
+                        .value {
+                            font-size: 18px;
+                            font-weight: 600;
+                        }
+                    }
+                }
+            }
+
+            .order-description {
+                display: inline-block;
+                width: 100%;
+
+                .shipping {
+                    margin-bottom: 25px;
+                }
+
+                .decorator {
+                    height: 48px;
+                    width: 48px;
+                    border-radius: 50%;
+                    border: 1px solid $border-color;
+                    vertical-align: middle;
+                    display: inline-block;
+                    text-align: center;
+
+                    .icon {
+                        margin-top: 7px;
+                    }
+                }
+
+                .text {
+                    font-weight: 600;
+                    vertical-align: middle;
+                    display: inline-block;
+
+                    .info {
+                        font-weight: 500;
+                        margin-top: 2px;
+                    }
+                }
+            }
+            // complete page end here
+        }
+    }
+
+    .col-right {
+        width: 35%;
+        padding-left: 40px;
+    }
+}
+// checkout ends here
+
 .attached-products-wrapper {
    margin-bottom: 80px;

@ -2197,6 +2314,9 @@ section.cart {
 }


+
+
+
 //=======>Need to be removed
@media all and (max-width: 480px){

@ -3068,259 +3188,7 @@ section.cart {
 //<=======Need to be removed


-// checkout starts here
-.checkout-process {
-    display: flex;
-    flex-direction: row;
-    width: 100%;
-    margin-top: 20px;
-    margin-bottom: 20px;

-    .col-main {
-        width: 65%;
-        padding-right: 40px;
-
-        ul.checkout-steps {
-            width: 100%;
-            display: inline-flex;
-            justify-content: space-between;
-            width: 100%;
-            padding-bottom: 15px;
-            border-bottom: 1px solid $border-color;
-
-            li {
-                height: 48px;
-                display:flex;
-
-                .decorator {
-                    height: 48px;
-                    width: 48px;
-                    border: 1px solid black;
-                    border-radius: 50%;
-                    display: inline-flex;
-                    border: 1px solid $border-color;
-                    background-repeat: no-repeat;
-                    background-position: center;
-
-                    &.address-info {
-                        background-image: url('../images/address.svg');
-                    }
-
-                    &.shipping {
-                        background-image: url('../images/shipping.svg');
-                    }
-
-                    &.payment {
-                        background-image: url('../images/payment.svg');
-                    }
-
-                    &.review {
-                        background-image: url('../images/finish.svg');
-                    }
-                }
-
-                &.completed {
-                    cursor: pointer;
-
-                    .decorator {
-                        background-image: url('../images/complete.svg');
-                    }
-                }
-
-                span {
-                    margin-left: 7px;
-                    margin-top: auto;
-                    margin-bottom: auto;
-                }
-
-                &.active {
-                    color: #2650EF;
-
-                    .decorator {
-                        border: 1px solid #2650EF;
-                    }
-                }
-            }
-        }
-
-        .step-content {
-            padding-top: 20px;
-
-            .form-header {
-                width: 100%;
-                display: inline-block;
-
-                h1 {
-                    float: left;
-                }
-
-                .btn {
-                    float: right;
-                }
-            }
-
-            .form-container {
-                border-bottom: 1px solid $border-color;
-                padding-top: 20px;
-                padding-bottom: 20px;
-            }
-
-            .shipping-methods {
-                h4 {
-                    margin: 0;
-                }
-            }
-
-            .payment-methods {
-                .radio {
-                    font-weight: 600;
-                }
-
-                .control-info {
-                    margin-left: 28px;
-                }
-            }
-
-            .address {
-                display: inline-block;
-                width: 100%;
-
-                .address-card {
-                    width: 50%;
-                    float: left;
-
-                    .card-title span {
-                        font-weight: 600;
-                    }
-
-                    .card-content {
-                        margin-top: 15px;
-                        color: #121212;
-                        line-height: 25px;
-
-                        .horizontal-rule {
-                            margin: 12px 0;
-                            display: block;
-                            width: 25px;
-                            background: #121212;
-                        }
-                    }
-                }
-            }
-
-            .cart-item-list {
-                .item {
-                    border: 1px solid $border-color;
-                    border-radius: 3px;
-                    padding: 20px;
-
-                    .row {
-                        .title {
-                            width: 100px;
-                            display: inline-block;
-                            color: #5E5E5E;
-                            font-weight: 500;
-                            margin-bottom: 10px;
-                        }
-
-                        .value {
-                            font-size: 18px;
-                            font-weight: 600;
-                        }
-                    }
-                }
-            }
-
-            .order-description {
-                display: inline-block;
-                width: 100%;
-
-                .shipping {
-                    margin-bottom: 25px;
-                }
-
-                .decorator {
-                    height: 48px;
-                    width: 48px;
-                    border-radius: 50%;
-                    border: 1px solid $border-color;
-                    vertical-align: middle;
-                    display: inline-block;
-                    text-align: center;
-
-                    .icon {
-                        margin-top: 7px;
-                    }
-                }
-
-                .text {
-                    font-weight: 600;
-                    vertical-align: middle;
-                    display: inline-block;
-
-                    .info {
-                        font-weight: 500;
-                        margin-top: 2px;
-                    }
-                }
-            }
-            // complete page end here
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-        }
-    }
-
-    .col-right {
-        width: 35%;
-        padding-left: 40px;
-    }
-
-    .order-summary {
-        h3 {
-            font-size: 16px;
-        }
-
-        .item-detail {
-            margin-top:12px;
-
-            label {
-                &.right {
-                    float: right;
-                }
-            }
-        }
-
-        .payble-amount {
-            margin-top: 17px;
-            border-top: 1px solid $border-color;
-            padding-top: 12px;
-
-            label {
-                font-weight: bold;
-
-                &.right {
-                    float:right;
-                }
-            }
-        }
-    }
-}
-// checkout ends here

 // review page start here
 section.review {
--- a/packages/Webkul/Shop/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php
@ -62,6 +62,8 @@ return [
        'cart' => [
            'title' => 'Shopping Cart',
            'empty' => 'Shopping Cart Is Empty',
+            'continue-shopping' => 'Continue Shopping',
+            'proceed-to-checkout' => 'Proceed To Checkout'
        ],

        'onepage' => [
--- a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
@ -20,7 +20,7 @@

                <div class="left-side">

-                    <div class="cart-item-list">
+                    <div class="cart-item-list" style="margin-top: 0">
                        @foreach($cart->items as $item)

                            <?php 
@ -41,20 +41,19 @@
                                    </div>

                                    <div class="price">
-                                        <span class="main-price">
-                                            {{ $item->price }}
-                                        </span>
-                                        <span class="real-price">
-                                            $25.00
-                                        </span>
-                                        <span class="discount">
-                                            10% Off
-                                        </span>
+                                        {{ core()->currency($item->base_price) }}
                                    </div>

+                                    @if ($product->type == 'configurable')
+                        
                                        <div class="summary" >
-                                        Color : Gray, Size : S
+                                            @foreach (cart()->getItemAttributeOptionDetails($item) as $key => $option)
+
+                                                {{ (!$key ? '' : ' , ') . $option['attribute_name'] . ' : ' . $option['option_label'] }}
+                                            
+                                            @endforeach
                                        </div>
+                                    @endif

                                    <div class="misc">
                                        <div class="qty-text">Quantity</div>
@ -71,14 +70,20 @@
                    

                    <div class="misc-controls">
-                        <span>Continue Shopping</span>
-                        <button class="btn btn-lg btn-primary">PROCEED TO CHECKOUT</button>
+                        <a href="{{ route('shop.home.index') }}" class="link">{{ __('shop::app.checkout.cart.continue-shopping') }}</a>
+
+                        <a href="{{ route('shop.checkout.onepage.index') }}" class="btn btn-lg btn-primary">
+                            {{ __('shop::app.checkout.cart.proceed-to-checkout') }}
+                        </a>
                    </div>
                </div>

                <div class="right-side">

-                    <div class="price-section">
+
+                    @include('shop::checkout.total.summary', ['cart' => $cart])
+
+                    <!--<div class="price-section">
                        <div class="title">
                            Price Detail
                        </div>
@ -129,7 +134,7 @@
                            <span class="amount">$75.00</span>
                        </div>

-                    </div>
+                    </div>-->

                </div>

--- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php
@ -84,10 +84,11 @@
                    </div>

                    @if ($product->type == 'configurable')
-                        <div class="summary" >
-                            @foreach ($product->super_attributes as $attribute)
                        
-                                {{ $attribute->name . ' : ' . $product->{$attribute->code} }},
+                        <div class="summary" >
+                            @foreach (cart()->getItemAttributeOptionDetails($item) as $key => $option)
+
+                                {{ (!$key ? '' : ' , ') . $option['attribute_name'] . ' : ' . $option['option_label'] }}
                            
                            @endforeach
                        </div>
--- a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php
@ -4,7 +4,7 @@

            <ul class="logo-container">
                <li>
-                    <a href="{{ route('store.home') }}">
+                    <a href="{{ route('shop.home.index') }}">
                        <img class="logo" src="{{ asset('vendor/webkul/shop/assets/images/logo.svg') }}" />
                    </a>
                </li>
--- a/public/themes/default/assets/css/shop.css
+++ b/public/themes/default/assets/css/shop.css
@ -253,7 +253,7 @@ body {
 }

 .header .header-top div.right-content ul.cart-dropdown li.cart-summary .cart .cart-count {
-  color: #0031f0;
+  color: #0041FF;
  padding-right: 3px;
 }

@ -791,7 +791,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {

 .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-title .remove-filter-link {
  font-weight: 400;
-  color: #0031f0;
+  color: #0041FF;
  margin-right: 10px;
 }

@ -1410,7 +1410,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {

 .content .login-form .forgot-password-link {
  font-size: 17px;
-  color: #0031f0;
+  color: #0041FF;
  letter-spacing: -0.11px;
  margin-bottom: 5%;
 }
@ -1492,7 +1492,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
 }

 .account-content .account-side-menu li.active {
-  color: #0031f0;
+  color: #0041FF;
 }

 .account-content .profile {
@ -1511,7 +1511,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
 .account-content .profile .section-head .profile-edit {
  font-size: 17px;
  margin-top: 1%;
-  color: #0031f0;
+  color: #0041FF;
  letter-spacing: -0.11px;
  float: right;
 }
@ -1955,14 +1955,16 @@ section.product-detail div.layouter form .details .attributes {

 .rating-reviews .reviews .view-all {
  margin-top: 15px;
-  color: #0031f0;
+  color: #0041FF;
  margin-bottom: 15px;
 }

 /* cart pages and elements css begins here */
 section.cart {
+  width: 100%;
  color: #242424;
  margin-bottom: 80px;
+  margin-top: 20px;
 }

 section.cart .title {
@ -1970,118 +1972,29 @@ section.cart .title {
 }

 section.cart .cart-content {
-  margin-top: 21px;
-  padding: 1px;
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-orient: horizontal;
-  -webkit-box-direction: normal;
-      -ms-flex-direction: row;
-          flex-direction: row;
-}
-
-.cart .left-side {
-  width: 68.6%;
-  margin-right: 2.4%;
-}
-
-.cart .right-side {
-  width: 29%;
-  display: block;
-}
-
-.cart .right-side .price-section {
+  margin-top: 20px;
  width: 100%;
-  padding: 10px 10px 18px 18px;
-  margin-bottom: 20px;
+  display: inline-block;
 }

-.cart .right-side .price-section .title {
-  font-weight: bold;
-  padding-bottom: 8px;
-  margin-bottom: 10px;
+section.cart .cart-content .left-side {
+  width: 70%;
+  float: left;
 }

-.cart .right-side .price-section .all-item-details {
-  margin-bottom: 17px;
-}
-
-.cart .right-side .price-section .all-item-details .item-details {
-  margin-bottom: 10px;
-}
-
-.cart .right-side .price-section .all-item-details .item-details .price {
+section.cart .cart-content .left-side .misc-controls {
  float: right;
+  margin-top: 20px;
 }

-.cart .right-side .price-section .horizontal-rule {
-  width: 100%;
-  height: 1px;
-  vertical-align: middle;
-  background: #E8E8E8;
+section.cart .cart-content .left-side .misc-controls a.link {
+  margin-right: 15px;
 }

-.cart .right-side .price-section .total-details {
-  margin-top: 10px;
-}
-
-.cart .right-side .price-section .total-details .amount {
-  float: right;
-}
-
-.cart .right-side .coupon-section {
-  padding: 10px 10px 18px 18px;
-}
-
-.cart .right-side .coupon-section .title {
-  font-weight: bold;
-  margin-bottom: 10px;
-}
-
-.cart .right-side .coupon-section .control-group {
-  margin-bottom: 12px !important;
-}
-
-.cart .right-side .coupon-section .control-group input.coupon-input::-moz-placeholder {
-  font-family: "montserrat", sans-serif;
-  color: #242424;
-}
-
-.cart .right-side .coupon-section .control-group input.coupon-input::-webkit-input-placeholder {
-  font-family: "montserrat", sans-serif;
-  color: #242424;
-}
-
-.cart .right-side .coupon-section button {
-  margin-bottom: 10px;
-  background-color: #000;
-  border-radius: 0px;
-}
-
-.cart .right-side .coupon-section .coupon-details .coupon {
-  margin-bottom: 8px;
-}
-
-.cart .right-side .coupon-section .coupon-details .coupon .discount {
-  float: right;
-}
-
-.cart .right-side .coupon-section .horizontal-rule {
-  width: 100%;
-  height: 1px;
-  vertical-align: middle;
-  background: #E8E8E8;
-  margin-bottom: 9px;
-}
-
-.cart .right-side .coupon-section .after-coupon-amount .name {
-  font-weight: bold;
-}
-
-.cart .right-side .coupon-section .after-coupon-amount .amount {
-  float: right;
-  font-weight: bold;
+section.cart .cart-content .right-side {
+  width: 30%;
+  display: inline-block;
+  padding-left: 40px;
 }

 .cart-item-list {
@ -2090,7 +2003,7 @@ section.cart .cart-content {
 }

 .cart-item-list .item {
-  padding: 1.1%;
+  padding: 10px;
  margin-bottom: 20px;
  display: -webkit-box;
  display: -ms-flexbox;
@ -2099,6 +2012,8 @@ section.cart .cart-content {
  -webkit-box-direction: normal;
      -ms-flex-direction: row;
          flex-direction: row;
+  border: 1px solid #E8E8E8;
+  border-radius: 3px;
 }

 .cart-item-list .item .item-image {
@ -2119,25 +2034,13 @@ section.cart .cart-content {
 .cart-item-list .item .item-details .item-title {
  font-size: 18px;
  margin-bottom: 10px;
+  font-weight: 600;
 }

 .cart-item-list .item .item-details .price {
  margin-bottom: 10px;
-}
-
-.cart-item-list .item .item-details .price .main-price {
  font-size: 18px;
-  margin-right: 4px;
-}
-
-.cart-item-list .item .item-details .price .real-price {
-  margin-right: 4px;
-  -webkit-text-decoration-line: line-through;
-          text-decoration-line: line-through;
-}
-
-.cart-item-list .item .item-details .price .discount {
-  color: #FF6472;
+  font-weight: 600;
 }

 .cart-item-list .item .item-details .summary {
@ -2172,24 +2075,242 @@ section.cart .cart-content {
 }

 .cart-item-list .item .item-details .misc .remove {
-  color: #0031f0;
+  color: #0041FF;
  margin-right: 30px;
 }

 .cart-item-list .item .item-details .misc .towishlist {
-  color: #0031f0;
+  color: #0041FF;
 }

-.cart-item-list .misc-controls {
+.order-summary h3 {
+  font-size: 16px;
+  margin-top: 0;
+}
+
+.order-summary .item-detail {
+  margin-top: 12px;
+}
+
+.order-summary .item-detail label.right {
  float: right;
 }

-.cart-item-list .misc-controls span {
-  margin-right: 15px;
+.order-summary .payble-amount {
+  margin-top: 17px;
+  border-top: 1px solid #E8E8E8;
+  padding-top: 12px;
 }

-.cart-item-list .misc-controls button {
-  border-radius: 0px;
+.order-summary .payble-amount label {
+  font-weight: bold;
+}
+
+.order-summary .payble-amount label.right {
+  float: right;
+}
+
+.checkout-process {
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-orient: horizontal;
+  -webkit-box-direction: normal;
+      -ms-flex-direction: row;
+          flex-direction: row;
+  width: 100%;
+  margin-top: 20px;
+  margin-bottom: 20px;
+}
+
+.checkout-process .col-main {
+  width: 65%;
+  padding-right: 40px;
+}
+
+.checkout-process .col-main ul.checkout-steps {
+  width: 100%;
+  display: -webkit-inline-box;
+  display: -ms-inline-flexbox;
+  display: inline-flex;
+  -webkit-box-pack: justify;
+      -ms-flex-pack: justify;
+          justify-content: space-between;
+  width: 100%;
+  padding-bottom: 15px;
+  border-bottom: 1px solid #E8E8E8;
+}
+
+.checkout-process .col-main ul.checkout-steps li {
+  height: 48px;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+}
+
+.checkout-process .col-main ul.checkout-steps li .decorator {
+  height: 48px;
+  width: 48px;
+  border: 1px solid black;
+  border-radius: 50%;
+  display: -webkit-inline-box;
+  display: -ms-inline-flexbox;
+  display: inline-flex;
+  border: 1px solid #E8E8E8;
+  background-repeat: no-repeat;
+  background-position: center;
+}
+
+.checkout-process .col-main ul.checkout-steps li .decorator.address-info {
+  background-image: url("../images/address.svg");
+}
+
+.checkout-process .col-main ul.checkout-steps li .decorator.shipping {
+  background-image: url("../images/shipping.svg");
+}
+
+.checkout-process .col-main ul.checkout-steps li .decorator.payment {
+  background-image: url("../images/payment.svg");
+}
+
+.checkout-process .col-main ul.checkout-steps li .decorator.review {
+  background-image: url("../images/finish.svg");
+}
+
+.checkout-process .col-main ul.checkout-steps li.completed {
+  cursor: pointer;
+}
+
+.checkout-process .col-main ul.checkout-steps li.completed .decorator {
+  background-image: url("../images/complete.svg");
+}
+
+.checkout-process .col-main ul.checkout-steps li span {
+  margin-left: 7px;
+  margin-top: auto;
+  margin-bottom: auto;
+}
+
+.checkout-process .col-main ul.checkout-steps li.active {
+  color: #2650EF;
+}
+
+.checkout-process .col-main ul.checkout-steps li.active .decorator {
+  border: 1px solid #2650EF;
+}
+
+.checkout-process .col-main .step-content {
+  padding-top: 20px;
+}
+
+.checkout-process .col-main .step-content .form-header {
+  width: 100%;
+  display: inline-block;
+}
+
+.checkout-process .col-main .step-content .form-header h1 {
+  float: left;
+}
+
+.checkout-process .col-main .step-content .form-header .btn {
+  float: right;
+}
+
+.checkout-process .col-main .step-content .form-container {
+  border-bottom: 1px solid #E8E8E8;
+  padding-top: 20px;
+  padding-bottom: 20px;
+}
+
+.checkout-process .col-main .step-content .shipping-methods h4 {
+  margin: 0;
+}
+
+.checkout-process .col-main .step-content .payment-methods .radio {
+  font-weight: 600;
+}
+
+.checkout-process .col-main .step-content .payment-methods .control-info {
+  margin-left: 28px;
+}
+
+.checkout-process .col-main .step-content .address {
+  display: inline-block;
+  width: 100%;
+}
+
+.checkout-process .col-main .step-content .address .address-card {
+  width: 50%;
+  float: left;
+}
+
+.checkout-process .col-main .step-content .address .address-card .card-title span {
+  font-weight: 600;
+}
+
+.checkout-process .col-main .step-content .address .address-card .card-content {
+  margin-top: 15px;
+  color: #121212;
+  line-height: 25px;
+}
+
+.checkout-process .col-main .step-content .address .address-card .card-content .horizontal-rule {
+  margin: 12px 0;
+  display: block;
+  width: 25px;
+  background: #121212;
+}
+
+.checkout-process .col-main .step-content .cart-item-list .item .row .title {
+  width: 100px;
+  display: inline-block;
+  color: #5E5E5E;
+  font-weight: 500;
+  margin-bottom: 10px;
+}
+
+.checkout-process .col-main .step-content .cart-item-list .item .row .value {
+  font-size: 18px;
+  font-weight: 600;
+}
+
+.checkout-process .col-main .step-content .order-description {
+  display: inline-block;
+  width: 100%;
+}
+
+.checkout-process .col-main .step-content .order-description .shipping {
+  margin-bottom: 25px;
+}
+
+.checkout-process .col-main .step-content .order-description .decorator {
+  height: 48px;
+  width: 48px;
+  border-radius: 50%;
+  border: 1px solid #E8E8E8;
+  vertical-align: middle;
+  display: inline-block;
+  text-align: center;
+}
+
+.checkout-process .col-main .step-content .order-description .decorator .icon {
+  margin-top: 7px;
+}
+
+.checkout-process .col-main .step-content .order-description .text {
+  font-weight: 600;
+  vertical-align: middle;
+  display: inline-block;
+}
+
+.checkout-process .col-main .step-content .order-description .text .info {
+  font-weight: 500;
+  margin-top: 2px;
+}
+
+.checkout-process .col-right {
+  width: 35%;
+  padding-left: 40px;
 }

 .attached-products-wrapper {
@ -2262,7 +2383,7 @@ section.cart .cart-content {
 .order .order-section-head .order-cancel {
  font-size: 17px;
  margin-top: 1%;
-  color: #0031f0;
+  color: #0041FF;
  letter-spacing: -0.11px;
  float: right;
 }
@ -2548,7 +2669,7 @@ section.cart .cart-content {
    float: right;
    text-align: right;
    font-size: 17px;
-    color: #0031f0;
+    color: #0041FF;
    letter-spacing: -0.11px;
    margin-top: 13px;
    margin-bottom: 13px;
@ -2772,7 +2893,7 @@ section.cart .cart-content {
    float: right;
    text-align: right;
    font-size: 17px;
-    color: #0031f0;
+    color: #0041FF;
    letter-spacing: -0.11px;
    margin-top: 13px;
    margin-bottom: 13px;
@ -2964,241 +3085,6 @@ section.cart .cart-content {
  }
 }

-.checkout-process {
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-orient: horizontal;
-  -webkit-box-direction: normal;
-      -ms-flex-direction: row;
-          flex-direction: row;
-  width: 100%;
-  margin-top: 20px;
-  margin-bottom: 20px;
-}
-
-.checkout-process .col-main {
-  width: 65%;
-  padding-right: 40px;
-}
-
-.checkout-process .col-main ul.checkout-steps {
-  width: 100%;
-  display: -webkit-inline-box;
-  display: -ms-inline-flexbox;
-  display: inline-flex;
-  -webkit-box-pack: justify;
-      -ms-flex-pack: justify;
-          justify-content: space-between;
-  width: 100%;
-  padding-bottom: 15px;
-  border-bottom: 1px solid #E8E8E8;
-}
-
-.checkout-process .col-main ul.checkout-steps li {
-  height: 48px;
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
-}
-
-.checkout-process .col-main ul.checkout-steps li .decorator {
-  height: 48px;
-  width: 48px;
-  border: 1px solid black;
-  border-radius: 50%;
-  display: -webkit-inline-box;
-  display: -ms-inline-flexbox;
-  display: inline-flex;
-  border: 1px solid #E8E8E8;
-  background-repeat: no-repeat;
-  background-position: center;
-}
-
-.checkout-process .col-main ul.checkout-steps li .decorator.address-info {
-  background-image: url("../images/address.svg");
-}
-
-.checkout-process .col-main ul.checkout-steps li .decorator.shipping {
-  background-image: url("../images/shipping.svg");
-}
-
-.checkout-process .col-main ul.checkout-steps li .decorator.payment {
-  background-image: url("../images/payment.svg");
-}
-
-.checkout-process .col-main ul.checkout-steps li .decorator.review {
-  background-image: url("../images/finish.svg");
-}
-
-.checkout-process .col-main ul.checkout-steps li.completed {
-  cursor: pointer;
-}
-
-.checkout-process .col-main ul.checkout-steps li.completed .decorator {
-  background-image: url("../images/complete.svg");
-}
-
-.checkout-process .col-main ul.checkout-steps li span {
-  margin-left: 7px;
-  margin-top: auto;
-  margin-bottom: auto;
-}
-
-.checkout-process .col-main ul.checkout-steps li.active {
-  color: #2650EF;
-}
-
-.checkout-process .col-main ul.checkout-steps li.active .decorator {
-  border: 1px solid #2650EF;
-}
-
-.checkout-process .col-main .step-content {
-  padding-top: 20px;
-}
-
-.checkout-process .col-main .step-content .form-header {
-  width: 100%;
-  display: inline-block;
-}
-
-.checkout-process .col-main .step-content .form-header h1 {
-  float: left;
-}
-
-.checkout-process .col-main .step-content .form-header .btn {
-  float: right;
-}
-
-.checkout-process .col-main .step-content .form-container {
-  border-bottom: 1px solid #E8E8E8;
-  padding-top: 20px;
-  padding-bottom: 20px;
-}
-
-.checkout-process .col-main .step-content .shipping-methods h4 {
-  margin: 0;
-}
-
-.checkout-process .col-main .step-content .payment-methods .radio {
-  font-weight: 600;
-}
-
-.checkout-process .col-main .step-content .payment-methods .control-info {
-  margin-left: 28px;
-}
-
-.checkout-process .col-main .step-content .address {
-  display: inline-block;
-  width: 100%;
-}
-
-.checkout-process .col-main .step-content .address .address-card {
-  width: 50%;
-  float: left;
-}
-
-.checkout-process .col-main .step-content .address .address-card .card-title span {
-  font-weight: 600;
-}
-
-.checkout-process .col-main .step-content .address .address-card .card-content {
-  margin-top: 15px;
-  color: #121212;
-  line-height: 25px;
-}
-
-.checkout-process .col-main .step-content .address .address-card .card-content .horizontal-rule {
-  margin: 12px 0;
-  display: block;
-  width: 25px;
-  background: #121212;
-}
-
-.checkout-process .col-main .step-content .cart-item-list .item {
-  border: 1px solid #E8E8E8;
-  border-radius: 3px;
-  padding: 20px;
-}
-
-.checkout-process .col-main .step-content .cart-item-list .item .row .title {
-  width: 100px;
-  display: inline-block;
-  color: #5E5E5E;
-  font-weight: 500;
-  margin-bottom: 10px;
-}
-
-.checkout-process .col-main .step-content .cart-item-list .item .row .value {
-  font-size: 18px;
-  font-weight: 600;
-}
-
-.checkout-process .col-main .step-content .order-description {
-  display: inline-block;
-  width: 100%;
-}
-
-.checkout-process .col-main .step-content .order-description .shipping {
-  margin-bottom: 25px;
-}
-
-.checkout-process .col-main .step-content .order-description .decorator {
-  height: 48px;
-  width: 48px;
-  border-radius: 50%;
-  border: 1px solid #E8E8E8;
-  vertical-align: middle;
-  display: inline-block;
-  text-align: center;
-}
-
-.checkout-process .col-main .step-content .order-description .decorator .icon {
-  margin-top: 7px;
-}
-
-.checkout-process .col-main .step-content .order-description .text {
-  font-weight: 600;
-  vertical-align: middle;
-  display: inline-block;
-}
-
-.checkout-process .col-main .step-content .order-description .text .info {
-  font-weight: 500;
-  margin-top: 2px;
-}
-
-.checkout-process .col-right {
-  width: 35%;
-  padding-left: 40px;
-}
-
-.checkout-process .order-summary h3 {
-  font-size: 16px;
-}
-
-.checkout-process .order-summary .item-detail {
-  margin-top: 12px;
-}
-
-.checkout-process .order-summary .item-detail label.right {
-  float: right;
-}
-
-.checkout-process .order-summary .payble-amount {
-  margin-top: 17px;
-  border-top: 1px solid #E8E8E8;
-  padding-top: 12px;
-}
-
-.checkout-process .order-summary .payble-amount label {
-  font-weight: bold;
-}
-
-.checkout-process .order-summary .payble-amount label.right {
-  float: right;
-}
-
 section.review {
  color: #242424;
 }
@ -3322,7 +3208,7 @@ section.review .review-layouter .review-info .submit-button {
 }

 section.review .review-layouter .review-info .submit-button button {
-  background: #0031f0;
+  background: #0041FF;
  font-size: 14px;
  color: #FFFFFF;
  letter-spacing: -0.26px;
@ -3394,7 +3280,7 @@ section.review .review-layouter .review-info .review-detail .rating-calculate .p
 }

 .cusomer-section .customer-section-info .pro-discription .title {
-  color: #0031f0;
+  color: #0041FF;
  margin-top: 15px;
 }