From 1a6d16c71cba15c94b93e643491afc5f48a2483a Mon Sep 17 00:00:00 2001 From: Alexis Gousseau Date: Tue, 8 Oct 2024 13:55:03 +0200 Subject: [PATCH 01/16] fix: :sparkles: add customer discounts count on club navigation --- app/Http/Controllers/Club/DiscountController.php | 4 ++++ app/Http/Controllers/Controller.php | 5 +++++ app/Models/Discount.php | 16 ++++++++++++++++ resources/views/club/layouts/header.blade.php | 11 ++++++----- .../layouts/main-menu/offcanvas-menu.blade.php | 11 ++++++----- 5 files changed, 37 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/Club/DiscountController.php b/app/Http/Controllers/Club/DiscountController.php index 1832bf20..1e16f287 100644 --- a/app/Http/Controllers/Club/DiscountController.php +++ b/app/Http/Controllers/Club/DiscountController.php @@ -7,6 +7,7 @@ use App\Http\Requests\Club\MesBr\PrintCouponsRequest; use App\Models\Customer; use App\Models\Discount; use Illuminate\Support\Arr; +use Illuminate\Support\Facades\Cache; class DiscountController extends Controller { @@ -140,6 +141,9 @@ class DiscountController extends Controller return null; } + // Update customer discounts count. + Cache::set("discountsCustomerCount", Discount::getCustomerDiscountsCount($customer->hashcode)); + // * Tout est OK return \base64_decode(Arr::get($result, 'pdf')) ?: null; } catch (\RuntimeException $e) { diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 43f3312d..225eab3a 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers; use App\Enums\Pagination\ItemsPerPaginationEnum; use App\Enums\Theme\BootstrapThemeEnum; use App\Lib\Helpers\ToolboxHelper; +use App\Models\Discount; use App\Models\Message; use App\Models\Notification; use Illuminate\Database\Eloquent\Builder; @@ -49,6 +50,10 @@ class Controller extends BaseController !is_null($notificationModel->customer_id); }) ->count()); + + $result = Cache::get("discountsCustomerCount") + ?: Discount::getCustomerDiscountsCount($customerModel->hashcode); + View::share('discountsCustomerCount', $result); } return $next($request); }); diff --git a/app/Models/Discount.php b/app/Models/Discount.php index f8c7b32e..06dcc9de 100644 --- a/app/Models/Discount.php +++ b/app/Models/Discount.php @@ -149,6 +149,22 @@ class Discount extends Model } //end try } + /** + * Get customer discounts count. + * + * @param string $hashcode + * @return integer + */ + public static function getCustomerDiscountsCount(string $hashcode): int + { + /** @var \LDC\MESBR\MesBr */ + $mesBr = app('mesBrAPI'); + + return collect($mesBr->getMurCustomer($hashcode)->coupons)->filter(function ($discount) { + return !$discount->used; + })->count(); + } + /** * Replace coupons picture host. * diff --git a/resources/views/club/layouts/header.blade.php b/resources/views/club/layouts/header.blade.php index 20f9f671..4dbab21a 100644 --- a/resources/views/club/layouts/header.blade.php +++ b/resources/views/club/layouts/header.blade.php @@ -93,11 +93,12 @@
  • @include('club.icons.ticket') - - {{-- FIXME: replace this br count and if it's greater than 99, show 99+ --}} - 7 - - + @if($discountsCustomerCount) + + {{ $discountsCustomerCount > 99 ? '99+' : $discountsCustomerCount }} + + + @endif
    • diff --git a/resources/views/club/layouts/main-menu/offcanvas-menu.blade.php b/resources/views/club/layouts/main-menu/offcanvas-menu.blade.php index 501e5707..90f4c4e1 100644 --- a/resources/views/club/layouts/main-menu/offcanvas-menu.blade.php +++ b/resources/views/club/layouts/main-menu/offcanvas-menu.blade.php @@ -50,11 +50,12 @@ {{ __('« La Poulitude »') }} - - - {{-- FIXME: replace this br count and if it's greater than 99, show 99+ --}} - 7 - + @if($discountsCustomerCount) + + + {{ $discountsCustomerCount > 99 ? '99+' : $discountsCustomerCount }} + + @endif
  • Date: Tue, 8 Oct 2024 14:34:10 +0200 Subject: [PATCH 02/16] fix: improve display for search model component --- resources/ts/fo/components/SearchModelComponent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/ts/fo/components/SearchModelComponent.vue b/resources/ts/fo/components/SearchModelComponent.vue index 31d78389..05012db8 100644 --- a/resources/ts/fo/components/SearchModelComponent.vue +++ b/resources/ts/fo/components/SearchModelComponent.vue @@ -233,7 +233,7 @@

    {{ trans.methods.__('Tous les éléments ont été chargés') }}

    From 34c72a14b71cde51795d1d6432bfbd31a4688b8e Mon Sep 17 00:00:00 2001 From: Nicolas Demangeat Date: Tue, 8 Oct 2024 15:16:02 +0200 Subject: [PATCH 03/16] fix: :sparkles: product search are now case insensitive --- app/Http/Controllers/Controller.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 225eab3a..24d8bf99 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -315,20 +315,21 @@ class Controller extends BaseController string|null $search = null ): \Illuminate\Pagination\LengthAwarePaginator { $modelsTitles = []; - $query->when(!is_null($search), function (Builder $q) use ($search, $searchField) { - $q->where($searchField, 'like', "%{$search}%"); + $searchLower = Str::lower($search); + $query->when(!is_null($search), function (Builder $q) use ($searchLower, $searchField) { + $q->where($searchField, 'like', "%{$searchLower}%"); }) ->where('published', true) ->inRandomOrder() ->pluck($searchField) - ->each(function (string $title) use (&$modelsTitles, $search) { + ->each(function (string $title) use (&$modelsTitles, $searchLower) { if (count($modelsTitles) < 5) { foreach (explode(" ", $title) as $word) { $word = Str::lower($word); if ( strlen($word) > 3 && !in_array($word, $modelsTitles) - && ((!is_null($search)) ? str_contains($word, $search) : true) + && ((!is_null($searchLower)) ? str_contains($word, $searchLower) : true) ) { $modelsTitles[] = $word; } From f419c66df031804d14044e6b0634c62213f956fd Mon Sep 17 00:00:00 2001 From: Noah Lancien Date: Tue, 8 Oct 2024 17:23:51 +0200 Subject: [PATCH 04/16] fix: Updated header/footer/navbar for export pages --- app/Providers/AppServiceProvider.php | 14 +++- resources/sass/fo/base/_layout.scss | 11 ++- resources/views/fo/layouts/footer.blade.php | 74 +++++++++++-------- resources/views/fo/layouts/header.blade.php | 29 ++++++-- .../fo/layouts/main-menu/links.blade.php | 8 +- .../fo/layouts/main-menu/locales.blade.php | 6 +- .../fo/layouts/main-menu/logo-link.blade.php | 7 ++ .../main-menu/offcanvas-menu-mobile.blade.php | 58 ++++++++------- 8 files changed, 129 insertions(+), 78 deletions(-) create mode 100644 resources/views/fo/layouts/main-menu/logo-link.blade.php diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 1dfd4616..e8e3cae4 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -10,6 +10,7 @@ use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\URL; use Illuminate\Support\ServiceProvider; use Illuminate\Database\Eloquent\Model; +use Illuminate\Support\Facades\Blade; use Money\Currencies\ISOCurrencies; use Money\Currency; use Money\Formatter\IntlMoneyFormatter; @@ -45,16 +46,21 @@ class AppServiceProvider extends ServiceProvider Carbon::setLocale(config('app.locale')); // * SETTINGS - App::singleton('settings', fn () => GeneralSetting::getCached()); + App::singleton('settings', fn() => GeneralSetting::getCached()); // * Menu - App::singleton('menuNodeList', fn () => App::get('settings') + App::singleton('menuNodeList', fn() => App::get('settings') ->where('type', SettingsType::mainMenu)->firstOrFail()); - App::singleton('menuNodeDataList', fn () => MenuNodeData::getCached()); + App::singleton('menuNodeDataList', fn() => MenuNodeData::getCached()); // * Censor - App::singleton('censor', fn () => new CensorWords()); + App::singleton('censor', fn() => new CensorWords()); $this->setPaymentCurrency(); + + // * BLADE DIRECTIVES + Blade::if('isExport', function () { + return request()->routeIs('fo.*.export'); + }); } /** diff --git a/resources/sass/fo/base/_layout.scss b/resources/sass/fo/base/_layout.scss index ec1c1d18..7e5da2a4 100644 --- a/resources/sass/fo/base/_layout.scss +++ b/resources/sass/fo/base/_layout.scss @@ -219,6 +219,15 @@ body { } } } + + // * Adapt header in export pages because all links are hidden + .header-export { + min-height: 62px; + + .menu-logo { + position: inherit; + } + } } #input-group-search { @@ -300,7 +309,7 @@ body { flex-grow: 0; flex-shrink: 1; - .col-logo{ + .col-logo { height: calc(fit-content - 3rem); } diff --git a/resources/views/fo/layouts/footer.blade.php b/resources/views/fo/layouts/footer.blade.php index 9fdf016c..81b7c64c 100644 --- a/resources/views/fo/layouts/footer.blade.php +++ b/resources/views/fo/layouts/footer.blade.php @@ -10,7 +10,7 @@
    {{-- TOP LOGO --}}
    -