pass isNewUser

Author: Xziy

libs/AwaitEmitter.d.ts

@@ -52,7 +52,9 @@ declare global {
         "core:order-after-check-delivery": [OrderRecord];
         "core:count-before-delivery-cost": [OrderRecord];
         "core:order-after-promotion": [OrderRecord];
-        "core:order-after-done": [OrderRecord, UserRecord];
+        "core:order-after-done": [OrderRecord, UserRecord, {
+            isNewUser: boolean;
+        }];
         "core:count-before-promotion": [OrderRecord];
         "core:orderproduct-change-amount": [OrderDishRecord];
         "core:order-return-full-order-destroy-orderdish": [DishRecord, OrderRecord];

libs/AwaitEmitter.ts

@@ -64,7 +64,7 @@ declare global {
     "core:order-after-check-delivery": [OrderRecord]
     "core:count-before-delivery-cost": [OrderRecord]
     "core:order-after-promotion": [OrderRecord]
-    "core:order-after-done": [OrderRecord, UserRecord]
+    "core:order-after-done": [OrderRecord, UserRecord, {isNewUser: boolean}]
     "core:count-before-promotion": [OrderRecord]
     "core:orderproduct-change-amount": [OrderDishRecord]
     "core:order-return-full-order-destroy-orderdish": [DishRecord, OrderRecord]

models/Order.js

@@ -1431,20 +1431,25 @@ let Model = {
     async doFinalize(criteriaOne, state) {
         let order = await Order.findOne(criteriaOne);
         let user = null;
+        let isNewUser = false;
         if (state === "DONE" && !order.user) {
             let loginFiled = await Settings.get("CORE_LOGIN_FIELD") || "phone";
             const phone = order.customer.phone.code + order.customer.phone.number + order.customer.phone.additionalNumber;
             const login = loginFiled === "phone" ? phone.replace(/\D/g, "") : `${phone}@localhost`;
-            user = await User.findOrCreate(criteriaOne, {
-                firstName: order.customer.name,
-                phone: order.customer.phone,
-                login,
-                verified: true
-            });
+            user = await User.findOne(criteriaOne);
+            if (!user) {
+                user = await User.create({
+                    firstName: order.customer.name,
+                    phone: order.customer.phone,
+                    login,
+                    verified: true
+                }).fetch();
+                isNewUser = true;
+            }
             await Order.update({ id: order.id }, { user: user.id }).fetch();
         }
         await Order.next(criteriaOne, state);
-        emitter.emit("core:order-after-done", order, user);
+        emitter.emit("core:order-after-done", order, user, { isNewUser });
     },
     async doCart(criteriaOne) {
         let order = await Order.findOne(criteriaOne);