diff --git a/src/modules/orders/repositories/order.repository.ts b/src/modules/orders/repositories/order.repository.ts index 965b336..161c8c2 100644 --- a/src/modules/orders/repositories/order.repository.ts +++ b/src/modules/orders/repositories/order.repository.ts @@ -118,7 +118,7 @@ export class OrderRepository extends EntityRepository { limit, offset, orderBy: { [orderBy]: order.toLowerCase() as 'asc' | 'desc' }, - populate: ['user', 'shop', 'deliveryMethod', 'paymentMethod', 'items', 'items.variant'] as never, + populate: ['user', 'shop', 'deliveryMethod', 'paymentMethod', 'items', 'items.variant','items.variant.product'] as never, }); // Collect all (orderId, variantId) pairs for efficient review lookup diff --git a/src/seeders/data/admins.data.ts b/src/seeders/data/admins.data.ts index cc52216..76cf69d 100644 --- a/src/seeders/data/admins.data.ts +++ b/src/seeders/data/admins.data.ts @@ -11,28 +11,14 @@ export const adminsData: AdminData[] = [ phone: '09362532122', firstName: 'مرتضی', lastName: 'مرتضایی', - roleName: 'مدیر ( پلن ویژه)', + roleName: 'مدیر', shopSlug: 'boote', }, { phone: '09185290775', firstName: 'حمید', lastName: 'ضرقامی', - roleName: 'مدیر ( پلن ویژه)', - shopSlug: 'boote', - }, - { - phone: '09129283395', - firstName: 'مهرداد', - lastName: 'مظفری', - roleName: 'مدیر ( پلن ویژه)', - shopSlug: 'boote', - }, - { - phone: '09184317567', - firstName: 'ادمین', - lastName: 'هنر', - roleName: 'مدیر ( پلن ویژه)', + roleName: 'مدیر', shopSlug: 'boote', }, ]; diff --git a/src/seeders/data/roles.data.ts b/src/seeders/data/roles.data.ts index 42a0dd6..07dc0e6 100644 --- a/src/seeders/data/roles.data.ts +++ b/src/seeders/data/roles.data.ts @@ -8,30 +8,8 @@ export interface RoleConfig { export const rolesData: RoleConfig[] = [ { - name: 'مدیر (پلن پایه)', - isSystem: false, - permissionFilter: (name: Permission) => - name === Permission.MANAGE_FOODS || - name === Permission.MANAGE_CATEGORIES || - name === Permission.MANAGE_SCHEDULES || - name === Permission.MANAGE_PAGER || - name === Permission.MANAGE_CONTACTS || - name === Permission.MANAGE_ROLES || - - name === Permission.MANAGE_SETTINGS || - name === Permission.MANAGE_ADMINS || - name == Permission.VIEW_REPORTS || - name == Permission.UPDATE_RESTAURANT - }, - { - name: 'مدیر ( پلن ویژه)', + name: 'مدیر', isSystem: false, permissionFilter: () => true, // All permissions for shop role }, - { - name: 'حسابدار ', - isSystem: false, - permissionFilter: (name: Permission) => - name === Permission.VIEW_REPORTS || name === Permission.MANAGE_PAYMENTS || name === Permission.MANAGE_ORDERS, - }, ]; diff --git a/src/seeders/data/shops.data.ts b/src/seeders/data/shops.data.ts index d87fa89..f3ccf94 100644 --- a/src/seeders/data/shops.data.ts +++ b/src/seeders/data/shops.data.ts @@ -23,7 +23,7 @@ export const shopsData: ShopData[] =[ { name: 'ژیوان', slug: 'zhivan', - domain: 'https://dmenu-plus-front.dev.danakcorp.com/zhivan', + domain: 'https://dkala-front.dev.danakcorp.com/zhivan', isActive: true, phone: '', logo: 'https://dmenu.danakcorp.com/uploads/images/store/store_1638870352717_61a3661f37a0d33354a6d210.png', @@ -42,7 +42,7 @@ export const shopsData: ShopData[] =[ { name: 'بوته', slug: 'boote', - domain: 'https://dmenu-plus-front.dev.danakcorp.com/boote', + domain: 'https://dkala-front.dev.danakcorp.com/boote', isActive: true, phone: '', logo: 'https://dmenu.danakcorp.com/uploads/images/store/store_1641199914860_61d2b72b2e8bd97126a70b5f.png',