From 131e3f1e1818e5b818942ebc8cabe686038f60ea Mon Sep 17 00:00:00 2001 From: Jitendra Singh Date: Fri, 28 Feb 2020 13:00:29 +0530 Subject: [PATCH] Quantity box checks added for booking product --- .../Http/Controllers/DashboardController.php | 88 +++++++++---------- .../src/Resources/assets/sass/app.scss | 7 +- .../shop/products/view/booking.blade.php | 28 ++---- .../products/view/booking/event.blade.php | 16 ---- .../products/view/booking/slots.blade.php | 1 - .../BookingProduct/src/Type/Booking.php | 16 ++++ .../Resources/views/products/index.blade.php | 4 +- 7 files changed, 75 insertions(+), 85 deletions(-) diff --git a/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php b/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php index ed4c6d5e8..10bc00c65 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php @@ -179,21 +179,21 @@ class DashboardController extends Controller public function getTopSellingCategories() { return $this->orderItemRepository->getModel() - ->leftJoin('products', 'order_items.product_id', 'products.id') - ->leftJoin('product_categories', 'products.id', 'product_categories.product_id') - ->leftJoin('categories', 'product_categories.category_id', 'categories.id') - ->leftJoin('category_translations', 'categories.id', 'category_translations.category_id') - ->where('category_translations.locale', app()->getLocale()) - ->where('order_items.created_at', '>=', $this->startDate) - ->where('order_items.created_at', '<=', $this->endDate) - ->addSelect(DB::raw('SUM(qty_invoiced - qty_refunded) as total_qty_invoiced')) - ->addSelect(DB::raw('COUNT(' . DB::getTablePrefix() . 'products.id) as total_products')) - ->addSelect('order_items.id', 'categories.id as category_id', 'category_translations.name') - ->groupBy('categories.id') - ->havingRaw('SUM(qty_invoiced - qty_refunded) > 0') - ->orderBy('total_qty_invoiced', 'DESC') - ->limit(5) - ->get(); + ->leftJoin('products', 'order_items.product_id', 'products.id') + ->leftJoin('product_categories', 'products.id', 'product_categories.product_id') + ->leftJoin('categories', 'product_categories.category_id', 'categories.id') + ->leftJoin('category_translations', 'categories.id', 'category_translations.category_id') + ->where('category_translations.locale', app()->getLocale()) + ->where('order_items.created_at', '>=', $this->startDate) + ->where('order_items.created_at', '<=', $this->endDate) + ->addSelect(DB::raw('SUM(qty_invoiced - qty_refunded) as total_qty_invoiced')) + ->addSelect(DB::raw('COUNT(' . DB::getTablePrefix() . 'products.id) as total_products')) + ->addSelect('order_items.id', 'categories.id as category_id', 'category_translations.name') + ->groupBy('categories.id') + ->havingRaw('SUM(qty_invoiced - qty_refunded) > 0') + ->orderBy('total_qty_invoiced', 'DESC') + ->limit(5) + ->get(); } /** @@ -204,13 +204,13 @@ class DashboardController extends Controller public function getStockThreshold() { return $this->productInventoryRepository->getModel() - ->leftJoin('products', 'product_inventories.product_id', 'products.id') - ->select(DB::raw('SUM(qty) as total_qty')) - ->addSelect('product_inventories.product_id') - ->groupBy('product_id') - ->orderBy('total_qty', 'ASC') - ->limit(5) - ->get(); + ->leftJoin('products', 'product_inventories.product_id', 'products.id') + ->select(DB::raw('SUM(qty) as total_qty')) + ->addSelect('product_inventories.product_id') + ->groupBy('product_id') + ->orderBy('total_qty', 'ASC') + ->limit(5) + ->get(); } /** @@ -220,15 +220,15 @@ class DashboardController extends Controller public function getTopSellingProducts() { return $this->orderItemRepository->getModel() - ->select(DB::raw('SUM(qty_ordered) as total_qty_ordered')) - ->addSelect('id', 'product_id', 'product_type', 'name') - ->where('order_items.created_at', '>=', $this->startDate) - ->where('order_items.created_at', '<=', $this->endDate) - ->whereNull('parent_id') - ->groupBy('product_id') - ->orderBy('total_qty_ordered', 'DESC') - ->limit(5) - ->get(); + ->select(DB::raw('SUM(qty_ordered) as total_qty_ordered')) + ->addSelect('id', 'product_id', 'product_type', 'name') + ->where('order_items.created_at', '>=', $this->startDate) + ->where('order_items.created_at', '<=', $this->endDate) + ->whereNull('parent_id') + ->groupBy('product_id') + ->orderBy('total_qty_ordered', 'DESC') + ->limit(5) + ->get(); } /** @@ -239,15 +239,15 @@ class DashboardController extends Controller public function getCustomerWithMostSales() { return $this->orderRepository->getModel() - ->select(DB::raw('SUM(base_grand_total) as total_base_grand_total')) - ->addSelect(DB::raw('COUNT(id) as total_orders')) - ->addSelect('id', 'customer_id', 'customer_email', 'customer_first_name', 'customer_last_name') - ->where('orders.created_at', '>=', $this->startDate) - ->where('orders.created_at', '<=', $this->endDate) - ->groupBy('customer_email') - ->orderBy('total_base_grand_total', 'DESC') - ->limit(5) - ->get(); + ->select(DB::raw('SUM(base_grand_total) as total_base_grand_total')) + ->addSelect(DB::raw('COUNT(id) as total_orders')) + ->addSelect('id', 'customer_id', 'customer_email', 'customer_first_name', 'customer_last_name') + ->where('orders.created_at', '>=', $this->startDate) + ->where('orders.created_at', '<=', $this->endDate) + ->groupBy('customer_email') + ->orderBy('total_base_grand_total', 'DESC') + ->limit(5) + ->get(); } /** @@ -258,12 +258,12 @@ class DashboardController extends Controller public function setStartEndDate() { $this->startDate = request()->get('start') - ? Carbon::createFromTimeString(request()->get('start') . " 00:00:01") - : Carbon::createFromTimeString(Carbon::now()->subDays(30)->format('Y-m-d') . " 00:00:01"); + ? Carbon::createFromTimeString(request()->get('start') . " 00:00:01") + : Carbon::createFromTimeString(Carbon::now()->subDays(30)->format('Y-m-d') . " 00:00:01"); $this->endDate = request()->get('end') - ? Carbon::createFromTimeString(request()->get('end') . " 23:59:59") - : Carbon::now(); + ? Carbon::createFromTimeString(request()->get('end') . " 23:59:59") + : Carbon::now(); if ($this->endDate > Carbon::now()) { $this->endDate = Carbon::now(); diff --git a/packages/Webkul/BookingProduct/src/Resources/assets/sass/app.scss b/packages/Webkul/BookingProduct/src/Resources/assets/sass/app.scss index cee8ee29f..62d344fa1 100644 --- a/packages/Webkul/BookingProduct/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/BookingProduct/src/Resources/assets/sass/app.scss @@ -89,10 +89,9 @@ } .book-slots { - padding-top: 25px; + // padding-top: 25px; display: inline-block; width: 100%; - border-top: solid 1px #e8e8e8; h3 { font-weight: 600; @@ -156,6 +155,10 @@ display: inline-block; padding: 16px 0; border-bottom: solid 1px #e8e8e8; + + &:last-child { + border-bottom: 0; + } .ticket-info { width: 50%; diff --git a/packages/Webkul/BookingProduct/src/Resources/views/shop/products/view/booking.blade.php b/packages/Webkul/BookingProduct/src/Resources/views/shop/products/view/booking.blade.php index 77196fe48..418dea8ed 100644 --- a/packages/Webkul/BookingProduct/src/Resources/views/shop/products/view/booking.blade.php +++ b/packages/Webkul/BookingProduct/src/Resources/views/shop/products/view/booking.blade.php @@ -13,21 +13,14 @@ diff --git a/packages/Webkul/BookingProduct/src/Resources/views/shop/products/view/booking/event.blade.php b/packages/Webkul/BookingProduct/src/Resources/views/shop/products/view/booking/event.blade.php index 2d8c1e76b..41f816c1c 100644 --- a/packages/Webkul/BookingProduct/src/Resources/views/shop/products/view/booking/event.blade.php +++ b/packages/Webkul/BookingProduct/src/Resources/views/shop/products/view/booking/event.blade.php @@ -41,22 +41,6 @@

@{{ ticket.description }}

- -
- - -
- {{ __('bookingproduct::app.shop.products.base-price') }} - $100 - -

{{ __('bookingproduct::app.shop.products.base-price-info') }}

-
- - -
diff --git a/packages/Webkul/BookingProduct/src/Resources/views/shop/products/view/booking/slots.blade.php b/packages/Webkul/BookingProduct/src/Resources/views/shop/products/view/booking/slots.blade.php index 1be8e2e89..0a1a3c068 100644 --- a/packages/Webkul/BookingProduct/src/Resources/views/shop/products/view/booking/slots.blade.php +++ b/packages/Webkul/BookingProduct/src/Resources/views/shop/products/view/booking/slots.blade.php @@ -30,7 +30,6 @@