@social-mail/social-mail-web-server 1.5.330 → 1.5.331

package/dist/wwwroot/routes/store/buy/[productID]/get.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/store/buy/[productID]/get.tsx"],"names":[],"mappings":"AAGA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAE5D,OAAO,iBAAiB,MAAM,kDAAkD,CAAC;AACjF,OAAO,cAAc,MAAM,wDAAwD,CAAC;AACpF,OAAO,kBAAkB,MAAM,4DAA4D,CAAC;AAI5F,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,SAAS,MAAC;IAGV,EAAE,EAAE,iBAAiB,CAAC;IAGtB,kBAAkB,EAAE,kBAAkB,CAAC;IAGvC,cAAc,EAAE,cAAc,CAAC;IAEzB,GAAG;CA4DZ"}
+{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/store/buy/[productID]/get.tsx"],"names":[],"mappings":"AAGA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAE5D,OAAO,iBAAiB,MAAM,kDAAkD,CAAC;AACjF,OAAO,cAAc,MAAM,wDAAwD,CAAC;AACpF,OAAO,kBAAkB,MAAM,4DAA4D,CAAC;AAK5F,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,SAAS,MAAC;IAGV,EAAE,EAAE,iBAAiB,CAAC;IAGtB,kBAAkB,EAAE,kBAAkB,CAAC;IAGvC,cAAc,EAAE,cAAc,CAAC;IAEzB,GAAG;CA4DZ"}

package/dist/wwwroot/routes/store/buy/[productID]/get.js

@@ -14,6 +14,7 @@ import { Prepare } from "@entity-access/server-pages/dist/decorators/Prepare.js"
 import SocialMailContext from "../../../../../server/model/SocialMailContext.js";
 import WebSiteService from "../../../../../server/services/files/WebSiteService.js";
 import StoreConfigService from "../../../../../server/services/store/StoreConfigService.js";
+import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
 let default_1 = class extends Page {
     async run() {
         // only if logged in...
@@ -29,7 +30,7 @@ let default_1 = class extends Page {
             }
             const contact = await this.db.storeAccounts.where({ userID }, (p) => (x) => x.accountID === p.userID)
                 .include((x) => x.addresses)
-                .first();
+                .first() ?? EntityAccessError.throw(`Please signup as a store user instead of backend user.`);
             // todo: optimization
             // do not create new orders if new order for same item exists
             // with only a single item...

package/dist/wwwroot/routes/store/buy/[productID]/get.js.map

@@ -1 +1 @@
-{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/store/buy/[productID]/get.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/store/buy/[productID]/get.tsx"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.5.330",
+  "version": "1.5.331",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",

package/src/server/model/entities/StoreJournal.ts

@@ -16,6 +16,9 @@ const journalTypeArray = [ "order", "purchase-order", "sales-invoice", "journal"
 export type journalTypeArrayType = typeof journalTypeArray[number];
 
 
+const statusTypeArray = [ "new", "paid", "draft"] as const;
+export type statusType = typeof statusTypeArray[number];
+
 
 @Table("StoreJournals")
 export class StoreJournal {
@@ -45,8 +48,13 @@ export class StoreJournal {
     @Column({ dataType: "Boolean", default: () => false })
     posted: boolean;
 
-    @Column({ dataType: "Char", length: 50, default: () => "draft"})
-    status: string;
+    @Column({
+        dataType: "Char",
+        length: 50,
+        default: () => "draft",
+        enum: statusTypeArray
+    })
+    status: statusType;
 
     @Column({ dataType: "BigInt" ,nullable: true })
     @RelateTo(StoreAccount, {

package/src/server/model/events/StoreJournalCouponEvents.ts

@@ -6,12 +6,18 @@ import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeE
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import Inject from "@entity-access/entity-access/dist/di/di.js";
 import CouponService from "../../services/coupons/CouponService.js";
+import SocialMailContext from "../SocialMailContext.js";
+import { ForeignKeyFilter } from "@entity-access/entity-access/dist/model/events/EntityEvents.js";
+import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 
 export default class StoreJournalCouponEvents extends AuthenticatedEvents<StoreJournalCoupon> {
 
     @Inject
     couponService: CouponService;
 
+    @Inject
+    db: SocialMailContext;
+
     filter(query: IEntityQuery<StoreJournalCoupon>) {
         if (!this.verify) {
             return query;
@@ -38,7 +44,7 @@ export default class StoreJournalCouponEvents extends AuthenticatedEvents<StoreJ
         if (sessionUser.isAdmin) {
             return query;
         }
-        throw new EntityAccessError("Only admin can delete the store.");
+        return this.modify(query);
     }
 
     includeFilter(query: IEntityQuery<StoreJournalCoupon>, type?: any, key?: string) {
@@ -47,11 +53,49 @@ export default class StoreJournalCouponEvents extends AuthenticatedEvents<StoreJ
 
     async beforeInsert(entity: StoreJournalCoupon, entry: ChangeEntry<StoreJournalCoupon>) {
         this.sessionUser.ensureLoggedIn();
+
+        if (!entity.couponID) {
+            await entry.loadNavigationAsync((x) => x.order);
+
+            const { storeID } = entity.order;
+            const { couponCode } = entity;
+
+            const ce = this.db.changeSet.getEntry(entity.order);
+            entity.order.dateUpdated = DateTime.now;
+            ce.detect();
+
+            const coupon = await this.db.storeCoupons.where({ storeID, couponCode }, (p) => (x) => x.storeID === p.storeID
+                && x.code === p.couponCode
+                )
+                .first() ?? EntityAccessError.throw(`Coupon ${entity.couponCode} not found`);
+
+            entity.couponID = coupon.couponID;
+            entity.coupon = coupon;
+        }
+
         await this.couponService.apply(entity, entry);
     }
 
+    async beforeDelete(entity: StoreJournalCoupon, entry: ChangeEntry<StoreJournalCoupon>) {
+        this.sessionUser.ensureLoggedIn();
+
+        const isNonPaid = await this.db.storeJournalCoupons.where(entity, (p) => (x) =>
+                x.appliedCouponID === p.appliedCouponID
+                && x.order.status !== "paid"
+            )
+            .first();
+
+        if (!isNonPaid) {
+            throw new EntityAccessError(`Coupon cannot be deleted from paid order`);
+        }
+    }
+
     beforeUpdate(entity: StoreJournalCoupon, entry: ChangeEntry<StoreJournalCoupon>) {
         throw new EntityAccessError(`Cannot modify coupon, delete and add it again.`);
     }
 
+    onForeignKeyFilter(filter: ForeignKeyFilter<StoreJournalCoupon, any>) {
+        return null;
+    }
+
 }

package/src/server/model/events/StoreJournalEvents.ts

@@ -79,8 +79,6 @@ export default class StoreJournalEvents extends AuthenticatedEvents<StoreJournal
             if(entry.getChange("posted").oldValue) {
                 throw new EntityAccessError("Posted journal cannot be saved as draft.");
             }
-
-            await this.syncAmount(entry);
             await this.verifyEntries(entry);
 
         } else {

package/src/server/seed/ui/seed-ui.ts

@@ -3,7 +3,7 @@ import semver from "semver";
 
 export default async function seedUI(config: DBConfig) {
 
-    const version = "1.2.709";
+    const version = "1.2.710";
 
     const existing = await config.getValue(UIPackageConfig, false);
     if (existing) {

package/src/server/services/accounts/sales/SalesInvoiceService.ts

@@ -22,7 +22,7 @@ export default class SalesInvoiceService {
     async syncAmount(entry: ChangeEntry<StoreJournal>, entity: StoreJournal) {
 
         await this.db.storeJournals.where(entity, (p) => (x) => x.journalID === p.journalID)
-            .include((x) => [x.lineItems.forEach((i) => [i.coupons, i.itemPrice])])
+            .include((x) => [x.lineItems.forEach((i) => [i.coupons.forEach((c) => c.coupon), i.itemPrice])])
             .first();
 
         for(const lineItem of [...entity.lineItems]) {
@@ -37,11 +37,15 @@ export default class SalesInvoiceService {
             const itemAmount = Number(lineItem.price) * Number(lineItem.quantity);
 
             if (lineItem.discountPercentage) {
-                lineItem.discount = lineItem.discountPercentage * lineItem.amount;
+                lineItem.discount = Number(lineItem.discountPercentage) * Number(lineItem.amount);
+            } else {
+                lineItem.discount = 0;
             }
 
             const priceAfterDiscount = itemAmount - lineItem.discount;
 
+            lineItem.couponDiscount ??= 0;
+
             if (priceAfterDiscount !== Number(lineItem.priceAfterDiscount)) {
                 lineItem.priceAfterDiscount = priceAfterDiscount;
                 await this.db.storeJournalLineItems.statements.update(
@@ -74,7 +78,13 @@ export default class SalesInvoiceService {
 
             let taxes = 0;
 
-            lineItem.amount = lineItem.priceAfterDiscount - lineItem.couponDiscount;
+            await this.coupons.compute(lineItem);
+
+            lineItem.couponDiscount = Number(lineItem.couponDiscount);
+            lineItem.quantity ??= 0;
+            lineItem.quantity = Number(lineItem.quantity);
+
+            lineItem.amount = (lineItem.priceAfterDiscount - Number(lineItem.couponDiscount)) * lineItem.quantity;
 
             for(const price of itemPrices) {
                 let taxLine = lineItem.taxLineItems.find((r) =>
@@ -95,14 +105,14 @@ export default class SalesInvoiceService {
 
                 if(itemPrice.taxIncluded) {
 
-                    let amount = lineItem.amount - lineItem.discount;
+                    let amount = lineItem.amount;
                     amount = amount / (Number(price.amount) + 1);
-                    lineItem.amount = amount + lineItem.discount;
+                    lineItem.amount = amount;
 
                 }
 
                 taxLine.price = Number(price.amount);
-                taxLine.total = (Number(lineItem.amount) - Number(lineItem.discount)) * Number(price.amount);
+                taxLine.total = Number(lineItem.amount) * Number(price.amount);
                 taxes += taxLine.total;
             }
             lineItem.taxes = taxes;

package/src/server/services/coupons/CouponService.ts

@@ -39,6 +39,11 @@ export default class CouponService {
 
         let applicableItems = order.lineItems;
 
+        if (!orderCoupon.couponID) {
+            orderCoupon.couponID = coupon.couponID;
+            orderCoupon.coupon = coupon;
+        }
+
         if (coupon.itemID) {
             applicableItems = order.lineItems.filter((i) => i.itemID === coupon.itemID);
             if (!applicableItems.length) {
@@ -81,13 +86,16 @@ export default class CouponService {
         // set couponDiscount amount
 
         const coupons = lineItem.coupons ?? lineItem.journal.orderCoupons;
-        if (!coupons) {
+        if (!coupons?.length) {
             return;
         }
 
         lineItem.couponDiscount = 0;
 
         for (const coupon of coupons) {
+            if (!coupon.coupon) {
+                await this.db.changeSet.getEntry(coupon).loadNavigationAsync((x) => x.coupon);
+            }
             switch(coupon.coupon.type) {
                 case "discount":
                     lineItem.couponDiscount += lineItem.priceAfterDiscount * Number(coupon.coupon.amount);

package/src/wwwroot/routes/store/buy/[productID]/get.tsx

@@ -6,6 +6,7 @@ import { Prepare } from "@entity-access/server-pages/dist/decorators/Prepare.js"
 import SocialMailContext from "../../../../../server/model/SocialMailContext.js";
 import WebSiteService from "../../../../../server/services/files/WebSiteService.js";
 import StoreConfigService from "../../../../../server/services/store/StoreConfigService.js";
+import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
 
 
 @Prepare.authorize
@@ -44,7 +45,7 @@ export default class extends Page {
 
             const contact = await this.db.storeAccounts.where({userID }, (p) => (x) => x.accountID === p.userID)
                 .include((x) => x.addresses)
-                .first();
+                .first() ?? EntityAccessError.throw(`Please signup as a store user instead of backend user.`);
 
             // todo: optimization
             // do not create new orders if new order for same item exists