Merge pull request #167 from velstorelabs/feature/admin-validation-v2

imali2 · web-flow · commit e1bc92628b80 · 2025-11-06T20:01:56.000+05:00
Feature/admin validation v2
diff --git a/app/Http/Controllers/Store/ShopController.php b/app/Http/Controllers/Store/ShopController.php
@@ -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']);
             })
diff --git a/resources/lang/ar/cms.php b/resources/lang/ar/cms.php
@@ -2,6 +2,7 @@
 
 return [
     'auth' => [
+        'velstore' => 'فيلستور',
         'login' => 'تسجيل الدخول',
         'email' => 'عنوان البريد الإلكتروني',
         'password' => 'كلمة المرور',
diff --git a/resources/lang/de/cms.php b/resources/lang/de/cms.php
@@ -2,6 +2,7 @@
 
 return [
     'auth' => [
+        'velstore' => 'Velstore',
         'login' => 'Anmelden',
         'email' => 'E-Mail-Adresse',
         'password' => 'Passwort',
diff --git a/resources/lang/en/cms.php b/resources/lang/en/cms.php
@@ -2,6 +2,7 @@
 
 return [
     'auth' => [
+        'velstore' => 'Velstore',
         'login' => 'Login',
         'email' => 'Email Address',
         'password' => 'Password',
diff --git a/resources/lang/es/cms.php b/resources/lang/es/cms.php
@@ -2,6 +2,7 @@
 
 return [
     'auth' => [
+        'velstore' => 'Velstore',
         'login' => 'Iniciar sesión',
         'email' => 'Correo electrónico',
         'password' => 'Contraseña',
diff --git a/resources/lang/fa/cms.php b/resources/lang/fa/cms.php
@@ -2,6 +2,7 @@
 
 return [
     'auth' => [
+        'velstore' => 'ول‌استور',
         'login' => 'ورود',
         'email' => 'آدرس ایمیل',
         'password' => 'رمز عبور',
diff --git a/resources/lang/fr/cms.php b/resources/lang/fr/cms.php
@@ -2,6 +2,7 @@
 
 return [
     'auth' => [
+        'velstore' => 'Velstore',
         'login' => 'Se connecter',
         'email' => 'Adresse e-mail',
         'password' => 'Mot de passe',
diff --git a/resources/lang/hi/cms.php b/resources/lang/hi/cms.php
@@ -2,6 +2,7 @@
 
 return [
     'auth' => [
+        'velstore' => 'वेलस्टोर',
         'login' => 'लॉगिन',
         'email' => 'ईमेल पता',
         'password' => 'पासवर्ड',
diff --git a/resources/lang/id/cms.php b/resources/lang/id/cms.php
@@ -2,6 +2,7 @@
 
 return [
     'auth' => [
+        'velstore' => 'Velstore',
         'login' => 'Masuk',
         'email' => 'Alamat Email',
         'password' => 'Kata Sandi',
diff --git a/resources/lang/it/cms.php b/resources/lang/it/cms.php
@@ -2,6 +2,7 @@
 
 return [
     'auth' => [
+        'velstore' => 'Velstore',
         'login' => 'Accesso',
         'email' => 'Indirizzo email',
         'password' => 'Password',
diff --git a/resources/lang/ja/cms.php b/resources/lang/ja/cms.php
@@ -2,6 +2,7 @@
 
 return [
     'auth' => [
+        'velstore' => 'ベルストア',
         'login' => 'ログイン',
         'email' => 'メールアドレス',
         'password' => 'パスワード',
diff --git a/resources/lang/ko/cms.php b/resources/lang/ko/cms.php
@@ -2,6 +2,7 @@
 
 return [
     'auth' => [
+        'velstore' => '벨스토어',
         'login' => '로그인',
         'email' => '이메일 주소',
         'password' => '비밀번호',
diff --git a/resources/lang/nl/cms.php b/resources/lang/nl/cms.php
@@ -2,6 +2,7 @@
 
 return [
     'auth' => [
+        'velstore' => 'Velstore',
         'login' => 'Inloggen',
         'email' => 'E-mailadres',
         'password' => 'Wachtwoord',
diff --git a/resources/lang/pl/cms.php b/resources/lang/pl/cms.php
@@ -2,6 +2,7 @@
 
 return [
     'auth' => [
+        'velstore' => 'Velstore',
         'login' => 'Zaloguj się',
         'email' => 'Adres e-mail',
         'password' => 'Hasło',
diff --git a/resources/lang/pt/cms.php b/resources/lang/pt/cms.php
@@ -2,6 +2,7 @@
 
 return [
     'auth' => [
+        'velstore' => 'Velstore',
         'login' => 'Entrar',
         'email' => 'Endereço de E-mail',
         'password' => 'Senha',
diff --git a/resources/lang/ru/cms.php b/resources/lang/ru/cms.php
@@ -2,6 +2,7 @@
 
 return [
     'auth' => [
+        'velstore' => 'Велстор',
         'login' => 'Войти',
         'email' => 'Адрес электронной почты',
         'password' => 'Пароль',
diff --git a/resources/lang/th/cms.php b/resources/lang/th/cms.php
@@ -2,6 +2,7 @@
 
 return [
     'auth' => [
+        'velstore' => 'เวลสโตร์',
         'login' => 'เข้าสู่ระบบ',
         'email' => 'ที่อยู่อีเมล',
         'password' => 'รหัสผ่าน',
diff --git a/resources/lang/tr/cms.php b/resources/lang/tr/cms.php
@@ -2,6 +2,7 @@
 
 return [
     'auth' => [
+        'velstore' => 'Velstore',
         'login' => 'Giriş Yap',
         'email' => 'E-posta Adresi',
         'password' => 'Parola',
diff --git a/resources/lang/vi/cms.php b/resources/lang/vi/cms.php
@@ -2,6 +2,7 @@
 
 return [
     'auth' => [
+        'velstore' => 'Velstore',
         'login' => 'Đăng nhập',
         'email' => 'Địa chỉ Email',
         'password' => 'Mật khẩu',
diff --git a/resources/lang/zh/cms.php b/resources/lang/zh/cms.php
@@ -2,6 +2,7 @@
 
 return [
     'auth' => [
+        'velstore' => '维尔斯托尔',
         'login' => '登录',
         'email' => '电子邮件地址',
         'password' => '密码',
diff --git a/resources/views/admin/auth/login.blade.php b/resources/views/admin/auth/login.blade.php
@@ -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>
 
diff --git a/resources/views/themes/xylo/partials/product-list.blade.php b/resources/views/themes/xylo/partials/product-list.blade.php
@@ -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">
diff --git a/resources/views/themes/xylo/product-detail.blade.php b/resources/views/themes/xylo/product-detail.blade.php
@@ -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 }}
diff --git a/resources/views/vendor/auth/login.blade.php b/resources/views/vendor/auth/login.blade.php
@@ -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>
 
