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 @@