ali %!s(int64=3) %!d(string=hai) anos
pai
achega
42c80a848c

+ 1 - 1
package.json

@@ -42,7 +42,7 @@
     "firebase": "^9.23.0",
     "fs": "^0.0.1-security",
     "fslightbox-vue": "^2.0.2",
-    "js-abstract-model": "^0.1.34",
+    "js-abstract-model": "^0.1.35",
     "leaflet": "^1.9.3",
     "moment": "^2.29.4",
     "moment-jalaali": "^0.9.6",

+ 6 - 6
src/components/Widgets/Invoice/AdminInvoiceList/AdminInvoiceList.vue

@@ -57,21 +57,21 @@ export default {
       },
       inputs: [
         {
-          type: 'date',
-          name: 'creation_time',
+          type: 'dateTime',
+          name: 'creation_time__gte',
           label: 'از تاریخ',
           placeholder: ' ',
           col: 'col-md-3 col-12'
         },
         {
-          type: 'date',
-          name: 'creation_time',
+          type: 'dateTime',
+          name: 'creation_time__lt',
           label: 'تا تاریخ',
           placeholder: ' ',
           col: 'col-md-3 col-12'
         },
-        { type: 'select', name: 'category', options: [], label: 'وضعیت تراکنش', placeholder: ' ', col: 'col-md-2 col-12' },
-        { type: 'input', name: 'category', label: 'نوع صورتحساب', placeholder: ' ', col: 'col-md-2 col-12' },
+        { type: 'select', name: 'status', options: (new Invoice()).statusEnums, label: 'وضعیت', placeholder: ' ', col: 'col-md-2 col-12' },
+        { type: 'select', name: 'type', options: (new Invoice()).typeEnums, label: 'نوع', placeholder: ' ', col: 'col-md-2 col-12' },
         { type: BtnControlComp, name: 'btn', responseKey: 'btn', label: 'جستجو', placeholder: ' ', atClick: () => {}, col: 'col-md-2 col-12' }
       ],
       table: {

+ 7 - 1
src/models/Invoice.js

@@ -39,6 +39,7 @@ class Invoice extends Model {
     ], {
       status: {
         infoKey: 'status_info',
+        enumListKey: 'statusEnums',
         enums: [
           {
             label: 'در حال تأیید',
@@ -76,10 +77,15 @@ class Invoice extends Model {
       },
       type: {
         infoKey: 'type_info',
+        enumListKey: 'typeEnums',
         enums: [
           {
-            label: 'دوره آموزشی',
+            label: 'بخش آموزش',
             value: 'CLASSROOM'
+          },
+          {
+            label: 'بخش فروشگاه',
+            value: 'STORE'
           }
         ]
       }

+ 4 - 4
yarn.lock

@@ -4454,10 +4454,10 @@ jest-worker@^26.2.1:
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
-js-abstract-model@^0.1.34:
-  version "0.1.34"
-  resolved "https://registry.yarnpkg.com/js-abstract-model/-/js-abstract-model-0.1.34.tgz#05493625f2a35716bbc1ed2bb76ccdde1c7a1564"
-  integrity sha512-P3yD4qDu4VG4SxEM+aW6OBCQkRY1YiojOnyrJQCPflia2SzvUOpsa9FMDWK0lTll3msMad7X0h6tsxrX/EOvrw==
+js-abstract-model@^0.1.35:
+  version "0.1.35"
+  resolved "https://registry.yarnpkg.com/js-abstract-model/-/js-abstract-model-0.1.35.tgz#ef618d5f27a0ca68a775ad6655ac34399401ab68"
+  integrity sha512-XiOuYqK8AfHFJjBIvdphEO/bRfqdniUN5xOqqJOFDj6091YSIzW4R2sL3ysLAAwHlZYOFKL+XqdDsvNDa2pwQQ==
   dependencies:
     axios "^1.4.0"
     moment "^2.29.4"