diff --git a/packages/Webkul/Checkout/src/Database/Migrations/2018_09_05_150444_create_cart_table.php b/packages/Webkul/Checkout/src/Database/Migrations/2018_09_05_150444_create_cart_table.php
index c11b69d97..b142835c8 100644
--- a/packages/Webkul/Checkout/src/Database/Migrations/2018_09_05_150444_create_cart_table.php
+++ b/packages/Webkul/Checkout/src/Database/Migrations/2018_09_05_150444_create_cart_table.php
@@ -16,9 +16,9 @@ class CreateCartTable extends Migration
Schema::create('cart', function (Blueprint $table) {
$table->increments('id');
$table->integer('customer_id')->unsigned()->nullable();
- $table->foreign('customer_id')->references('id')->on('customers');
+ $table->foreign('customer_id')->references('id')->on('customers')->onDelete('cascade');
$table->integer('channel_id')->unsigned();
- $table->foreign('channel_id')->references('id')->on('channels');
+ $table->foreign('channel_id')->references('id')->on('channels')->onDelete('cascade');
$table->string('shipping_method')->nullable();
$table->string('coupon_code')->nullable();
$table->boolean('is_gift')->default(0);
diff --git a/packages/Webkul/Checkout/src/Database/Migrations/2018_09_05_150915_create_cart_items_table.php b/packages/Webkul/Checkout/src/Database/Migrations/2018_09_05_150915_create_cart_items_table.php
index 99ab8d31c..0c106ef06 100644
--- a/packages/Webkul/Checkout/src/Database/Migrations/2018_09_05_150915_create_cart_items_table.php
+++ b/packages/Webkul/Checkout/src/Database/Migrations/2018_09_05_150915_create_cart_items_table.php
@@ -19,7 +19,7 @@ class CreateCartItemsTable extends Migration
$table->foreign('product_id')->references('id')->on('products');
$table->integer('quantity')->unsigned()->default(1);
$table->integer('cart_id')->unsigned();
- $table->foreign('cart_id')->references('id')->on('cart');
+ $table->foreign('cart_id')->references('id')->on('cart')->onDelete('cascade');
$table->string('sku')->nullable();
$table->string('type')->nullable();
$table->string('name')->nullable();
diff --git a/packages/Webkul/Checkout/src/Database/Migrations/2018_09_19_092845_create_cart_address.php b/packages/Webkul/Checkout/src/Database/Migrations/2018_09_19_092845_create_cart_address.php
index 2148ccf8f..1e5f9f6c6 100644
--- a/packages/Webkul/Checkout/src/Database/Migrations/2018_09_19_092845_create_cart_address.php
+++ b/packages/Webkul/Checkout/src/Database/Migrations/2018_09_19_092845_create_cart_address.php
@@ -27,7 +27,7 @@ class CreateCartAddress extends Migration
$table->string('phone');
$table->string('address_type');
$table->integer('cart_id')->nullable()->unsigned();
- $table->foreign('cart_id')->references('id')->on('cart');
+ $table->foreign('cart_id')->references('id')->on('cart')->onDelete('cascade');
$table->integer('customer_id')->nullable()->unsigned();
$table->foreign('customer_id')->references('id')->on('customers');
$table->timestamps();
diff --git a/packages/Webkul/Customer/src/Database/migrations/2018_07_24_082930_create_customers_table.php b/packages/Webkul/Customer/src/Database/migrations/2018_07_24_082930_create_customers_table.php
index bd5ea3ebb..e5ad82a69 100644
--- a/packages/Webkul/Customer/src/Database/migrations/2018_07_24_082930_create_customers_table.php
+++ b/packages/Webkul/Customer/src/Database/migrations/2018_07_24_082930_create_customers_table.php
@@ -15,6 +15,8 @@ class CreateCustomersTable extends Migration
{
Schema::create('customers', function (Blueprint $table) {
$table->increments('id');
+ $table->integer('channel_id')->unsigned();
+ $table->foreign('channel_id')->references('id')->on('channels');
$table->string('first_name');
$table->string('last_name');
$table->enum('gender', ['Male', 'Female']);
diff --git a/packages/Webkul/Customer/src/Database/migrations/2018_07_24_083025_create_customer_addresses_table.php b/packages/Webkul/Customer/src/Database/migrations/2018_07_24_083025_create_customer_addresses_table.php
index 5d68a3249..dd9676769 100644
--- a/packages/Webkul/Customer/src/Database/migrations/2018_07_24_083025_create_customer_addresses_table.php
+++ b/packages/Webkul/Customer/src/Database/migrations/2018_07_24_083025_create_customer_addresses_table.php
@@ -16,7 +16,7 @@ class CreateCustomerAddressesTable extends Migration
Schema::create('customer_addresses', function (Blueprint $table) {
$table->increments('id');
$table->integer('customer_id')->unsigned();
- $table->foreign('customer_id')->references('id')->on('customers');
+ $table->foreign('customer_id')->references('id')->on('customers')->onDelete('cascade');
$table->string('address1');
$table->string('address2')->nullable();
$table->string('country');
diff --git a/packages/Webkul/Customer/src/Database/migrations/2018_10_03_025230_create_wishlist_table.php b/packages/Webkul/Customer/src/Database/migrations/2018_10_03_025230_create_wishlist_table.php
new file mode 100644
index 000000000..08f8adae4
--- /dev/null
+++ b/packages/Webkul/Customer/src/Database/migrations/2018_10_03_025230_create_wishlist_table.php
@@ -0,0 +1,41 @@
+increments('id');
+ $table->integer('channel_id')->unsigned();
+ $table->foreign('channel_id')->references('id')->on('channels');
+ $table->integer('product_id')->unsigned();
+ $table->foreign('product_id')->references('id')->on('products');
+ $table->integer('customer_id')->unsigned();
+ $table->foreign('customer_id')->references('id')->on('customers')->onDelete('cascade');
+ $table->json('item_options')->nullable();
+ $table->date('moved_to_cart')->nullable();
+ $table->boolean('shared')->nullable();
+ $table->date('time_of_moving');
+ $table->timestamps();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists('wishlist');
+ }
+}
diff --git a/packages/Webkul/Shop/src/Providers/ComposerServiceProvider.php b/packages/Webkul/Shop/src/Providers/ComposerServiceProvider.php
index c3838140f..b60018b7a 100644
--- a/packages/Webkul/Shop/src/Providers/ComposerServiceProvider.php
+++ b/packages/Webkul/Shop/src/Providers/ComposerServiceProvider.php
@@ -17,7 +17,7 @@ class ComposerServiceProvider extends ServiceProvider
public function boot()
{
//using the class based composers...
- View::composer(['shop::layouts.header.index', 'shop::layouts.footer','shop::layouts.master'], 'Webkul\Shop\Http\ViewComposers\Categories\CategoryComposer');
+ View::composer(['shop::layouts.header.index', 'shop::layouts.footer.footer'], 'Webkul\Shop\Http\ViewComposers\Categories\CategoryComposer');
}
/**
diff --git a/packages/Webkul/Shop/src/Resources/assets/js/components/cart-dropdown.vue b/packages/Webkul/Shop/src/Resources/assets/js/components/cart-dropdown.vue
index d9f8b74ba..722dbb6fd 100644
--- a/packages/Webkul/Shop/src/Resources/assets/js/components/cart-dropdown.vue
+++ b/packages/Webkul/Shop/src/Resources/assets/js/components/cart-dropdown.vue
@@ -89,94 +89,4 @@ export default {
}
}
}
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
index 233ddc518..0406160eb 100644
--- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
@@ -283,6 +283,7 @@ section.slider-block {
flex-direction: row;
justify-content: flex-end;
align-items: center;
+ cursor: pointer;
ul.account-dropdown-container {
float: right;
@@ -314,55 +315,129 @@ section.slider-block {
}
}
- ul.cart-dropdown {
+ ul.cart-dropdown-container {
float: right;
+ margin-left: 10px;
- li.cart-summary {
+ li.cart-dropdown {
display: flex;
flex-direction: row;
- margin-left: 14px;
+ justify-content: center;
+ align-items: center;
.cart-icon {
- margin: 0;
+ margin-right: 8px;
height: 24px;
width: 24px;
- margin-right: 8px;
- }
- .cart {
- padding-top: 3px;
- padding-right: 5px;
-
- .cart-count {
- color: $brand-color;
- padding-right: 3px;
- }
}
.icon.arrow-down-icon {
margin-top: 10px;
}
+
+ .dropdown-list {
+ width: 387px;
+ }
+
+ .dropdown-list .dropdown-container {
+ padding: 10px 18px 10px 18px;
+ max-height: 410px;
+ overflow-y: auto;
+
+ .dropdown-cart {
+ color: #242424;
+ }
+ .dropdown-cart > .dropdown-header {
+ width: 100%;
+ }
+
+ .dropdown-cart > .dropdown-header p{
+ display: inline;
+ line-height: 25px;
+ }
+
+ .dropdown-cart > .dropdown-header i{
+ cursor: pointer;
+ float: right;
+ height: 22px;
+ width: 22px;
+ }
+
+ .dropdown-cart > .dropdown-header p.heading {
+ font-weight: lighter;
+ }
+
+ .dropdown-content {
+ padding-top: 8px;
+ padding-bottom: 10px;
+ }
+
+ .dropdown-content .item{
+ display: flex;
+ flex-direction: row;
+ border-bottom: 1px solid #E8E8E8;
+ padding-top: 8px;
+ padding-bottom: 8px;
+ }
+
+ .dropdown-content .item img{
+ height: 75px;
+ width: 75px;
+ margin-right: 8px;
+ }
+
+ .dropdown-content .item-details{
+ height: 75px;
+ }
+
+ .item-details .item-name {
+ font-size: 16px;
+ font-weight: bold;
+ margin-bottom: 8px;
+ }
+
+ .item-details .item-price {
+ margin-bottom: 8px;
+ }
+
+ .item-details .item-qty {
+ font-weight: lighter;
+ margin-bottom: 8px;
+ }
+
+ .dropdown-footer {
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ align-items: center;
+ margin-bottom: 8px;
+ }
+
+ .dropdown-footer button {
+ border-radius: 0px;
+ width: 130px;
+ }
+ }
}
}
}
-
- .right-responsive {
+ ul.right-responsive {
display: none;
- ul.right-wrapper {
- display: flex;
- flex-direction: row;
- justify-content: flex-end;
- align-items: center;
+ li {
+ margin-right : 5px;
+ }
- li:not(:last-child) {
- margin-right: 7px;
+ li:last-child {
+ margin-right: 0px;
+ }
- span.icon {
- margin: 0;
- height: 24px;
- width: 24px;
- }
- }
+ ul {
+ margin-right : 5px;
+ }
+
+ ul:last-child {
+ margin-right: 0px;
}
}
}
@@ -486,50 +561,25 @@ section.slider-block {
}
}
-//header page responsive css start here
-@media only screen and (max-width: 770px) {
+@media all and (max-width: 720px) {
+ .header-bottom {
+ display: none !important;
+ }
- .header {
+ ul.search-container {
+ display: none !important;
+ }
- .header-top {
+ ul.account-dropdown-container {
+ display: none !important;
+ }
- div.left-content {
+ ul.cart-dropdown-container {
+ display: none !important;
+ }
- ul.search-container {
- li.search-group {
- display: none;
- }
- }
- }
-
- div.right-content {
- display: none;
- }
-
- .right-responsive {
- display: inherit;
- }
- }
-
-
- .header-bottom {
- border-bottom: none;
- display: none;
-
- .nav > li {
- float: none;
- height: 48px;
- border-bottom: 1px solid $border-color;
- }
-
- .nav > li:last-child {
- float:none;
- }
-
- .nav > li:last-child img {
- margin-left: 10px;
- }
- }
+ ul.right-responsive {
+ display: flex !important;
}
}
diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/components.scss b/packages/Webkul/Shop/src/Resources/assets/sass/components.scss
index 4eba0e348..079db9b39 100644
--- a/packages/Webkul/Shop/src/Resources/assets/sass/components.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/components.scss
@@ -7,6 +7,14 @@
grid-auto-rows: auto;
}
+.product-grid-3 {
+ display: grid;
+ grid-template-columns: repeat(auto-fit, minmax(240px, 1fr));
+ grid-column-gap: 27px;
+ grid-row-gap: 15px;
+ grid-auto-rows: auto;
+}
+
@media only screen and (max-width: 854px) {
.product-grid-4 {
grid-template-columns: 30% 30% 30%;
@@ -30,15 +38,6 @@
}
-.product-grid-3 {
- display: grid;
- grid-template-columns: repeat(auto-fit, minmax(240px, 1fr));
- grid-column-gap: 27px;
- grid-row-gap: 15px;
- grid-auto-rows: auto;
-}
-
-
.product-card {
.product-image {
@@ -64,22 +63,16 @@
}
.product-description {
- margin-bottom: 14px;
display: none;
}
.product-ratings {
width: 100%;
- margin-bottom: 14px;
.icon {
width: 16px;
height: 16px;
}
-
- .total-reviews {
- display: none;
- }
}
.cart-fav-seg {
@@ -87,7 +80,6 @@
width: 100%;
.addtocart {
- border-radius: 0px;
margin-right: 10px;
text-transform: uppercase;
white-space: nowrap;
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart.blade.php
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
index d1b9239d9..18ae5c9e1 100644
--- a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
@@ -49,11 +49,11 @@
@if ($product->type == 'configurable')
- @foreach (cart::getItemAttributeOptionDetails($item) as $key => $option)
+ {{-- @foreach (cart::getItemAttributeOptionDetails($item) as $key => $option)
{{ (!$key ? '' : ' , ') . $option['attribute_name'] . ' : ' . $option['option_label'] }}
- @endforeach
+ @endforeach --}}
@endif
diff --git a/packages/Webkul/Shop/src/Resources/views/home/featured-products.blade.php b/packages/Webkul/Shop/src/Resources/views/home/featured-products.blade.php
index 9e7815d0c..09f2262e6 100644
--- a/packages/Webkul/Shop/src/Resources/views/home/featured-products.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/home/featured-products.blade.php
@@ -5,6 +5,7 @@
+ @for($i=0; $i<4; $i++)
@@ -15,7 +16,7 @@
$65.00
-
+
@@ -25,65 +26,6 @@
-
-
-
-
-
- Red Black Tees
-
-
- $65.00
-
-
-
-
-
-
-
-
Add to Cart
-
-
-
-
-
-
-
-
- Red Black Tees
-
-
- $65.00
-
-
-
-
-
-
-
-
Add to Cart
-
-
-
-
-
-
-
-
- Red Black Tees
-
-
- $65.00
-
-
-
-
-
-
-
-
Add to Cart
-
-
-
+ @endfor
diff --git a/packages/Webkul/Shop/src/Resources/views/home/new-products.blade.php b/packages/Webkul/Shop/src/Resources/views/home/new-products.blade.php
index 9b6eadc15..bd1d00ef2 100644
--- a/packages/Webkul/Shop/src/Resources/views/home/new-products.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/home/new-products.blade.php
@@ -15,7 +15,7 @@
$65.00
-
+
@@ -36,7 +36,7 @@
$65.00
-
+
@@ -57,7 +57,7 @@
$65.00
-
+
@@ -78,7 +78,7 @@
$65.00
-
+
diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/foo.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/foo.blade.php
deleted file mode 100644
index 2bbfc9980..000000000
--- a/packages/Webkul/Shop/src/Resources/views/layouts/foo.blade.php
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
-
-
-
-
Foo
-
-
-
-
-
-
-
-
diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/footer.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/footer/footer.blade.php
similarity index 100%
rename from packages/Webkul/Shop/src/Resources/views/layouts/footer.blade.php
rename to packages/Webkul/Shop/src/Resources/views/layouts/footer/footer.blade.php
diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/footer/index.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/footer/index.blade.php
deleted file mode 100644
index 61d8369ed..000000000
--- a/packages/Webkul/Shop/src/Resources/views/layouts/footer/index.blade.php
+++ /dev/null
@@ -1,47 +0,0 @@
-
diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php
index 9d8886b82..e81596070 100644
--- a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php
@@ -23,13 +23,6 @@
- {{-- Triggered on responsive mode only --}}
-
-
@endauth
-
+
+
+
+
+ @if(isset($cart))
+ @php
+ $cartInstance = session()->get('cart');
+ @endphp
+
+
+
+ {{$cartInstance->items_count}} Products
+
+
+
+
+
+
+
+
+
+
+
+
+ @foreach($cart as $product)
+
+
+
+
+
+
{{$product['0']}}
+
{{$product['1']}}
+
Quantity - {{$product['3']}}
+
+
+ @endforeach
+
+
+
+
+
+
+ @else
+
+ @endif
+
- @if(isset($cart))
-
- @else
-
-
-
+
+
+
- 0 Products
+
-
+
+
+
+
+ {{--
+ Account
+
+
--}}
+
+
+
+ @guest
+
+ @endguest
+ @auth('customer')
+
+ @endauth
- @endif
+
- {{-- Meant for responsive views only --}}
-
+
+ @if(isset($cart))
+ @php
+ $cartInstance = session()->get('cart');
+ @endphp
+
+
+
-
- {{-- use this section for the dropdown of the hamburger menu --}}
-
+
+
+
+
+
+ @foreach($cart as $product)
+
+
+
+
+
+
{{$product['0']}}
+
{{$product['1']}}
+
Quantity - {{$product['3']}}
+
+
+ @endforeach
+
+
+
+
+
+
+ @else
+
+ @endif
+
+
+ {{--
--}}
+
-
-
-
diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php
index 143fc99f6..d19b67b0b 100644
--- a/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php
@@ -35,7 +35,7 @@
- @include('shop::layouts.footer')
+ @include('shop::layouts.footer.footer')
diff --git a/packages/Webkul/Shop/src/Resources/views/partials/card.blade.php b/packages/Webkul/Shop/src/Resources/views/partials/card.blade.php
deleted file mode 100644
index 8918cecca..000000000
--- a/packages/Webkul/Shop/src/Resources/views/partials/card.blade.php
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
- Red Black Tees
-
-
- $65.00
-
-
-
-
-
-
-
-
Add to Cart
-
-
-
diff --git a/packages/Webkul/Shop/src/Resources/views/products/review.blade.php b/packages/Webkul/Shop/src/Resources/views/products/review.blade.php
index 47b7000cf..1b655b16f 100644
--- a/packages/Webkul/Shop/src/Resources/views/products/review.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/review.blade.php
@@ -1,7 +1,7 @@
@inject ('reviewHelper', 'Webkul\Product\Product\Review')
@if ($total = $reviewHelper->getTotalReviews($product))
-
+
@for ($i = 1; $i <= round($reviewHelper->getAverageRating($product)); $i++)
diff --git a/packages/Webkul/Shop/src/Resources/views/store/cart/compare.blade.php b/packages/Webkul/Shop/src/Resources/views/store/cart/compare.blade.php
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/Webkul/Shop/src/Resources/views/store/cart/index.blade.php b/packages/Webkul/Shop/src/Resources/views/store/cart/index.blade.php
deleted file mode 100644
index 172dc910d..000000000
--- a/packages/Webkul/Shop/src/Resources/views/store/cart/index.blade.php
+++ /dev/null
@@ -1,208 +0,0 @@
-@extends('shop::layouts.master')
-@section('content-wrapper')
-
-
- Shopping Cart
-
-
-
- {{-- {{ dd($products) }} --}}
-
-
-
- @foreach($products as $product)
-
-
-
-
-
-
-
-
- {{$product[0]}}
-
-
-
-
- {{$product[1]}}
-
-
- $25.00
-
-
- 10% Off
-
-
-
-
- Color : Gray, Size : S, Sleeve type : Puffed Sleeves, Occasion : Birthday, Marriage Anniversary
-
-
-
-
Quantity
-
{{ $product[3] }}
-
Remove
-
Move to Wishlist
-
-
-
-
- @endforeach
-
-
- Continue Shopping
- PROCEED TO CHECKOUT
-
-
-
-
-
-
- Price Detail
-
-
- @foreach($products as $product)
-
- {{ $product[0] }}
- $ {{ $product[1] }}
-
- @endforeach
-
-
-
-
-
- Amount Payable
- $75.00
-
-
-
-
-
-
Apply Coupon
-
-
-
-
-
-
Apply
-
-
-
Coupon Used
-
- Coupon 1
- $15
-
-
- Coupon 2
- $5
-
-
-
-
-
-
- Amount Payable
- $75.00
-
-
-
-
-
-
-
-
-
-
-@endsection
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/views/store/home/index.blade.php b/packages/Webkul/Shop/src/Resources/views/store/home/index.blade.php
deleted file mode 100644
index 025170e8a..000000000
--- a/packages/Webkul/Shop/src/Resources/views/store/home/index.blade.php
+++ /dev/null
@@ -1,9 +0,0 @@
-@extends('shop::layouts.master')
-@section('slider')
- @include('shop::store.slider.slider')
-@endsection
-@section('content-wrapper')
- @include('shop::store.grids.featured.featuredproductgrid')
- @include('shop::store.grids.newproduct.newproductgrid')
- @include('shop::store.grids.newsupdate.newsupdategrid')
-@endsection
diff --git a/packages/Webkul/Shop/src/Resources/views/store/product/details/index.blade.php b/packages/Webkul/Shop/src/Resources/views/store/product/details/index.blade.php
deleted file mode 100644
index 1a96fb00c..000000000
--- a/packages/Webkul/Shop/src/Resources/views/store/product/details/index.blade.php
+++ /dev/null
@@ -1,285 +0,0 @@
-@extends('shop::layouts.master')
-@section('content-wrapper')
-
-
-
- Home > Men > Slit Open Jeans
-
-
-
-
-
-
-
-
-
- Rainbow creation Embroidered
-
-
-
- 75 Ratings & 11 Reviews
-
-
-
- $24.00
-
-
- $25.00
-
-
- 10% Off
-
-
-
- InStock
-
-
-
- Bluetooth-enabled connectivity with NFC provides 100% independence, device compatibility and freedom of movement Ear-cup-mounted sensors for easy-access, touch-sensitive control 30mm drivers.
-
-
-
-
-
-
-
- {{-- The elements below will be accordians --}}
-
-
Description
- Bluetooth-enabled connectivity with NFC provides 100% independence, device compatibility and freedom of movement Ear-cup-mounted sensors for easy-access, touch-sensitive control 30mm drivers
-
- Bluetooth-enabled connectivity with NFC provides 100% independence, device compatibility and freedom of movement Ear-cup-mounted sensors for easy-access, touch-sensitive control 30mm d rivers. Bluetooth-enabled connectivity with NFC provides 100% independence, device compatibility and freedom of movement Ear-cup-mounted sensors for easy-access, touch-sensitive control 30mm drivers
-
- NFC provides 100% independence, device compatibility and freedom of movement Ear-cup-mounted sensors for easy-access, touch-sensitive control 30mm drivers
-
-
-
-
Specification
-
-
-
-
-
-
- Ratings & Reviews
-
-
-
- 4.3
-
-
-
-
-
-
Write Review
-
-
- 24,330 Ratings & 104 Reviews
-
-
-
-
-
- Awesome
-
-
-
-
-
- NFC provides 100% independence, device compatibility and freedom of movement Ear-cup-mounted sensors for easy-access, touch-sensitive control 30mm drivers
-
-
-
- By John Doe
-
-
- , 25, June 2018
-
-
-
-
-
- Awesome
-
-
-
-
-
- NFC provides 100% independence, device compatibility and freedom of movement Ear-cup-mounted sensors for easy-access, touch-sensitive control 30mm drivers
-
-
-
- By John Doe
-
-
- , 25, June 2018
-
-
-
-
-
- Awesome
-
-
-
-
-
- NFC provides 100% independence, device compatibility and freedom of movement Ear-cup-mounted sensors for easy-access, touch-sensitive control 30mm drivers
-
-
-
- By John Doe
-
-
- , 25, June 2018
-
-
-
-
View All
-
-
-
-
-
-
-
-
-
-
-@endsection
diff --git a/packages/Webkul/Shop/src/Resources/views/store/product/review/index.blade.php b/packages/Webkul/Shop/src/Resources/views/store/product/review/index.blade.php
deleted file mode 100644
index ea0aeb8d6..000000000
--- a/packages/Webkul/Shop/src/Resources/views/store/product/review/index.blade.php
+++ /dev/null
@@ -1,162 +0,0 @@
-@extends('shop::layouts.master')
-@section('content-wrapper')
-
-
-
- Home > Men > Slit Open Jeans
-
-
-
-
-
-
-
-
-
-
-
-
-
- Slit Open Jeans
-
-
-
-
- $24.00
-
-
- $25.00
-
-
- 10% Off
-
-
-
-
-
-
-
-
-
- Ratings & Reviews
- Write Review
-
-
-
-
-
- 4.3
-
-
-
-
-
-
- 24,330 Ratings & 104 Reviews
-
-
-
-
-
-
-
-
- Awesome
-
-
-
-
-
- NFC provides 100% independence, device compatibility and freedom of movement Ear-cup-mounted sensors for easy-access, touch-sensitive control 30mm drivers
-
-
-
- By John Doe
-
-
- , 25, June 2018
-
-
-
-
-
- Awesome
-
-
-
-
-
- NFC provides 100% independence, device compatibility and freedom of movement Ear-cup-mounted sensors for easy-access, touch-sensitive control 30mm drivers
-
-
-
- By John Doe
-
-
- , 25, June 2018
-
-
-
-
-
- Awesome
-
-
-
-
-
- NFC provides 100% independence, device compatibility and freedom of movement Ear-cup-mounted sensors for easy-access, touch-sensitive control 30mm drivers
-
-
-
- By John Doe
-
-
- , 25, June 2018
-
-
-
-
Load More
-
-
-
-
-@endsection
diff --git a/public/themes/default/assets/css/shop.css b/public/themes/default/assets/css/shop.css
index fdaa7e86d..9917d0021 100644
--- a/public/themes/default/assets/css/shop.css
+++ b/public/themes/default/assets/css/shop.css
@@ -81,6 +81,14 @@
grid-auto-rows: auto;
}
+.product-grid-3 {
+ display: grid;
+ grid-template-columns: repeat(auto-fit, minmax(240px, 1fr));
+ grid-column-gap: 27px;
+ grid-row-gap: 15px;
+ grid-auto-rows: auto;
+}
+
@media only screen and (max-width: 854px) {
.product-grid-4 {
grid-template-columns: 30% 30% 30%;
@@ -101,14 +109,6 @@
}
}
-.product-grid-3 {
- display: grid;
- grid-template-columns: repeat(auto-fit, minmax(240px, 1fr));
- grid-column-gap: 27px;
- grid-row-gap: 15px;
- grid-auto-rows: auto;
-}
-
.product-card .product-image {
max-height: 350px;
max-width: 280px;
@@ -132,13 +132,11 @@
}
.product-card .product-description {
- margin-bottom: 14px;
display: none;
}
.product-card .product-ratings {
width: 100%;
- margin-bottom: 14px;
}
.product-card .product-ratings .icon {
@@ -146,10 +144,6 @@
height: 16px;
}
-.product-card .product-ratings .total-reviews {
- display: none;
-}
-
.product-card .cart-fav-seg {
display: -webkit-inline-box;
display: -ms-inline-flexbox;
@@ -158,7 +152,6 @@
}
.product-card .cart-fav-seg .addtocart {
- border-radius: 0px;
margin-right: 10px;
text-transform: uppercase;
white-space: nowrap;
@@ -750,6 +743,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
+ cursor: pointer;
}
.header .header-top div.right-content ul.account-dropdown-container {
@@ -787,11 +781,12 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
margin-top: 10px;
}
-.header .header-top div.right-content ul.cart-dropdown {
+.header .header-top div.right-content ul.cart-dropdown-container {
float: right;
+ margin-left: 10px;
}
-.header .header-top div.right-content ul.cart-dropdown li.cart-summary {
+.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
@@ -799,60 +794,143 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
-webkit-box-direction: normal;
-ms-flex-direction: row;
flex-direction: row;
- margin-left: 14px;
-}
-
-.header .header-top div.right-content ul.cart-dropdown li.cart-summary .cart-icon {
- margin: 0;
- height: 24px;
- width: 24px;
- margin-right: 8px;
-}
-
-.header .header-top div.right-content ul.cart-dropdown li.cart-summary .cart {
- padding-top: 3px;
- padding-right: 5px;
-}
-
-.header .header-top div.right-content ul.cart-dropdown li.cart-summary .cart .cart-count {
- color: #0041FF;
- padding-right: 3px;
-}
-
-.header .header-top div.right-content ul.cart-dropdown li.cart-summary .icon.arrow-down-icon {
- margin-top: 10px;
-}
-
-.header .header-top .right-responsive {
- display: none;
-}
-
-.header .header-top .right-responsive ul.right-wrapper {
- display: -webkit-box;
- display: -ms-flexbox;
- display: flex;
- -webkit-box-orient: horizontal;
- -webkit-box-direction: normal;
- -ms-flex-direction: row;
- flex-direction: row;
- -webkit-box-pack: end;
- -ms-flex-pack: end;
- justify-content: flex-end;
+ -webkit-box-pack: center;
+ -ms-flex-pack: center;
+ justify-content: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
}
-.header .header-top .right-responsive ul.right-wrapper li:not(:last-child) {
- margin-right: 7px;
-}
-
-.header .header-top .right-responsive ul.right-wrapper li:not(:last-child) span.icon {
- margin: 0;
+.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .cart-icon {
+ margin-right: 8px;
height: 24px;
width: 24px;
}
+.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .icon.arrow-down-icon {
+ margin-top: 10px;
+}
+
+.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list {
+ width: 387px;
+}
+
+.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container {
+ padding: 10px 18px 10px 18px;
+ max-height: 410px;
+ overflow-y: auto;
+}
+
+.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-cart {
+ color: #242424;
+}
+
+.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-cart > .dropdown-header {
+ width: 100%;
+}
+
+.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-cart > .dropdown-header p {
+ display: inline;
+ line-height: 25px;
+}
+
+.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-cart > .dropdown-header i {
+ cursor: pointer;
+ float: right;
+ height: 22px;
+ width: 22px;
+}
+
+.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-cart > .dropdown-header p.heading {
+ font-weight: lighter;
+}
+
+.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-content {
+ padding-top: 8px;
+ padding-bottom: 10px;
+}
+
+.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-content .item {
+ display: -webkit-box;
+ display: -ms-flexbox;
+ display: flex;
+ -webkit-box-orient: horizontal;
+ -webkit-box-direction: normal;
+ -ms-flex-direction: row;
+ flex-direction: row;
+ border-bottom: 1px solid #E8E8E8;
+ padding-top: 8px;
+ padding-bottom: 8px;
+}
+
+.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-content .item img {
+ height: 75px;
+ width: 75px;
+ margin-right: 8px;
+}
+
+.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-content .item-details {
+ height: 75px;
+}
+
+.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .item-details .item-name {
+ font-size: 16px;
+ font-weight: bold;
+ margin-bottom: 8px;
+}
+
+.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .item-details .item-price {
+ margin-bottom: 8px;
+}
+
+.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .item-details .item-qty {
+ font-weight: lighter;
+ margin-bottom: 8px;
+}
+
+.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-footer {
+ display: -webkit-box;
+ display: -ms-flexbox;
+ display: flex;
+ -webkit-box-orient: horizontal;
+ -webkit-box-direction: normal;
+ -ms-flex-direction: row;
+ flex-direction: row;
+ -webkit-box-pack: justify;
+ -ms-flex-pack: justify;
+ justify-content: space-between;
+ -webkit-box-align: center;
+ -ms-flex-align: center;
+ align-items: center;
+ margin-bottom: 8px;
+}
+
+.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-footer button {
+ border-radius: 0px;
+ width: 130px;
+}
+
+.header .header-top ul.right-responsive {
+ display: none;
+}
+
+.header .header-top ul.right-responsive li {
+ margin-right: 5px;
+}
+
+.header .header-top ul.right-responsive li:last-child {
+ margin-right: 0px;
+}
+
+.header .header-top ul.right-responsive ul {
+ margin-right: 5px;
+}
+
+.header .header-top ul.right-responsive ul:last-child {
+ margin-right: 0px;
+}
+
.header .header-bottom {
height: 48px;
margin-left: auto;
@@ -975,30 +1053,23 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
right: 10px;
}
-@media only screen and (max-width: 770px) {
- .header .header-top div.left-content ul.search-container li.search-group {
- display: none;
+@media all and (max-width: 720px) {
+ .header-bottom {
+ display: none !important;
}
- .header .header-top div.right-content {
- display: none;
+ ul.search-container {
+ display: none !important;
}
- .header .header-top .right-responsive {
- display: inherit;
+ ul.account-dropdown-container {
+ display: none !important;
}
- .header .header-bottom {
- border-bottom: none;
- display: none;
+ ul.cart-dropdown-container {
+ display: none !important;
}
- .header .header-bottom .nav > li {
- float: none;
- height: 48px;
- border-bottom: 1px solid #E8E8E8;
- }
- .header .header-bottom .nav > li:last-child {
- float: none;
- }
- .header .header-bottom .nav > li:last-child img {
- margin-left: 10px;
+ ul.right-responsive {
+ display: -webkit-box !important;
+ display: -ms-flexbox !important;
+ display: flex !important;
}
}
diff --git a/public/themes/default/assets/js/shop.js b/public/themes/default/assets/js/shop.js
index 4212eaa51..fe4af4ad7 100644
--- a/public/themes/default/assets/js/shop.js
+++ b/public/themes/default/assets/js/shop.js
@@ -31504,10 +31504,6 @@ if (false) {
/***/ (function(module, exports, __webpack_require__) {
var disposed = false
-function injectStyle (ssrContext) {
- if (disposed) return
- __webpack_require__(52)
-}
var normalizeComponent = __webpack_require__(1)
/* script */
var __vue_script__ = __webpack_require__(54)
@@ -31516,7 +31512,7 @@ var __vue_template__ = __webpack_require__(55)
/* template functional */
var __vue_template_functional__ = false
/* styles */
-var __vue_styles__ = injectStyle
+var __vue_styles__ = null
/* scopeId */
var __vue_scopeId__ = null
/* moduleIdentifier (server only) */
@@ -31551,46 +31547,8 @@ module.exports = Component.exports
/***/ }),
-/* 52 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// style-loader: Adds some css to the DOM by adding a