diff --git a/app/Queries/Orders/GetBoPaginatedOrdersQuery.php b/app/Queries/Orders/GetBoPaginatedOrdersQuery.php index ff64e16..8d32b2c 100644 --- a/app/Queries/Orders/GetBoPaginatedOrdersQuery.php +++ b/app/Queries/Orders/GetBoPaginatedOrdersQuery.php @@ -68,7 +68,13 @@ final readonly class GetBoPaginatedOrdersQuery implements Query $query->where('status', $input->status); } - $this->dataTable->sortQuery(Order::class, $query); + $this->dataTable->sortQuery( + Order::class, + $query, + defaultSortCol: 'date', + defaultSortWay: \SortDirection::Descending, + columnMap: ['date' => 'id'], + ); $paginator = $this->dataTable->paginateQuery($query, $input->pagination); /** @var LengthAwarePaginator $ordersDtoPaginator */ diff --git a/app/Queries/Orders/GetBoTodayOrdersQuery.php b/app/Queries/Orders/GetBoTodayOrdersQuery.php index 5b3ba60..dbe7507 100644 --- a/app/Queries/Orders/GetBoTodayOrdersQuery.php +++ b/app/Queries/Orders/GetBoTodayOrdersQuery.php @@ -37,9 +37,15 @@ final readonly class GetBoTodayOrdersQuery implements Query $query = Order::query()->with(['shop']); - $query->where('pickup_day', Date::now()->toDateString()); + $query->whereCreatedAtBetween(Date::now(), Date::now()); - $this->dataTable->sortQuery(Order::class, $query); + $this->dataTable->sortQuery( + Order::class, + $query, + defaultSortCol: 'date', + defaultSortWay: \SortDirection::Descending, + columnMap: ['date' => 'id'], + ); $paginator = $this->dataTable->paginateQuery($query, $input->pagination); diff --git a/app/Services/DataTableService.php b/app/Services/DataTableService.php index bca2b26..dfbff08 100644 --- a/app/Services/DataTableService.php +++ b/app/Services/DataTableService.php @@ -98,11 +98,15 @@ class DataTableService * @param class-string $modelClass * @param TBuilder $query * @param array $ignore Columns to ignore for sorting. + * @param array $columnMap Map virtual column names to database columns. */ public function sortQuery( string $modelClass, Builder $query, - array $ignore = [] + array $ignore = [], + ?string $defaultSortCol = null, + SortDirection $defaultSortWay = SortDirection::Ascending, + array $columnMap = [], ): Builder { $table = (new $modelClass())->getTable(); $rName = $this->request->route()?->getName() ?? 'noroute'; @@ -115,15 +119,22 @@ class DataTableService $sort_col = $sort['sort_col']; $sort_way = $sort['sort_way']; + if ((! $sort_col || $sort_col === 'undefined') && $defaultSortCol !== null) { + $sort_col = $defaultSortCol; + $sort_way = $defaultSortWay; + } + $this->persistSortSession($rName, $sort_col, $sort_way); - if ($sort_col && $sort_col !== 'undefined' && $sort_way && ! in_array($sort_col, $ignore) && $this->hasTableColumn($table, $sort_col)) { + $dbCol = $columnMap[$sort_col] ?? $sort_col; + + if ($sort_col && $sort_col !== 'undefined' && $sort_way && ! in_array($sort_col, $ignore) && $this->hasTableColumn($table, $dbCol)) { $direction = match ($sort_way) { SortDirection::Descending => 'desc', default => 'asc', }; - $query->orderBy("{$table}.{$sort_col}", $direction); + $query->orderBy("{$table}.{$dbCol}", $direction); } elseif ($this->hasTableColumn($table, self::ORDER_COLUMN)) { $query->orderBy(self::ORDER_COLUMN, 'asc'); diff --git a/resources/sass/fo/vendor/_sliders.scss b/resources/sass/fo/vendor/_sliders.scss index 910dbeb..96a242d 100644 --- a/resources/sass/fo/vendor/_sliders.scss +++ b/resources/sass/fo/vendor/_sliders.scss @@ -1,6 +1,14 @@ #products-carousel { position: relative; + &.has-controls, + &:has(.carousel-control-prev) { + @include media-breakpoint-up(lg) { + padding-left: 3.5rem; + padding-right: 3.5rem; + } + } + .carousel-inner { display: flex !important; flex-wrap: nowrap !important; @@ -18,6 +26,50 @@ transition: none !important; } + .carousel-control-prev, + .carousel-control-next { + position: absolute; + top: 50%; + bottom: auto; + z-index: 5; + display: flex; + align-items: center; + justify-content: center; + width: 44px; + height: 44px; + padding: 0; + color: var(--bs-dark); + cursor: pointer; + background-color: var(--bs-primary); + border: 1px solid rgba(0, 0, 0, 0.08); + border-radius: 50%; + box-shadow: 0 4px 10px rgba(0, 0, 0, 0.15); + opacity: 1; + filter: none; + transform: translateY(-50%); + transition: background-color 0.2s ease, transform 0.2s ease, box-shadow 0.2s ease; + + &:hover, + &:focus-visible { + color: var(--bs-dark); + background-color: color-mix(in srgb, var(--bs-primary) 85%, black); + box-shadow: 0 6px 14px rgba(0, 0, 0, 0.2); + opacity: 1; + transform: translateY(-50%) scale(1.08); + } + + &:active { + transform: translateY(-50%) scale(0.96); + } + } + + .carousel-control-prev { + left: 0.5rem; + } + + .carousel-control-next { + right: 0.5rem; + } } .carousel-indicators { diff --git a/resources/views/bo/modules/tableColSorter.blade.php b/resources/views/bo/modules/tableColSorter.blade.php index 7817917..ba91692 100644 --- a/resources/views/bo/modules/tableColSorter.blade.php +++ b/resources/views/bo/modules/tableColSorter.blade.php @@ -2,9 +2,16 @@ // * Route vars $routeName = request()->route()?->getName() ?? 'noroute'; + // * Default sort vars + $defaultSortCol = $defaultSortCol ?? 'order'; + $defaultSortWay = $defaultSortWay ?? 'asc'; + $defaultSortWayStr = $defaultSortWay instanceof \SortDirection + ? ($defaultSortWay === \SortDirection::Descending ? 'desc' : 'asc') + : (string) $defaultSortWay; + // * Request vars - $currentSortCol = session()->get("{$routeName}.sort_col"); - $currentSortWay = session()->get("{$routeName}.sort_way"); + $currentSortCol = session()->get("{$routeName}.sort_col", $defaultSortCol); + $currentSortWay = session()->get("{$routeName}.sort_way", $defaultSortWayStr); $searchQuery = request()->input('search'); @@ -18,7 +25,7 @@ View::share('noOrder', $noOrder); // * Reset button - $hasCustomSort = ($currentSortCol && $currentSortCol !== 'order') || ($currentSortCol === 'order' && $currentSortWay === 'desc'); + $hasCustomSort = ($currentSortCol && $currentSortCol !== $defaultSortCol) || ($currentSortCol === $defaultSortCol && $currentSortWay !== $defaultSortWayStr); $showReset = !empty($searchQuery) || $hasCustomSort; @endphp diff --git a/resources/views/bo/orders/index-list.blade.php b/resources/views/bo/orders/index-list.blade.php index e5d1d37..3c58c7a 100644 --- a/resources/views/bo/orders/index-list.blade.php +++ b/resources/views/bo/orders/index-list.blade.php @@ -16,6 +16,8 @@ 'cols' => $cols, 'mobileHide' => [], 'ignore' => ['customer', 'pickup_date'], + 'defaultSortCol' => 'date', + 'defaultSortWay' => 'desc', ]) diff --git a/resources/views/bo/orders/index-today.blade.php b/resources/views/bo/orders/index-today.blade.php index c3fe97b..3109e86 100644 --- a/resources/views/bo/orders/index-today.blade.php +++ b/resources/views/bo/orders/index-today.blade.php @@ -1,10 +1,6 @@ @extends('bo.layouts.layout') -@if (request()->routeIs('bo.merch.starred')) - @section('title', __('crud.helpers.starred')) -@else - @section('title', Str::ucfirst(trans_choice('models.classes.orders', \INF))) -@endif +@section('title', __('Today\'s Orders')) @section('breadcrumb', request()->route()->getName()) @@ -14,7 +10,7 @@

- {{ Str::ucfirst(trans_choice('models.classes.orders', \INF)) }} {{ Str::ucfirst(__('crud.actions.list')) }} + {{ __('Today\'s Orders') }}

diff --git a/resources/views/fo/home-parts/sliders/discounts.blade.php b/resources/views/fo/home-parts/sliders/discounts.blade.php index 358e99c..f4c3c75 100644 --- a/resources/views/fo/home-parts/sliders/discounts.blade.php +++ b/resources/views/fo/home-parts/sliders/discounts.blade.php @@ -1,7 +1,7 @@
-