Bläddra i källkod

Merge branch 'master' of http://git.hghweb.ir/ali.s/palizvani-front-vite

ali 2 år sedan
förälder
incheckning
ee4f01fc13

+ 1 - 1
src/components/FormBuilderCustumComponents/ProductSelector.vue

@@ -84,7 +84,7 @@ export default {
           {
             name: 'content_category',
             required: true,
-            label: 'دسته',
+            label: 'دسته فروشگاه',
             align: 'left',
             field: row => row.store_category_info?.parent?.parent?.title + '، ' + row.store_category_info?.parent?.title + '، ' + row.store_category_info?.title
           },

+ 0 - 25
src/components/Template/SideBar/AdminPanelSideBar.vue

@@ -83,31 +83,6 @@ export default {
             }
           ]
         },
-        {
-          title: 'حلقه های مباحثاتی',
-          roles: ['superuser', 'educational_department_head'],
-          icon: 'diversity_2',
-          routeName: null,
-          show: true,
-          open: true,
-          active: false,
-          children: [
-            {
-              title: 'درس ها و چارت آموزشی',
-              roles: ['superuser', 'educational_department_head'],
-              routeName: 'Admin.Category.DiscussionCircles.Index',
-              show: true,
-              active: false
-            },
-            {
-              title: 'حلقه های مباحثاتی',
-              roles: ['superuser', 'educational_department_head'],
-              routeName: 'Admin.Classroom.DiscussionCircles.Index',
-              show: true,
-              active: false
-            }
-          ]
-        },
         {
           title: 'درخواست های آموزش',
           roles: ['superuser', 'educational_department_head'],

+ 4 - 11
src/components/Widgets/Store/StorePackage/AdminStorePackageList/AdminStorePackageList.vue

@@ -87,7 +87,7 @@ export default {
   mixins: [mixinWidget],
   data () {
     return {
-      tab: 'packages',
+      tab: 'products',
       api: APIGateway.package.APIAdresses.base,
       tableKeys: {
         data: 'results',
@@ -128,11 +128,11 @@ export default {
             field: row => (new Package(row)).is_physical_info.label
           },
           {
-            name: 'category_info',
+            name: 'store_category',
             required: true,
-            label: 'بخش',
+            label: 'دسته فروشگاه',
             align: 'left',
-            field: row => row.content_category
+            field: row => row.store_category_info?.parent?.parent?.title + '، ' + row.store_category_info?.parent?.title + '، ' + row.store_category_info?.title
           },
           {
             name: 'category_info',
@@ -141,13 +141,6 @@ export default {
             align: 'left',
             field: row => parseInt(row.unit_price.toString()).toLocaleString('fa')
           },
-          {
-            name: 'category_info',
-            required: true,
-            label: 'نمایش',
-            align: 'left',
-            field: '-'
-          },
           {
             name: 'action',
             required: true,

+ 3 - 10
src/components/Widgets/Store/StoreProduct/AdminStoreProductList/AdminStoreProductList.vue

@@ -97,11 +97,11 @@ export default {
             field: row => (new Product(row)).is_physical_info.label
           },
           {
-            name: 'content_category',
+            name: 'store_category',
             required: true,
-            label: 'بخش',
+            label: 'دسته فروشگاه',
             align: 'left',
-            field: row => row.content_category
+            field: row => row.store_category_info?.parent?.parent?.title + '، ' + row.store_category_info?.parent?.title + '، ' + row.store_category_info?.title
           },
           {
             name: 'unit_price',
@@ -110,13 +110,6 @@ export default {
             align: 'left',
             field: row => parseInt(row.unit_price.toString()).toLocaleString('fa')
           },
-          {
-            name: 'is_visible',
-            required: true,
-            label: 'نمایش',
-            align: 'left',
-            field: '-'
-          },
           {
             name: 'action',
             required: true,