From e3b9dbea606327f944b45acdfaa180e9e9953731 Mon Sep 17 00:00:00 2001 From: Bayu Lukman Yusuf Date: Mon, 23 Feb 2026 12:51:25 +0700 Subject: [PATCH 1/3] rename meta tag --- resources/views/layouts/partials/title-meta.blade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/layouts/partials/title-meta.blade.php b/resources/views/layouts/partials/title-meta.blade.php index 3a15612..6e2a82d 100644 --- a/resources/views/layouts/partials/title-meta.blade.php +++ b/resources/views/layouts/partials/title-meta.blade.php @@ -8,10 +8,10 @@ {{ config('app.name') }} | {{ $title }} - + - + content="AsiaGolf, AsiaGolf Store"> + From 7e820e7b4521cfa1cd7c10bfd28f45378cfcd49d Mon Sep 17 00:00:00 2001 From: Bayu Lukman Yusuf Date: Tue, 24 Feb 2026 11:30:42 +0700 Subject: [PATCH 2/3] init home store/marketplace --- app/Http/Controllers/HomeController.php | 8 +- app/Models/Items.php | 5 + app/Models/StoreCategory.php | 8 + .../Components/Grocery/DeliveryOptions.php | 29 + .../Components/Grocery/FeaturedCategories.php | 26 + .../Grocery/HeaderCategoryDropdown.php | 36 + app/View/Components/Grocery/HomeSlider.php | 29 + .../Components/Grocery/PopularProducts.php | 40 + .../Components/Grocery/ShopByLifestyle.php | 34 + .../Components/Grocery/SpecialProducts.php | 32 + app/View/Components/Grocery/TopHeader.php | 28 + lang/en/grocery.php | 34 + lang/id/grocery.php | 34 + .../grocery/delivery-options.blade.php | 222 ++ .../grocery/featured-categories.blade.php | 91 + .../header-category-dropdown.blade.php | 40 + .../components/grocery/home-slider.blade.php | 50 + .../grocery/popular-products.blade.php | 98 + .../grocery/shop-by-lifestyle.blade.php | 46 + .../grocery/special-products.blade.php | 113 ++ .../components/grocery/top-header.blade.php | 20 + .../layout/header-grocery.blade.php | 144 ++ resources/views/home/grocery.blade.php | 1792 +---------------- routes/web.php | 4 + 24 files changed, 1177 insertions(+), 1786 deletions(-) create mode 100644 app/View/Components/Grocery/DeliveryOptions.php create mode 100644 app/View/Components/Grocery/FeaturedCategories.php create mode 100644 app/View/Components/Grocery/HeaderCategoryDropdown.php create mode 100644 app/View/Components/Grocery/HomeSlider.php create mode 100644 app/View/Components/Grocery/PopularProducts.php create mode 100644 app/View/Components/Grocery/ShopByLifestyle.php create mode 100644 app/View/Components/Grocery/SpecialProducts.php create mode 100644 app/View/Components/Grocery/TopHeader.php create mode 100644 lang/en/grocery.php create mode 100644 lang/id/grocery.php create mode 100644 resources/views/components/grocery/delivery-options.blade.php create mode 100644 resources/views/components/grocery/featured-categories.blade.php create mode 100644 resources/views/components/grocery/header-category-dropdown.blade.php create mode 100644 resources/views/components/grocery/home-slider.blade.php create mode 100644 resources/views/components/grocery/popular-products.blade.php create mode 100644 resources/views/components/grocery/shop-by-lifestyle.blade.php create mode 100644 resources/views/components/grocery/special-products.blade.php create mode 100644 resources/views/components/grocery/top-header.blade.php create mode 100644 resources/views/components/layout/header-grocery.blade.php diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 45a37b4..bebfa47 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -10,8 +10,12 @@ class HomeController extends Controller public function index(Request $request) { - - return view('home.fashion-v1'); } + + + public function store(Request $request) + { + return view('home.grocery'); + } } diff --git a/app/Models/Items.php b/app/Models/Items.php index c768d64..06e3e2c 100644 --- a/app/Models/Items.php +++ b/app/Models/Items.php @@ -338,6 +338,11 @@ class Items extends Model } } + public function getDisplayPriceCurrencyAttribute() + { + return 'Rp ' . number_format($this->display_price, 0, ',', '.'); + } + public function getDisplayDiscountPriceAttribute() { try { diff --git a/app/Models/StoreCategory.php b/app/Models/StoreCategory.php index 4fdf316..4d572f9 100644 --- a/app/Models/StoreCategory.php +++ b/app/Models/StoreCategory.php @@ -23,5 +23,13 @@ class StoreCategory extends Model return $this->hasMany(StoreCapacity::class); } + public function items() + { + return $this->hasMany(Items::class, 'category_id', 'id'); + } + public function productCount() + { + return $this->items()->count(); + } } diff --git a/app/View/Components/Grocery/DeliveryOptions.php b/app/View/Components/Grocery/DeliveryOptions.php new file mode 100644 index 0000000..c9bf51c --- /dev/null +++ b/app/View/Components/Grocery/DeliveryOptions.php @@ -0,0 +1,29 @@ +categories = $categoryRepository->getList([]); + $this->genders = $genderRepository->getList([]); + } + + /** + * Get the view / contents that represent the component. + */ + public function render(): View|Closure|string + { + + return view('components.grocery.header-category-dropdown', [ + 'categories' => $this->categories, + 'genders' => $this->genders, + ]); + } +} diff --git a/app/View/Components/Grocery/HomeSlider.php b/app/View/Components/Grocery/HomeSlider.php new file mode 100644 index 0000000..f41f5d0 --- /dev/null +++ b/app/View/Components/Grocery/HomeSlider.php @@ -0,0 +1,29 @@ +items = $repository->getList([]); + } + + /** + * Get the view / contents that represent the component. + */ + public function render(): View|Closure|string + { + return view('components.grocery.home-slider', [ + 'items' => $this->items + ]); + } +} diff --git a/app/View/Components/Grocery/PopularProducts.php b/app/View/Components/Grocery/PopularProducts.php new file mode 100644 index 0000000..ed159dc --- /dev/null +++ b/app/View/Components/Grocery/PopularProducts.php @@ -0,0 +1,40 @@ +categories = $categoryRepository->getList([]); + $this->products = $productRepository->getList([ + 'limit' => 12, + ]); + } + + /** + * Get the view / contents that represent the component. + */ + public function render(): View|Closure|string + { + return view('components.grocery.popular-products', [ + 'categories' => $this->categories, + 'products' => $this->products, + ]); + } +} diff --git a/app/View/Components/Grocery/ShopByLifestyle.php b/app/View/Components/Grocery/ShopByLifestyle.php new file mode 100644 index 0000000..e8cda21 --- /dev/null +++ b/app/View/Components/Grocery/ShopByLifestyle.php @@ -0,0 +1,34 @@ +brands = $brandRepository->getList([]); + } + + /** + * Get the view / contents that represent the component. + */ + public function render(): View|Closure|string + { + return view('components.grocery.shop-by-lifestyle', [ + 'brands' => $this->brands, + ]); + } +} diff --git a/app/View/Components/Grocery/SpecialProducts.php b/app/View/Components/Grocery/SpecialProducts.php new file mode 100644 index 0000000..f102889 --- /dev/null +++ b/app/View/Components/Grocery/SpecialProducts.php @@ -0,0 +1,32 @@ +products = $productRepository->getList([ + + ]); + } + + /** + * Get the view / contents that represent the component. + */ + public function render(): View|Closure|string + { + return view('components.grocery.special-products',[ + 'products' => $this->products, + ]); + } +} diff --git a/app/View/Components/Grocery/TopHeader.php b/app/View/Components/Grocery/TopHeader.php new file mode 100644 index 0000000..5d5bde9 --- /dev/null +++ b/app/View/Components/Grocery/TopHeader.php @@ -0,0 +1,28 @@ +getList([]); + + return view('components.grocery.top-header', compact('brands')); + } +} diff --git a/lang/en/grocery.php b/lang/en/grocery.php new file mode 100644 index 0000000..0225857 --- /dev/null +++ b/lang/en/grocery.php @@ -0,0 +1,34 @@ + 'Delivery options', + 'delivery_tab' => 'Delivery', + 'pickup_tab' => 'Pickup', + + // Addresses + 'address_1' => '567 Cherry Lane Apt B12 Sacramento, 95829', + 'address_2' => '1901 Thornridge Cir. Shiloh, Hawaii, 81063', + 'address_3' => '3517 W. Gray St. Utica, Pennsylvania, 57867', + 'pickup_address_1' => '123 Main St. Downtown, New York, 10001', + 'pickup_address_2' => '456 Oak Avenue Midtown, New York, 10002', + + // Actions + 'remove' => 'Remove', + 'back_to_addresses' => 'Back to my addresses', + 'add_address_title' => 'Add an address to start ordering', + 'add_pickup_address_title' => 'Add a pickup address', + 'find_on_map' => 'Find on map', + 'add_delivery_address' => 'Add delivery address', + 'add_pickup_address' => 'Add pickup address', + + // Form Labels + 'state_label' => 'State', + 'postcode_label' => 'Postcode', + 'city_label' => 'City', + 'street_address_label' => 'Street address', + + // Form Placeholders + 'select_state' => 'Select state', + 'select_city' => 'Select city', +]; diff --git a/lang/id/grocery.php b/lang/id/grocery.php new file mode 100644 index 0000000..6a8944f --- /dev/null +++ b/lang/id/grocery.php @@ -0,0 +1,34 @@ + 'Opsi pengiriman', + 'delivery_tab' => 'Pengiriman', + 'pickup_tab' => 'Ambil sendiri', + + // Addresses + 'address_1' => '567 Cherry Lane Apt B12 Sacramento, 95829', + 'address_2' => '1901 Thornridge Cir. Shiloh, Hawaii, 81063', + 'address_3' => '3517 W. Gray St. Utica, Pennsylvania, 57867', + 'pickup_address_1' => '123 Main St. Downtown, New York, 10001', + 'pickup_address_2' => '456 Oak Avenue Midtown, New York, 10002', + + // Actions + 'remove' => 'Hapus', + 'back_to_addresses' => 'Kembali ke alamat saya', + 'add_address_title' => 'Tambahkan alamat untuk mulai memesan', + 'add_pickup_address_title' => 'Tambahkan alamat pengambilan', + 'find_on_map' => 'Cari di peta', + 'add_delivery_address' => 'Tambah alamat pengiriman', + 'add_pickup_address' => 'Tambah alamat pengambilan', + + // Form Labels + 'state_label' => 'Provinsi', + 'postcode_label' => 'Kode pos', + 'city_label' => 'Kota', + 'street_address_label' => 'Alamat jalan', + + // Form Placeholders + 'select_state' => 'Pilih provinsi', + 'select_city' => 'Pilih kota', +]; diff --git a/resources/views/components/grocery/delivery-options.blade.php b/resources/views/components/grocery/delivery-options.blade.php new file mode 100644 index 0000000..531de46 --- /dev/null +++ b/resources/views/components/grocery/delivery-options.blade.php @@ -0,0 +1,222 @@ +
+ + +
+
+

{{ __('grocery.delivery_options_title') }}

+ +
+ +
+ +
+ + +
+ + +
+
+
+ + +
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+
+ + +
+ +
+
{{ __('grocery.add_address_title') }}
+ + + {{ __('grocery.find_on_map') }} + +
+
+ + +
+
+ + +
+
+ + +
+ + +
+ + + +
+ + +
+
+
+
+ + +
+
+ +
+ + +
+
+
+
+ + +
+ +
+
{{ __('grocery.add_pickup_address_title') }}
+ + + {{ __('grocery.find_on_map') }} + +
+
+ + +
+
+ + +
+
+ + +
+ + +
+ + + +
+
+
diff --git a/resources/views/components/grocery/featured-categories.blade.php b/resources/views/components/grocery/featured-categories.blade.php new file mode 100644 index 0000000..0f647eb --- /dev/null +++ b/resources/views/components/grocery/featured-categories.blade.php @@ -0,0 +1,91 @@ +
+
+
+ + +
+
+
+

124 products

+

Only fresh fish to your table

+ +
+
+ Image +
+
+
+ + +
+
+
+

97 products

+

Products for Easter table

+ +
+
+ Image +
+
+
+ + +
+
+
+

28 products

+

Berries from the garden

+ +
+
+ Image +
+
+
+
+ + +
+
+
diff --git a/resources/views/components/grocery/header-category-dropdown.blade.php b/resources/views/components/grocery/header-category-dropdown.blade.php new file mode 100644 index 0000000..4ff419f --- /dev/null +++ b/resources/views/components/grocery/header-category-dropdown.blade.php @@ -0,0 +1,40 @@ + diff --git a/resources/views/components/grocery/home-slider.blade.php b/resources/views/components/grocery/home-slider.blade.php new file mode 100644 index 0000000..c147b4e --- /dev/null +++ b/resources/views/components/grocery/home-slider.blade.php @@ -0,0 +1,50 @@ +
+
+
+ + @foreach ($items as $item) +
+ {{--
+
+
+
+

🔥 Free shipping - order over + 50$ +

+

Healthy Food Available to Everyone

+ Shop now +
+
+
+
--}} + Image +
+ @endforeach + +
+ + +
+
+
+
+
+
+
+
diff --git a/resources/views/components/grocery/popular-products.blade.php b/resources/views/components/grocery/popular-products.blade.php new file mode 100644 index 0000000..9351f88 --- /dev/null +++ b/resources/views/components/grocery/popular-products.blade.php @@ -0,0 +1,98 @@ +
+
+ + +
+

Categories

+ +
+ +
+
+

Popular products

+ +
+ + +
+ + @foreach ($products as $key => $value) + +
+
+
+ + +
+ Image +
+
+
+
+ +
+
+
+
+
{{ $value->display_price_currency }}
+

+ {{ $value->name }} +

+
+
{{ $value->unit }}
+
+
+ @endforeach + + +
+
+
+
diff --git a/resources/views/components/grocery/shop-by-lifestyle.blade.php b/resources/views/components/grocery/shop-by-lifestyle.blade.php new file mode 100644 index 0000000..e10cd05 --- /dev/null +++ b/resources/views/components/grocery/shop-by-lifestyle.blade.php @@ -0,0 +1,46 @@ +
+

Brands

+
+
+ + @foreach($brands as $brand) + +
+
+ {{ $brand->name }} +
+

+ + {{ $brand->name }} + +

+ {{--

Foods that don't contain gluten

--}} +
+ @endforeach +
+ + +
+
+
diff --git a/resources/views/components/grocery/special-products.blade.php b/resources/views/components/grocery/special-products.blade.php new file mode 100644 index 0000000..090302c --- /dev/null +++ b/resources/views/components/grocery/special-products.blade.php @@ -0,0 +1,113 @@ +
+
+ + +
+
+
+
+

Make breakfast healthy and easy

+ +
+
+ Banner +
+
+
+
+ + +
+
+

Special products

+ +
+
+
+ + @foreach ($products as $key => $value) +
+
+
+ + +
+ Image +
+
+
+
+ +
+
+
+
+
{{ $value->display_price_currency }}
+

+ {{ $value->name }} +

+
+ @if ($value->variants->count() > 1) +
+ +{{ $value->variants->count() - 1 }} Varian
+ @endif +
+
+ @endforeach + +
+
+ + +
+
+
+ +
diff --git a/resources/views/components/grocery/top-header.blade.php b/resources/views/components/grocery/top-header.blade.php new file mode 100644 index 0000000..afd2d87 --- /dev/null +++ b/resources/views/components/grocery/top-header.blade.php @@ -0,0 +1,20 @@ +
+
+
+ +
+
+
diff --git a/resources/views/components/layout/header-grocery.blade.php b/resources/views/components/layout/header-grocery.blade.php new file mode 100644 index 0000000..f1dfb2c --- /dev/null +++ b/resources/views/components/layout/header-grocery.blade.php @@ -0,0 +1,144 @@ +
+ @include('layouts.partials/offcanvas2') + + + + @include('layouts.partials/menu-offcanvas') + + + + + + + +
diff --git a/resources/views/home/grocery.blade.php b/resources/views/home/grocery.blade.php index 65e1d8a..50b594a 100644 --- a/resources/views/home/grocery.blade.php +++ b/resources/views/home/grocery.blade.php @@ -1,1807 +1,32 @@ @extends('layouts.landing', ['title' => 'Grocery Store']) @section('content') - @include('layouts.partials/offcanvas2') + -
+ - -
-
-

Delivery options

- -
- -
-
- - -
- - -
-
-
- - -
-
- -
- - -
-
-
- -
- - -
-
-
-
- - -
- -
-
Add an address to start ordering
- - - Find on map - -
-
- - -
-
- - -
-
- - -
- - -
- - - -
- - -
- - -
-
-
- -
-
- - -
-
8270 Delta Shores Cir S, Sacramento, CA 95832
-
Open: 07:00 - 22:00 -
-
-
-
- -
-
- - -
-
755 Riverpoint Ct, West Sacramento, CA 95605
-
Open: 07:00 - 21:00 -
-
-
-
- -
-
- - -
-
10655 Folsom Blvd, Rancho Cordova, CA 95670
-
Open: 08:00 - 23:00 -
-
-
-
-
- - -
- -
-
Select a suitable store
- - - Find on map - -
-
- - -
-
- - -
-
Found stores:
-
- -
- -
8270 Delta Shores Cir S, Sacramento, CA 95832
-
Open: 07:00 - 22:00 -
-
-
-
- -
- -
755 Riverpoint Ct, West Sacramento, CA 95605
-
Open: 07:00 - 21:00 -
-
-
-
- -
- -
10655 Folsom Blvd, Rancho Cordova, CA 95670
-
Open: 08:00 - 23:00 -
-
-
-
- - - -
-
- - -
- -
-
- - @include('layouts.partials/menu-offcanvas') - - - -
- -
-
-
-
- - -
-
-
-
-
-

🔥 Free shipping - order over - 50$ -

-

Healthy Food Available to Everyone

- Shop now -
-
-
-
- Image -
- - -
-
-
-
-
-

🥚 Organic products to your table

-

Organic eggs from home-grown chicken -

- Shop now -
-
-
-
- Image -
- - -
-
-
-
-
-

🥝 Only natural ingredients

-

Enjoy refreshing summer drink

- Shop now -
-
-
-
- Image -
-
- - -
-
-
-
-
-
-
-
+ -
-
-
- - -
-
-
-

124 products

-

Only fresh fish to your table

- -
-
- Image -
-
-
- - -
-
-
-

97 products

-

Products for Easter table

- -
-
- Image -
-
-
- - -
-
-
-

28 products

-

Berries from the garden

- -
-
- Image -
-
-
-
- - -
-
-
+ -
-
- - -
-

Categories

- -
- -
-
-

Popular products

- -
- - -
- - -
-
-
- - -
- Image -
-
-
-
- -
-
-
- -
500g
-
-
- - -
-
-
- -30% - - -
- Image -
-
-
-
- -
-
-
-
-
$3.12 $4.05
-

- Fresh orange Klementina, Spain -

-
-
1kg
-
-
- - -
-
-
- - -
- Image -
-
-
-
- -
-
-
-
-
$0.80
-

- Pepsi soda classic, can -

-
-
330ml
-
-
- - -
-
-
- - -
- Image -
-
-
-
- -
-
-
- -
250g
-
-
- - -
-
-
- - -
- Image -
-
-
-
- -
-
-
-
-
$1.24
-

- Coconut, Indonesia -

-
-
1 coconut
-
-
- - -
-
-
- - -
- Image -
-
-
-
- -
-
-
- -
200g
-
-
- - -
-
-
- - -
- Image -
-
-
-
- -
-
-
-
-
$1.99
-

- Fresh mango, Spain -

-
-
1 mango
-
-
- - -
-
-
- - -
- Image -
-
-
-
- -
-
-
- -
300g
-
-
-
-
-
-
+ -
-

Shop by lifestyle

-
-
- - -
-
- - - -
-

- - Gluten-Free - -

-

Foods that don't contain gluten

-
- - -
-
- - - - - - - - - -
-

- - Vegan - -

-

Vegetable based goodness

-
- - -
-
- - - - -
-

- - Plant based - -

-

Based on herbal ingredients

-
- - -
-
- - - - -
-

- - Keto - -

-

Good fats served in food

-
-
- - -
-
-
+ -
-
- - -
-
-
-
-

Make breakfast healthy and easy

- -
-
- Banner -
-
-
-
- - -
-
-

Special products

- -
-
-
- - -
-
-
- - -
- Image -
-
-
-
- -
-
-
-
-
$18.60
-

- Pure virgin olive oil Basso -

-
-
1000ml
-
-
- - -
-
-
- - -
- Image -
-
-
-
- -
-
-
- -
500g
-
-
- - -
-
-
- - -
- Image -
-
-
-
- -
-
-
-
-
$3.40
-

- Fresh red grapefruit -

-
-
1kg
-
-
- - -
-
-
- - -
- Image -
-
-
-
- -
-
-
- -
150g
-
-
-
- - -
-
-
-
-
+ @@ -1909,8 +134,7 @@ class="d-sm-flex align-items-start align-items-md-center align-items-lg-start align-items-xl-center p-md-2 p-lg-0 p-xl-2 p-xxl-3"> - Book cover + Book cover
Cookbook diff --git a/routes/web.php b/routes/web.php index 0ef1c3b..cf47e61 100644 --- a/routes/web.php +++ b/routes/web.php @@ -38,6 +38,7 @@ Route::post('/locale/switch', [LocaleController::class, 'switch'])->name('locale Route::get('/', [HomeController::class, 'index'])->name('home'); + Route::get('/products', [ProductController::class, 'index'])->name('product.index'); Route::get('/products/ajax', [ProductController::class, 'ajax'])->name('product.ajax'); Route::get('/products/ajax/populers', [ProductController::class, 'populers'])->name('product.ajax.populers'); @@ -50,6 +51,9 @@ Route::get('/products/ajax/genders', [ProductController::class, 'genders'])->nam Route::get('/products/ajax/announcements', [ProductController::class, 'announcements'])->name('product.ajax.announcements'); Route::get('/product/{slug}', [ProductController::class, 'detail'])->name('product.detail'); + +Route::get('/store', [HomeController::class, 'store'])->name('store'); + // Search routes Route::get('/search', [SearchController::class, 'search'])->name('search.ajax'); From b3630efd2edf7a5eb775543e2510643062fcbfb5 Mon Sep 17 00:00:00 2001 From: Bayu Lukman Yusuf Date: Tue, 24 Feb 2026 11:50:14 +0700 Subject: [PATCH 3/3] link product --- app/Models/User.php | 4 +++ .../grocery/popular-products.blade.php | 6 ++-- .../grocery/special-products.blade.php | 4 +-- .../layout/header-grocery.blade.php | 36 ++++++++++++++++--- resources/views/home/grocery.blade.php | 4 +-- 5 files changed, 42 insertions(+), 12 deletions(-) diff --git a/app/Models/User.php b/app/Models/User.php index c8dd1a8..872cdf2 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -62,6 +62,10 @@ class User extends Authenticatable { return $this->hasMany(Address::class); } + public function primary_address() + { + return $this->hasOne(Address::class)->where('is_primary', true); + } public function getPhotoUrlAttribute() { diff --git a/resources/views/components/grocery/popular-products.blade.php b/resources/views/components/grocery/popular-products.blade.php index 9351f88..fd7ee72 100644 --- a/resources/views/components/grocery/popular-products.blade.php +++ b/resources/views/components/grocery/popular-products.blade.php @@ -53,7 +53,7 @@ aria-label="Add to Wishlist"> - +
Image
@@ -82,8 +82,8 @@
{{ $value->unit }}
diff --git a/resources/views/components/grocery/special-products.blade.php b/resources/views/components/grocery/special-products.blade.php index 090302c..923915a 100644 --- a/resources/views/components/grocery/special-products.blade.php +++ b/resources/views/components/grocery/special-products.blade.php @@ -61,7 +61,7 @@ aria-label="Add to Wishlist"> - +
Image
@@ -91,7 +91,7 @@
{{ $value->display_price_currency }}

{{ $value->name }} + href="{{ route('product.detail', $value->slug) }}">{{ $value->name }}

@if ($value->variants->count() > 1) diff --git a/resources/views/components/layout/header-grocery.blade.php b/resources/views/components/layout/header-grocery.blade.php index f1dfb2c..28a346a 100644 --- a/resources/views/components/layout/header-grocery.blade.php +++ b/resources/views/components/layout/header-grocery.blade.php @@ -34,7 +34,7 @@ - --}} + + + @@ -109,20 +120,35 @@ + href="{{ auth()->check() ? route('profile') : route('login') }}"> - Account + {{ __('header.account') }} + + + - + --}} + + + @if (auth()->check() && \App\Repositories\Member\Cart\MemberCartRepository::getCount() > 0) + {{ auth()->check() ? \App\Repositories\Member\Cart\MemberCartRepository::getCount() : 0 }} + @endif + + + diff --git a/resources/views/home/grocery.blade.php b/resources/views/home/grocery.blade.php index 50b594a..d16ebc9 100644 --- a/resources/views/home/grocery.blade.php +++ b/resources/views/home/grocery.blade.php @@ -168,7 +168,7 @@

Make online shop easier with our AsiaGolf App

- @@ -191,7 +191,7 @@ d="M24.575 9.45c-2.184 0-3.914 1.704-3.914 4.071 0 2.272 1.729 4.071 3.914 4.071s3.914-1.704 3.914-4.071c0-2.461-1.729-4.071-3.914-4.071zm0 6.438c-1.183 0-2.184-1.041-2.184-2.462s1.001-2.462 2.184-2.462 2.184.947 2.184 2.462c0 1.42-1.001 2.462-2.184 2.462zM16.11 9.45c-2.184 0-3.914 1.704-3.914 4.071 0 2.272 1.729 4.071 3.914 4.071s3.914-1.704 3.914-4.071c0-2.461-1.729-4.071-3.914-4.071zm0 6.438c-1.183 0-2.184-1.041-2.184-2.462s1.001-2.462 2.184-2.462 2.184.947 2.184 2.462c0 1.42-1.001 2.462-2.184 2.462zM6.007 10.681v1.704h3.914c-.091.947-.455 1.704-.91 2.177-.546.568-1.456 1.231-3.004 1.231-2.457 0-4.278-1.988-4.278-4.544s1.911-4.544 4.278-4.544c1.274 0 2.275.568 3.004 1.231l1.183-1.231C9.193 5.757 7.918 5 6.098 5 2.822 5 0 7.84 0 11.249s2.822 6.249 6.098 6.249c1.82 0 3.095-.568 4.187-1.799 1.092-1.136 1.456-2.745 1.456-3.976 0-.379 0-.757-.091-1.041H6.007zm41.322 1.325c-.364-.947-1.274-2.556-3.277-2.556s-3.641 1.61-3.641 4.071c0 2.272 1.638 4.071 3.823 4.071 1.729 0 2.822-1.136 3.186-1.799l-1.274-.947c-.455.663-1.001 1.136-1.911 1.136s-1.456-.379-1.911-1.231l5.188-2.272-.182-.473zm-5.279 1.326c0-1.515 1.183-2.367 2.002-2.367.637 0 1.274.379 1.456.852l-3.459 1.515zm-4.278 3.882h1.729V5.379h-1.729v11.834zm-2.73-6.911c-.455-.473-1.183-.947-2.093-.947-1.911 0-3.732 1.799-3.732 4.071s1.729 3.976 3.732 3.976c.91 0 1.638-.473 2.002-.947h.091v.568c0 1.515-.819 2.367-2.093 2.367-1.001 0-1.729-.757-1.911-1.42l-1.456.663C30.036 19.675 31.128 21 33.039 21c2.002 0 3.641-1.231 3.641-4.166V9.639h-1.638v.663zm-2.002 5.586c-1.183 0-2.184-1.041-2.184-2.462s1.001-2.462 2.184-2.462 2.093 1.041 2.093 2.462-.91 2.462-2.093 2.462zM55.247 5.379h-4.096v11.834h1.729v-4.45h2.367c1.911 0 3.732-1.42 3.732-3.692s-1.82-3.692-3.732-3.692zm.091 5.681h-2.457V6.988h2.457c1.274 0 2.002 1.136 2.002 1.988-.091 1.041-.819 2.083-2.002 2.083zm10.467-1.704c-1.274 0-2.549.568-3.004 1.799l1.547.663c.364-.663.91-.852 1.547-.852.91 0 1.729.568 1.82 1.515v.095c-.273-.189-1.001-.473-1.729-.473-1.638 0-3.277.947-3.277 2.651 0 1.609 1.365 2.651 2.821 2.651 1.183 0 1.729-.568 2.184-1.136h.091v.947h1.638v-4.544c-.182-2.083-1.729-3.314-3.641-3.314zm-.182 6.533c-.546 0-1.365-.284-1.365-1.041 0-.947 1.001-1.231 1.82-1.231.728 0 1.092.189 1.547.379-.182 1.136-1.092 1.894-2.002 1.894zm9.557-6.249l-1.911 5.112h-.091l-2.002-5.112h-1.82l3.004 7.195-1.729 3.976h1.729L77 9.639h-1.82zm-15.291 7.574h1.729V5.379h-1.729v11.834z" /> -