Merge pull request #214 from Oneami/master

#14. Catalog products: wrapper size for laptops

Author: dmitrakovich

src/app/Admin/Controllers/Analytics/OrderSourceController.php

@@ -2,8 +2,8 @@
 
 namespace App\Admin\Controllers\Analytics;
 
-use App\Enums\Order\UtmEnum;
 use App\Models\Orders\Order;
+use App\Models\User\User;
 use Encore\Admin\Grid;
 
 class OrderSourceController extends AbstractCustomerAnalyticController
@@ -28,18 +28,7 @@ protected function getInstanceColumnTitle(): string
      */
     protected function getInstanceNameColumn(): string
     {
-        return 'CONCAT(utm_source, \'-\', utm_campaign)';
-    }
-
-    /**
-     * Generates additional grid columns for the given grid.
-     *
-     * @param  $grid  The grid object to generate columns for.
-     */
-    protected function additionalGridColumns($grid): void
-    {
-        $grid->column('channel_name', 'Канал')->display(fn () => UtmEnum::tryFrom($this->instance_name)?->channelName());
-        $grid->column('company_name', 'Компания')->display(fn () => UtmEnum::tryFrom($this->instance_name)?->companyName());
+        return 'CONCAT(orders.utm_source, \'-\', orders.utm_campaign)';
     }
 
     /**
@@ -49,12 +38,58 @@ protected function getPreparedGrid(): Grid
     {
         $grid = new Grid(new Order());
 
-        $grid->model()->selectRaw($this->getSelectSql())
-            ->withExpression('LastUserOrders', $this->getLastUserOrdersQuery())
+        // // $qq = User::selectRaw($this->getSelectSql())
+        // //     ->leftJoin('orders', 'users.id', '=', 'orders.user_id')
+        // //     // ->leftJoin('order_items', 'orders.id', '=', 'order_items.order_id')
+        // //     ->groupBy('instance_name', 'users.id');
+
+        // //     print_r($qq->toSql());
+        // // exit();
+
+        // // users.id AS user_id,
+        // // orders.created_at AS created_at,
+
+        // $orderCreatedAtStart = request()->input('order_created_at_start');
+        // $orderCreatedAtEnd = request()->input('order_created_at_end');
+
+        // $subQuery = <<<SQL
+        // (SELECT {$this->getInstanceNameColumn()} AS instance_name,
+        // users.id AS user_id,
+        // SUM(CASE WHEN orders.status_key IN ({$this->statuses['accepted']}) THEN DISTINCT() ELSE 0 END) AS accepted_count,
+        // SUM(CASE WHEN orders.status_key IN ({$this->statuses['in_progress']}) THEN 1 ELSE 0 END) AS in_progress_count,
+        // SUM(CASE WHEN orders.status_key IN ({$this->statuses['purchased']}) THEN 1 ELSE 0 END) AS purchased_count,
+        // SUM(CASE WHEN orders.status_key IN ({$this->statuses['canceled']}) THEN 1 ELSE 0 END) AS canceled_count,
+        // SUM(CASE WHEN orders.status_key IN ({$this->statuses['returned']}) THEN 1 ELSE 0 END) AS returned_count,
+        // SUM(1) AS total_count
+        // FROM orders LEFT JOIN users ON users.id = orders.user_id
+        // GROUP BY instance_name) AS userOrders
+        // SQL;
+
+        // // dd(\DB::statement($subQuery));
+
+        // $grid->model()
+        //     ->select('instance_name', 'accepted_count', 'in_progress_count', 'purchased_count', 'canceled_count', 'returned_count', 'total_count')
+        //     ->leftJoin(
+        //         \DB::raw($subQuery),
+        //         function ($join) {
+        //             $join->on('users.id', '=', 'userOrders.user_id');
+        //         }
+        //     );
+
+        $sub = \DB::table('orders')
+            ->selectRaw($this->getSelectSql())
             ->leftJoin('users', 'users.id', '=', 'orders.user_id')
             ->leftJoin('order_items', 'orders.id', '=', 'order_items.order_id')
+            ->where('orders.created_at', '>=', '2024-01-04 00:00:00')
             ->groupBy('instance_name');
 
+        $grid->model()
+            ->select('qq.instance_name', 'qq.total_purchased_price', 'qq.total_lost_price')
+            ->from($sub, 'qq');
+        // ->leftJoin('users', 'users.id', '=', 'orders.user_id')
+        // ->leftJoin('order_items', 'orders.id', '=', 'order_items.order_id')
+        // ->groupBy('instance_name');
+
         return $grid;
     }
 }

src/app/Admin/Controllers/OrdersDistribution/Form/LogGrid.php

@@ -20,7 +20,7 @@ public function index()
         $grid->column('created_at', 'Дата и время')->display(fn () => date('d.m.Y H:i:s', strtotime($this->created_at)));
         $grid->column('order_id', '№ заказа');
         $grid->column('action', 'Комментарий');
-        $grid->column('admin.username', 'Менеджер')->display(fn () => $this->admin->getShortNameAttribute());
+        $grid->column('admin.username', 'Менеджер')->display(fn () => $this->admin ? $this->admin->getShortNameAttribute() : null);
 
         $grid->disableCreateButton();
         $grid->disableFilter();

src/resources/js/scripts.js

@@ -95,12 +95,23 @@ $(function () {
     let childsCount = imageBlocks.length;
     let width = $(this).width();
     let curIndex = 0;
+    const pagination = document.createElement("div");
+    pagination.classList.add('product-item-images-pagination');
+    for (let i = 0; i < childsCount; i++) {
+      let paginationItem = document.createElement("span");
+      paginationItem.setAttribute('data-index', i);
+      pagination.appendChild(paginationItem);
+    }
+    $(this).append(pagination);
+
     $(this).mousemove(function (getCurrentPos) {
       let percentPart = (getCurrentPos.offsetX * 100) / width;
       let index = Math.abs(Math.floor(percentPart / (100 / childsCount)));
       if (index < childsCount && index !== curIndex) {
         imageBlocks.css({ 'display': 'none' });
         $(imageBlocks[index]).css({ 'display': 'block' });
+        pagination.children[curIndex].classList.remove('active');
+        pagination.children[index].classList.add('active');
         curIndex = index;
       }
     });
@@ -109,6 +120,7 @@ $(function () {
   $(document).on('mouseleave', '.js-productItemImages', function () {
     $(this).find('.js-productItemImagesContainer').css({ 'display': 'none' });
     $(this).find('.js-productItemImagesContainer').first().css({ 'display': 'block' });
+    $(this).find('.product-item-images-pagination').remove();
   });
 });
 

src/resources/sass/_styles.scss

@@ -21,6 +21,12 @@ body {
 
 .wrapper {
     @include media-breakpoint-up(lg) {
+        margin: 0 20px;
+    }
+}
+
+.wrapper {
+    @include media-breakpoint-up(xl) {
         margin: 0 100px;
     }
 }
@@ -322,6 +328,26 @@ button.scroll-top-btn {
     }
 }
 
+.product-item-images-pagination {
+    position: absolute;
+    display: flex;
+    top: 0;
+    left: 0;
+    width: 100%;
+    gap: 2px;
+
+    span {
+        background-color: rgba(0, 0, 0, 0.25);
+        display: inline-flex;
+        height: 3px;
+        flex: 1;
+
+        &.active {
+            background-color: rgba(0, 0, 0, 0.7);
+        }
+    }
+}
+
 .product-item .image {
     .product-first-image {
         display: block;
@@ -551,7 +577,7 @@ span {
 
 .product-labels {
     position: absolute;
-    top: 0;
+    top: 5px;
     right: 0;
     z-index: 20;
     display: flex;