@ozdao/martyrs 0.2.477 → 0.2.479

package/src/modules/orders/models/customer.model.js

@@ -1,67 +1,73 @@
-const applyOwnershipSchema = require('@martyrs/src/modules/globals/models/schemas/ownership.schema.js');
-const applyProfileSchema = require('@martyrs/src/modules/globals/models/schemas/profile.schema.js');
-const applyCredentialsSchema = require('@martyrs/src/modules/globals/models/schemas/credentials.schema.js');
-
-module.exports = (db) => {
-
-  const CustomerSchema = new db.mongoose.Schema({
-    identity: {
-      type: {
-        type: String,
-        enum: ['Visitor','User','Organization'],
-        required: true
+import applyCredentialsSchema from '@martyrs/src/modules/globals/models/schemas/credentials.schema.js';
+import applyOwnershipSchema from '@martyrs/src/modules/globals/models/schemas/ownership.schema.js';
+import applyProfileSchema from '@martyrs/src/modules/globals/models/schemas/profile.schema.js';
+export default db => {
+  const CustomerSchema = new db.mongoose.Schema(
+    {
+      identity: {
+        type: {
+          type: String,
+          enum: ['Visitor', 'User', 'Organization'],
+          required: true,
+          // set: toPascalCase
+        },
+        target: {
+          type: db.mongoose.Schema.Types.ObjectId,
+          refPath: 'target.type',
+        },
       },
-      target: {
-        type: db.mongoose.Schema.Types.ObjectId,
-        refPath: 'target.type',
+      referral: {
+        code: {
+          type: String,
+        },
       },
     },
-    referral:  {
-      code: {
-        type: String
+    {
+      timestamps: {
+        currentTime: () => Date.now(),
       },
     }
-  }, {
-    timestamps: {
-      currentTime: () => Date.now()
-    }
-  });
-
+  );
   applyCredentialsSchema(CustomerSchema, db);
   applyProfileSchema(CustomerSchema, db);
   applyOwnershipSchema(CustomerSchema, db);
-
-  CustomerSchema.index({
-    owner: 1,
-    email: 1
-  }, {
-    unique: true,
-    partialFilterExpression: {
-      email: { $exists: true, $ne: "" }  
+  CustomerSchema.index(
+    {
+      owner: 1,
+      email: 1,
+    },
+    {
+      unique: true,
+      partialFilterExpression: {
+        email: { $exists: true, $ne: '' },
+      },
     }
-  });
-
-  CustomerSchema.index({
-    owner: 1,
-    phone: 1
-  }, {
-    unique: true,
-    partialFilterExpression: {
-      phone: { $exists: true, $ne: "" } 
+  );
+  CustomerSchema.index(
+    {
+      owner: 1,
+      phone: 1,
+    },
+    {
+      unique: true,
+      partialFilterExpression: {
+        phone: { $exists: true, $ne: '' },
+      },
     }
-  });
-
-  CustomerSchema.index({
-    owner: 1,
-    identity: 1
-  }, {
-    unique: true,
-    partialFilterExpression: {
-      identity: { $exists: true, $ne: "" }  
+  );
+  CustomerSchema.index(
+    {
+      owner: 1,
+      identity: 1,
+    },
+    {
+      unique: true,
+      partialFilterExpression: {
+        identity: { $exists: true, $ne: '' },
+      },
     }
-  });
-
-  const Customer = db.mongoose.model("Customer", CustomerSchema);
-
+  );
+  const Customer = db.mongoose.model('Customer', CustomerSchema);
   return Customer;
-}
+};
+

package/src/modules/orders/models/order.model.js

@@ -1,94 +1,93 @@
-const applyOwnershipSchema = require('@martyrs/src/modules/globals/models/schemas/ownership.schema.js');
-
-module.exports = (db) => {
-    
-  const OrderSchema = new db.mongoose.Schema({
-    customer: {
-      type: {
-        type: String,
-        required: true
+import applyOwnershipSchema from '@martyrs/src/modules/globals/models/schemas/ownership.schema.js';
+export default db => {
+  const OrderSchema = new db.mongoose.Schema(
+    {
+      customer: {
+        type: {
+          type: String,
+          required: true,
+        },
+        target: {
+          type: db.mongoose.Schema.Types.ObjectId,
+          refPath: 'customer.type',
+          required: true,
+        },
       },
-      target: {
-        type: db.mongoose.Schema.Types.ObjectId,
-        refPath: 'customer.type',
-        required: true
+      positions: {
+        type: Array,
       },
-    },
-    positions: { 
-      type: Array 
-    },
-    referralCode: { 
-      type: String 
-    },
-    status: { 
-      type: String 
-    },
-    deadline: {
-      type: Date,
-      default: () => new Date(Date.now() + 30 * 60000) // Добавляет 30 минут к текущему времени
-    },
-    status_history: [{
-      status: { 
-        type: String, 
-        trim: true 
+      referralCode: {
+        type: String,
       },
-      user: {
-        type: db.mongoose.Schema.Types.ObjectId,
-        ref: 'User',
+      status: {
+        type: String,
       },
-      timestamp: { 
-        type: Date, 
-        default: Date.now 
+      deadline: {
+        type: Date,
+        default: () => new Date(Date.now() + 30 * 60000), // Добавляет 30 минут к текущему времени
       },
+      status_history: [
+        {
+          status: {
+            type: String,
+            trim: true,
+          },
+          user: {
+            type: db.mongoose.Schema.Types.ObjectId,
+            ref: 'User',
+          },
+          timestamp: {
+            type: Date,
+            default: Date.now,
+          },
+          comment: {
+            type: String,
+            trim: true,
+          },
+        },
+      ],
       comment: {
         type: String,
-        trim: true
-      }
-    }],
-    comment: { 
-      type: String, 
-      trim: true 
-    },
-    payment: {
-      type: { 
-        type: String, 
-        trim: true, 
-        default: 'cash'
+        trim: true,
       },
-      status: { 
-        type: String, 
-        trim: true, 
-        default: 'unpaid'
-      }
-    },
-    delivery: {
-      type: { 
-        type: String,
-         trim: true 
-       },
-      address: { 
-        type: String, 
-        trim: true 
+      payment: {
+        type: {
+          type: String,
+          trim: true,
+          default: 'cash',
+        },
+        status: {
+          type: String,
+          trim: true,
+          default: 'unpaid',
+        },
       },
-      spot: { 
-        type: db.mongoose.Schema.Types.ObjectId,
-        ref: 'User',
+      delivery: {
+        type: {
+          type: String,
+          trim: true,
+        },
+        address: {
+          type: String,
+          trim: true,
+        },
+        spot: {
+          type: db.mongoose.Schema.Types.ObjectId,
+          ref: 'User',
+        },
+        status: {
+          type: String,
+          trim: true,
+        },
+      },
+    },
+    {
+      timestamps: {
+        currentTime: () => Date.now(),
       },
-      status: { 
-        type: String,
-        trim: true 
-      }
-    }
-  }, {
-    timestamps: { 
-      currentTime: () => Date.now() 
     }
-  });
-
-  applyOwnershipSchema(OrderSchema,db);
-
-  const Order = db.mongoose.model("Order", OrderSchema);
-
+  );
+  applyOwnershipSchema(OrderSchema, db);
+  const Order = db.mongoose.model('Order', OrderSchema);
   return Order;
 };
-

package/src/modules/orders/models/testimonial.model.js

@@ -1,24 +1,22 @@
-module.exports = (db) => {
+export default db => {
   const testimonialSchema = new db.mongoose.Schema({
-    source: { 
-      type: String 
+    source: {
+      type: String,
     },
-    author: { 
+    author: {
       type: db.mongoose.Schema.Types.ObjectId,
       ref: 'User',
       required: true,
     },
     rating: {
       type: String,
-      required: true
+      required: true,
     },
     description: {
       type: String,
-      required: true
+      required: true,
     },
   });
-
   const Testimonial = db.mongoose.model('Testimonial', testimonialSchema);
-
   return Testimonial;
-}
+};

package/src/modules/orders/orders.client.js

@@ -1,26 +1,26 @@
 // Store
 import * as storeOrders from './store/orders.js';
 import * as storeShopcart from './store/shopcart.js';
-import * as storeTestimonials from './store/testimonials';  
+import * as storeTestimonials from './store/testimonials.js';
 // Router
 import addRoutes from '@martyrs/src/modules/globals/views/router/addRoutes.js';
 import routerOrders from './router/orders.router.js';
 // Views
-import Orders from './components/pages/Orders.vue';
 import OrderCreate from './components/pages/OrderCreate.vue';
 import OrderCreateBackoffice from './components/pages/OrderCreateBackoffice.vue';
+import Orders from './components/pages/Orders.vue';
 // import Favorites from './components/pages/Favorites.vue';
 // Importing blocks components
-import CardOrderItem from './components/blocks/CardOrderItem.vue';
 import CardOrder from './components/blocks/CardOrder.vue';
+import CardOrderItem from './components/blocks/CardOrderItem.vue';
 import CardOrderUser from './components/blocks/CardOrderUser.vue';
 import StatusHistory from './components/blocks/StatusHistory.vue';
 // Importing sections components
+import AskToLogin from './components/sections/AskToLogin.vue';
+import EmptyState from './components/sections/EmptyState.vue';
 import FormCustomerDetails from './components/sections/FormCustomerDetails.vue';
-import FormPayment from './components/sections/FormPayment.vue';
 import FormDelivery from './components/sections/FormDelivery.vue';
-import EmptyState from './components/sections/EmptyState.vue';
-import AskToLogin from './components/sections/AskToLogin.vue';
+import FormPayment from './components/sections/FormPayment.vue';
 import Succes from './components/sections/Succes.vue';
 // Importing partials components
 import ShopCart from './components/partials/ShopCart.vue';
@@ -38,11 +38,11 @@ function initializeOrders(app, store, router, options = {}) {
     routes: routerOrders,
     routeNamePrefix: '',
     filterConfig: {
-      include: ['CreateOrder','Order'] // Только создание заказа на корневом уровне
+      include: ['CreateOrder', 'Order'], // Только создание заказа на корневом уровне
     },
     meta: {
-      context: 'root'
-    }
+      context: 'root',
+    },
   });
 
   // Backoffice routes
@@ -53,11 +53,11 @@ function initializeOrders(app, store, router, options = {}) {
       routes: routerOrders,
       routeNamePrefix: 'Backoffice',
       filterConfig: {
-        include: ['OrdersList', 'AdminCreateOrder', 'Order', 'OrderEdit'] // Специфичные для бэкофиса маршруты
+        include: ['OrdersList', 'AdminCreateOrder', 'Order', 'OrderEdit'], // Специфичные для бэкофиса маршруты
       },
       meta: {
-        context: 'backoffice'
-      }
+        context: 'backoffice',
+      },
     });
   }
 
@@ -69,11 +69,11 @@ function initializeOrders(app, store, router, options = {}) {
       routes: routerOrders,
       routeNamePrefix: 'User',
       filterConfig: {
-        include: ['OrdersList', 'Order'] // Специфичные для пользователя маршруты
+        include: ['OrdersList', 'Order'], // Специфичные для пользователя маршруты
       },
       meta: {
-        context: 'user'
-      }
+        context: 'user',
+      },
     });
   }
 
@@ -85,19 +85,17 @@ function initializeOrders(app, store, router, options = {}) {
       routes: routerOrders,
       routeNamePrefix: 'Organization',
       filterConfig: {
-        include: ['OrdersList', 'Order', 'AdminCreateOrder', 'OrderEdit'] // Специфичные для организации маршруты
+        include: ['OrdersList', 'Order', 'AdminCreateOrder', 'OrderEdit'], // Специфичные для организации маршруты
       },
       meta: {
-        context: 'organization'
-      }
+        context: 'organization',
+      },
     });
   }
 
   store.addStore('orders', storeOrders);
   store.addStore('shopcart', storeShopcart);
   store.addStore('testimonials', storeTestimonials);
-
-
 }
 
 const ModuleOrder = {
@@ -106,10 +104,10 @@ const ModuleOrder = {
     store: {
       storeOrders,
       storeShopcart,
-      storeTestimonials
+      storeTestimonials,
     },
     router: {
-      routerOrders
+      routerOrders,
     },
     components: {
       // Pages
@@ -132,8 +130,8 @@ const ModuleOrder = {
       FormPayment,
       // Partials
       ShopCart,
-    }
-  }
-}
+    },
+  },
+};
 
-export default ModuleOrder
+export default ModuleOrder;

package/src/modules/orders/orders.server.js

@@ -1,43 +1,38 @@
-const ModelOrder = require('./models/order.model.js');
-const ModelCustomer = require('./models/customer.model.js');
-const ModelTestimonial = require('./models/testimonial.model.js');
-const ModelApplication = require('./models/application.model.js');
-
-const RoutesOrder = require('./routes/orders.routes.js');
-const RoutesApplications = require('./routes/applications.routes.js');
-// require('@martyrs/src/modules/orders/routes/testimonials.routes')(app);
-
-const FactoryOrder = require('./controllers/orders.controller.js');
-
-const CRUD = require('@martyrs/src/modules/globals/controllers/classes/globals.crud');
-
+import CRUD from '@martyrs/src/modules/globals/controllers/classes/globals.crud.js';
+import FactoryOrder from './controllers/orders.controller.js';
+import ModelApplication from './models/application.model.js';
+import ModelCustomer from './models/customer.model.js';
+import ModelOrder from './models/order.model.js';
+import ModelTestimonial from './models/testimonial.model.js';
+import RoutesApplications from './routes/applications.routes.js';
+import RoutesOrder from './routes/orders.routes.js';
 function initializeOrders(app, db, origins, publicPath) {
   // Setup models in the database object
   db.order = ModelOrder(db);
   db.customer = ModelCustomer(db);
   db.testimonial = ModelTestimonial(db);
   db.application = ModelApplication(db);
-
   // Setup routes if the app object is provided
   if (app) {
-    RoutesOrder(app,db,origins,publicPath)
-    RoutesApplications(app,db,origins,publicPath)
-    
-    new CRUD('/api/customers', app, db, db.customer)
+    RoutesOrder(app, db, origins, publicPath);
+    RoutesApplications(app, db, origins, publicPath);
+    new CRUD('/api/customers', app, db, db.customer);
   }
-
 }
-// Exporting controllers, routes, and models
-module.exports = {
+export const models = {
+  ModelOrder,
+  ModelCustomer,
+};
+export const routes = {
+  RoutesOrder,
+};
+export const controllers = {
+  FactoryOrder,
+};
+export { initializeOrders as initialize };
+export default {
   initialize: initializeOrders,
-  models: {
-    ModelOrder,
-    ModelCustomer,
-  },
-  routes: {
-    RoutesOrder,
-  },
-  controllers: {
-    FactoryOrder
-  }
-};
+  models,
+  routes,
+  controllers,
+};

package/src/modules/orders/router/orders.router.js

@@ -1,8 +1,7 @@
-import layoutEmpty from '@martyrs/src/modules/globals/views/components/layouts/Empty.vue';
-import Orders from '@martyrs/src/modules/orders/components/pages/Orders.vue';
+import OrderBackoffice from '@martyrs/src/modules/orders/components/pages/OrderBackoffice.vue';
 import OrderCreate from '@martyrs/src/modules/orders/components/pages/OrderCreate.vue';
 import OrderCreateBackoffice from '@martyrs/src/modules/orders/components/pages/OrderCreateBackoffice.vue';
-import OrderBackoffice from '@martyrs/src/modules/orders/components/pages/OrderBackoffice.vue';
+import Orders from '@martyrs/src/modules/orders/components/pages/Orders.vue';
 
 const ordersRoutes = [
   {
@@ -12,9 +11,9 @@ const ordersRoutes = [
     meta: {
       title: {
         en: 'Orders',
-        ru: 'Заказы'
-      }
-    }
+        ru: 'Заказы',
+      },
+    },
   },
   {
     path: 'form',
@@ -23,9 +22,9 @@ const ordersRoutes = [
     meta: {
       title: {
         en: 'Create Order',
-        ru: 'Создать Заказ'
-      }
-    }
+        ru: 'Создать Заказ',
+      },
+    },
   },
   {
     path: 'add',
@@ -34,23 +33,23 @@ const ordersRoutes = [
     meta: {
       title: {
         en: 'Add Order',
-        ru: 'Добавить Заказ'
-      }
-    }
+        ru: 'Добавить Заказ',
+      },
+    },
   },
   {
     path: ':order',
     name: 'Order',
     component: OrderBackoffice,
-    props: (route) => ({
-      mode: route.matched[0].meta.context === 'backoffice' ? 'edit' : 'view'
+    props: route => ({
+      mode: route.matched[0].meta.context === 'backoffice' ? 'edit' : 'view',
     }),
     meta: {
       title: {
         en: 'Order',
-        ru: 'Заказ'
-      }
-    }
+        ru: 'Заказ',
+      },
+    },
   },
   {
     path: ':order/edit',
@@ -60,10 +59,10 @@ const ordersRoutes = [
     meta: {
       title: {
         en: 'Edit Order',
-        ru: 'Редактировать Заказ'
-      }
-    }
-  }
+        ru: 'Редактировать Заказ',
+      },
+    },
+  },
 ];
 
-export default ordersRoutes;
+export default ordersRoutes;

package/src/modules/orders/routes/applications.routes.js

@@ -1,42 +1,12 @@
-// Factories
-const controllerFactory = require("../controllers/applications.controller");
-// Middlewares
-const middlewareFactoryAuth = require('@martyrs/src/modules/auth/controllers/middlewares');
-
-module.exports = function(app, db, origins) {
+import middlewareFactoryAuth from '@martyrs/src/modules/auth/controllers/middlewares/index.js';
+import controllerFactory from '../controllers/applications.controller.js';
+export default (function (app, db, origins) {
   const controller = controllerFactory(db);
-
   const { authJwt } = middlewareFactoryAuth(db);
-
-  app.post(
-    "/applications",
-    controller.create
-  );
-
-  app.get(
-    "/applications",
-    controller.read
-  );
-
-  app.post(
-    "/applications/:_id",
-    controller.update
-  );
-  
-  app.delete(
-    "/applications/:_id",
-    controller.delete
-  );
-  
-  app.get(
-    "/applications/:_id",
-    controller.get
-  );
-
-  app.post(
-    "/applications/telegram-webhook", 
-    controller.handleTelegramWebhook
-  );
-
-};
-
+  app.post('/applications', controller.create);
+  app.get('/applications', controller.read);
+  app.post('/applications/:_id', controller.update);
+  app.delete('/applications/:_id', controller.delete);
+  app.get('/applications/:_id', controller.get);
+  app.post('/applications/telegram-webhook', controller.handleTelegramWebhook);
+});