Merge remote-tracking branch 'origin/2.0' into email-phone-modal-issue

amit-webkul · Jan 10, 2025 · 578ce5a · 578ce5a
2 parents 79e818f + dc2d405
commit 578ce5a
Show file tree

Hide file tree

Showing 27 changed files with 336 additions and 334 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/packages/Webkul/Admin/src/DataGrids/Settings/UserDataGrid.php b/packages/Webkul/Admin/src/DataGrids/Settings/UserDataGrid.php
@@ -17,21 +17,19 @@ public function prepareQueryBuilder(): Builder
         $queryBuilder = DB::table('users')
             ->distinct()
             ->addSelect(
-                'users.id',
-                'users.name',
-                'users.email',
-                'users.image',
-                'users.status',
-                'users.created_at'
+                'id',
+                'name',
+                'email',
+                'image',
+                'status',
+                'created_at'
             )
-            ->leftJoin('user_groups', 'users.id', '=', 'user_groups.user_id');
+            ->leftJoin('user_groups', 'id', '=', 'user_groups.user_id');
 
         if ($userIds = bouncer()->getAuthorizedUserIds()) {
-            $queryBuilder->whereIn('users.user_id', $userIds);
+            $queryBuilder->whereIn('id', $userIds);
         }
 
-        $this->addFilter('id', 'users.id');
-
         return $queryBuilder;
     }
 

diff --git a/packages/Webkul/Admin/src/Http/Controllers/Settings/GroupController.php b/packages/Webkul/Admin/src/Http/Controllers/Settings/GroupController.php
@@ -37,7 +37,8 @@ public function index(): View|JsonResponse
     public function store(): JsonResponse
     {
         $this->validate(request(), [
-            'name' => 'required|unique:groups,name',
+            'name'        => 'required|unique:groups,name|max:50',
+            'description' => 'required|max:250',
         ]);
 
         Event::dispatch('settings.group.create.before');
@@ -73,7 +74,8 @@ public function edit(int $id): JsonResource
     public function update(int $id): JsonResponse
     {
         $this->validate(request(), [
-            'name' => 'required|unique:groups,name,'.$id,
+            'name'        => 'required|max:50|unique:groups,name,'.$id,
+            'description' => 'required|max:250',
         ]);
 
         Event::dispatch('settings.group.update.before', $id);

diff --git a/packages/Webkul/Admin/src/Http/Controllers/Settings/RoleController.php b/packages/Webkul/Admin/src/Http/Controllers/Settings/RoleController.php
@@ -48,6 +48,7 @@ public function store(): RedirectResponse
             'name'            => 'required',
             'permission_type' => 'required',
             'description'     => 'required',
+            'permissions'     => 'required',
         ]);
 
         Event::dispatch('settings.role.create.before');
@@ -93,6 +94,7 @@ public function update(int $id): RedirectResponse
             'name'            => 'required',
             'permission_type' => 'required|in:all,custom',
             'description'     => 'required',
+            'permissions'     => 'required',
         ]);
 
         Event::dispatch('settings.role.update.before', $id);

diff --git a/packages/Webkul/Admin/src/Resources/lang/ar/app.php b/packages/Webkul/Admin/src/Resources/lang/ar/app.php
@@ -438,23 +438,25 @@
             ],
 
             'pdf' => [
-                'title'            => 'عرض السعر',
-                'grand-total'      => 'المجموع الكلي',
                 'adjustment'       => 'التعديل',
-                'discount'         => 'الخصم',
-                'tax'              => 'الضريبة',
-                'sub-total'        => 'المجموع الفرعي',
                 'amount'           => 'المبلغ',
-                'quantity'         => 'الكمية',
-                'price'            => 'السعر',
-                'product-name'     => 'اسم المنتج',
-                'sku'              => 'رمز المنتج',
-                'shipping-address' => 'عنوان الشحن',
                 'billing-address'  => 'عنوان الفوترة',
-                'expired-at'       => 'تاريخ الانتهاء',
-                'sales-person'     => 'مندوب المبيعات',
                 'date'             => 'التاريخ',
+                'discount'         => 'الخصم',
+                'expired-at'       => 'تاريخ الانتهاء',
+                'grand-total'      => 'المجموع الكلي',
+                'person'           => 'Person',
+                'price'            => 'السعر',
+                'product-name'     => 'اسم المنتج',
+                'quantity'         => 'الكمية',
                 'quote-id'         => 'رقم عرض السعر',
+                'sales-person'     => 'مندوب المبيعات',
+                'shipping-address' => 'عنوان الشحن',
+                'sku'              => 'رمز المنتج',
+                'sub-total'        => 'المجموع الفرعي',
+                'subject'          => 'Subject',
+                'tax'              => 'الضريبة',
+                'title'            => 'عرض السعر',
             ],
         ],
 

diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -442,23 +442,25 @@
             ],
 
             'pdf' => [
-                'title'            => 'Quote',
-                'grand-total'      => 'Grand Total',
                 'adjustment'       => 'Adjustment',
-                'discount'         => 'Discount',
-                'tax'              => 'Tax',
-                'sub-total'        => 'Sub Total',
                 'amount'           => 'Amount',
-                'quantity'         => 'Quantity',
-                'price'            => 'Price',
-                'product-name'     => 'Product Name',
-                'sku'              => 'SKU',
-                'shipping-address' => 'Shipping Address',
                 'billing-address'  => 'Billing Address',
-                'expired-at'       => 'Expired At',
-                'sales-person'     => 'Sales Person',
                 'date'             => 'Date',
+                'discount'         => 'Discount',
+                'expired-at'       => 'Expired At',
+                'grand-total'      => 'Grand Total',
+                'person'           => 'Person',
+                'price'            => 'Price',
+                'product-name'     => 'Product Name',
+                'quantity'         => 'Quantity',
                 'quote-id'         => 'Quote ID',
+                'sales-person'     => 'Sales Person',
+                'shipping-address' => 'Shipping Address',
+                'sku'              => 'SKU',
+                'sub-total'        => 'Sub Total',
+                'subject'          => 'Subject',
+                'tax'              => 'Tax',
+                'title'            => 'Quote',
             ],
         ],