Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/Http/Controllers/Store/ShopController.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ public function index(Request $request)
];

$products = Product::with(['translation', 'variants.attributeValues'])
->withCount('reviews')
->withAvg('reviews', 'rating')
->when(! empty($filters['category']), function ($query) use ($filters) {
$query->whereIn('category_id', $filters['category']);
})
Expand Down
1 change: 1 addition & 0 deletions resources/lang/ar/cms.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

return [
'auth' => [
'velstore' => 'فيلستور',
'login' => 'تسجيل الدخول',
'email' => 'عنوان البريد الإلكتروني',
'password' => 'كلمة المرور',
Expand Down
1 change: 1 addition & 0 deletions resources/lang/de/cms.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

return [
'auth' => [
'velstore' => 'Velstore',
'login' => 'Anmelden',
'email' => 'E-Mail-Adresse',
'password' => 'Passwort',
Expand Down
1 change: 1 addition & 0 deletions resources/lang/en/cms.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

return [
'auth' => [
'velstore' => 'Velstore',
'login' => 'Login',
'email' => 'Email Address',
'password' => 'Password',
Expand Down
1 change: 1 addition & 0 deletions resources/lang/es/cms.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

return [
'auth' => [
'velstore' => 'Velstore',
'login' => 'Iniciar sesión',
'email' => 'Correo electrónico',
'password' => 'Contraseña',
Expand Down
1 change: 1 addition & 0 deletions resources/lang/fa/cms.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

return [
'auth' => [
'velstore' => 'ول‌استور',
'login' => 'ورود',
'email' => 'آدرس ایمیل',
'password' => 'رمز عبور',
Expand Down
1 change: 1 addition & 0 deletions resources/lang/fr/cms.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

return [
'auth' => [
'velstore' => 'Velstore',
'login' => 'Se connecter',
'email' => 'Adresse e-mail',
'password' => 'Mot de passe',
Expand Down
1 change: 1 addition & 0 deletions resources/lang/hi/cms.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

return [
'auth' => [
'velstore' => 'वेलस्टोर',
'login' => 'लॉगिन',
'email' => 'ईमेल पता',
'password' => 'पासवर्ड',
Expand Down
1 change: 1 addition & 0 deletions resources/lang/id/cms.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

return [
'auth' => [
'velstore' => 'Velstore',
'login' => 'Masuk',
'email' => 'Alamat Email',
'password' => 'Kata Sandi',
Expand Down
1 change: 1 addition & 0 deletions resources/lang/it/cms.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

return [
'auth' => [
'velstore' => 'Velstore',
'login' => 'Accesso',
'email' => 'Indirizzo email',
'password' => 'Password',
Expand Down
1 change: 1 addition & 0 deletions resources/lang/ja/cms.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

return [
'auth' => [
'velstore' => 'ベルストア',
'login' => 'ログイン',
'email' => 'メールアドレス',
'password' => 'パスワード',
Expand Down
1 change: 1 addition & 0 deletions resources/lang/ko/cms.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

return [
'auth' => [
'velstore' => '벨스토어',
'login' => '로그인',
'email' => '이메일 주소',
'password' => '비밀번호',
Expand Down
1 change: 1 addition & 0 deletions resources/lang/nl/cms.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

return [
'auth' => [
'velstore' => 'Velstore',
'login' => 'Inloggen',
'email' => 'E-mailadres',
'password' => 'Wachtwoord',
Expand Down
1 change: 1 addition & 0 deletions resources/lang/pl/cms.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

return [
'auth' => [
'velstore' => 'Velstore',
'login' => 'Zaloguj się',
'email' => 'Adres e-mail',
'password' => 'Hasło',
Expand Down
1 change: 1 addition & 0 deletions resources/lang/pt/cms.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

return [
'auth' => [
'velstore' => 'Velstore',
'login' => 'Entrar',
'email' => 'Endereço de E-mail',
'password' => 'Senha',
Expand Down
1 change: 1 addition & 0 deletions resources/lang/ru/cms.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

return [
'auth' => [
'velstore' => 'Велстор',
'login' => 'Войти',
'email' => 'Адрес электронной почты',
'password' => 'Пароль',
Expand Down
1 change: 1 addition & 0 deletions resources/lang/th/cms.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

return [
'auth' => [
'velstore' => 'เวลสโตร์',
'login' => 'เข้าสู่ระบบ',
'email' => 'ที่อยู่อีเมล',
'password' => 'รหัสผ่าน',
Expand Down
1 change: 1 addition & 0 deletions resources/lang/tr/cms.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

return [
'auth' => [
'velstore' => 'Velstore',
'login' => 'Giriş Yap',
'email' => 'E-posta Adresi',
'password' => 'Parola',
Expand Down
1 change: 1 addition & 0 deletions resources/lang/vi/cms.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

return [
'auth' => [
'velstore' => 'Velstore',
'login' => 'Đăng nhập',
'email' => 'Địa chỉ Email',
'password' => 'Mật khẩu',
Expand Down
1 change: 1 addition & 0 deletions resources/lang/zh/cms.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

return [
'auth' => [
'velstore' => '维尔斯托尔',
'login' => '登录',
'email' => '电子邮件地址',
'password' => '密码',
Expand Down
2 changes: 1 addition & 1 deletion resources/views/admin/auth/login.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<div class="container-wrapper">
<div class="login-container">
<div class="text-center mb-3">
<h1 class="fw-bold">Velstore</h1>
<h1 class="fw-bold">{{ cms_translate('auth.velstore') }}</h1>
</div>
<h2 class="text-center mb-4">{{ cms_translate('auth.login') }}</h2>

Expand Down
4 changes: 3 additions & 1 deletion resources/views/themes/xylo/partials/product-list.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
</div>
<div class="product-info mt-4">
<div class="top-info">
<div class="reviews"><i class="fa-solid fa-star"></i>0 Reviews</div>
<div class="reviews">
<i class="fa-solid fa-star"></i> ({{ $product->reviews_count }} {{ __('store.category.reviews') }})
</div>
</div>
<div class="bottom-info">
<div class="left">
Expand Down
5 changes: 3 additions & 2 deletions resources/views/themes/xylo/product-detail.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,10 @@
value="{{ $value->id }}"
{{ $index === 0 ? 'checked' : '' }}
>
<label
<label
for="{{ $inputId }}"
class="{{ strtolower($values->first()->attribute->name) === 'color' ? 'color-circle ' . strtolower($value->translated_value) : 'size-box' }}"
class="{{ strtolower($values->first()->attribute->name) === 'color' ? 'color-circle' : 'size-box' }}"
style="{{ strtolower($values->first()->attribute->name) === 'color' ? 'background-color:' . strtolower($value->value) . ';' : '' }}"
>
@if(strtolower($values->first()->attribute->name) === 'size')
{{ $value->translated_value }}
Expand Down
2 changes: 1 addition & 1 deletion resources/views/vendor/auth/login.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<div class="container-wrapper">
<div class="login-container">
<div class="text-center mb-3">
<h1 class="fw-bold">Velstore</h1>
<h1 class="fw-bold">{{ cms_translate('auth.velstore') }}</h1>
</div>
<h2 class="text-center mb-4">{{ cms_translate('auth.login') }}</h2>

Expand Down