@social-mail/social-mail-web-server 1.12.103 → 1.12.105
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/server/model/events/StoreJournalEntryEvents.js +1 -1
- package/dist/server/model/events/StoreJournalEntryEvents.js.map +1 -1
- package/dist/server/model/events/StoreJournalEvents.js +1 -1
- package/dist/server/model/events/StoreJournalEvents.js.map +1 -1
- package/dist/server/model/events/StoreJournalLineItemEvents.js +1 -1
- package/dist/server/model/events/StoreJournalLineItemEvents.js.map +1 -1
- package/dist/server/model/events/StoreSubscriptionEvents.d.ts +4 -0
- package/dist/server/model/events/StoreSubscriptionEvents.d.ts.map +1 -1
- package/dist/server/model/events/StoreSubscriptionEvents.js +22 -2
- package/dist/server/model/events/StoreSubscriptionEvents.js.map +1 -1
- package/dist/server/seed/ui/seed-ui.js +1 -1
- package/dist/server/services/accounts/JournalService.d.ts.map +1 -1
- package/dist/server/services/accounts/JournalService.js +1 -0
- package/dist/server/services/accounts/JournalService.js.map +1 -1
- package/dist/server/services/store/StorePaymentGatewayService.d.ts +4 -4
- package/dist/server/services/store/StorePaymentGatewayService.d.ts.map +1 -1
- package/dist/server/services/store/StorePaymentGatewayService.js +69 -47
- package/dist/server/services/store/StorePaymentGatewayService.js.map +1 -1
- package/dist/server/services/store/subscriptions/StoreSubscriptionService.d.ts.map +1 -1
- package/dist/server/services/store/subscriptions/StoreSubscriptionService.js +3 -2
- package/dist/server/services/store/subscriptions/StoreSubscriptionService.js.map +1 -1
- package/dist/server/workflows/geo-entities/DownloadGeoEntitiesWorkflow.d.ts.map +1 -1
- package/dist/server/workflows/geo-entities/DownloadGeoEntitiesWorkflow.js +11 -4
- package/dist/server/workflows/geo-entities/DownloadGeoEntitiesWorkflow.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/wwwroot/routes/store/checkout-callback/[paymentID]/get.d.ts +2 -0
- package/dist/wwwroot/routes/store/checkout-callback/[paymentID]/get.d.ts.map +1 -1
- package/dist/wwwroot/routes/store/checkout-callback/[paymentID]/get.js +9 -3
- package/dist/wwwroot/routes/store/checkout-callback/[paymentID]/get.js.map +1 -1
- package/dist/wwwroot/routes/store/subscribe/[productID]/get.js +1 -1
- package/dist/wwwroot/routes/store/subscribe/[productID]/get.js.map +1 -1
- package/package.json +1 -1
- package/src/server/model/events/StoreJournalEntryEvents.ts +1 -1
- package/src/server/model/events/StoreJournalEvents.ts +1 -1
- package/src/server/model/events/StoreJournalLineItemEvents.ts +1 -1
- package/src/server/model/events/StoreSubscriptionEvents.ts +10 -2
- package/src/server/seed/ui/seed-ui.ts +1 -1
- package/src/server/services/accounts/JournalService.ts +2 -0
- package/src/server/services/store/StorePaymentGatewayService.ts +19 -5
- package/src/server/services/store/subscriptions/StoreSubscriptionService.ts +3 -2
- package/src/server/workflows/geo-entities/DownloadGeoEntitiesWorkflow.ts +11 -3
- package/src/wwwroot/routes/store/checkout-callback/[paymentID]/get.tsx +10 -3
- package/src/wwwroot/routes/store/subscribe/[productID]/get.tsx +1 -1
- package/tests/local-test/pgadmin/pg.pass +1 -0
- package/tests/local-test/pgadmin/servers.json +14 -0
|
@@ -11,7 +11,7 @@ export default class StoreJournalEntryEvents extends AuthenticatedEvents {
|
|
|
11
11
|
return query;
|
|
12
12
|
}
|
|
13
13
|
return query.where(sessionUser, (x, p) => Sql.text.likeAny(x.journal.store.folder.path, p.writeFileAccess)
|
|
14
|
-
|| x.journal.
|
|
14
|
+
|| x.journal.buyer.userID === p.userID);
|
|
15
15
|
}
|
|
16
16
|
modify(query) {
|
|
17
17
|
return this.filter(query);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StoreJournalEntryEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/StoreJournalEntryEvents.ts"],"names":[],"mappings":"AACA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAC3D,OAAO,iBAAiB,MAAM,+DAA+D,CAAC;AAG9F,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAE/D,MAAM,CAAC,OAAO,OAAO,uBAAwB,SAAQ,mBAAsC;IAEvF,MAAM,CAAC,KAAsC;QACzC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;QAC7B,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YACtB,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,OAAO,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACrC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,eAAe,CAAC;eAC7D,CAAC,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"StoreJournalEntryEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/StoreJournalEntryEvents.ts"],"names":[],"mappings":"AACA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAC3D,OAAO,iBAAiB,MAAM,+DAA+D,CAAC;AAG9F,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAE/D,MAAM,CAAC,OAAO,OAAO,uBAAwB,SAAQ,mBAAsC;IAEvF,MAAM,CAAC,KAAsC;QACzC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;QAC7B,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YACtB,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,OAAO,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACrC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,eAAe,CAAC;eAC7D,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CACzC,CAAC;IACN,CAAC;IAED,MAAM,CAAC,KAAsC;QACzC,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IAED,MAAM,CAAC,KAAsC;QACzC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;QAC7B,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YACtB,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,IAAI,iBAAiB,CAAC,kCAAkC,CAAC,CAAC;IACpE,CAAC;IAED,aAAa,CAAC,KAAsC,EAAE,IAAU,EAAE,GAAY;QAC1E,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,YAAY,CAAC,MAAyB,EAAE,KAAqC;QACzE,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;IACtC,CAAC;IAED,YAAY,CAAC,MAAyB,EAAE,KAAqC;QACzE,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;IACtC,CAAC;CAEJ"}
|
|
@@ -26,7 +26,7 @@ export default class StoreJournalEvents extends AuthenticatedEvents {
|
|
|
26
26
|
return query;
|
|
27
27
|
}
|
|
28
28
|
return query.where(sessionUser, (x, p) => Sql.text.likeAny(x.store.folder.path, p.writeFileAccess)
|
|
29
|
-
|| x.
|
|
29
|
+
|| x.buyer.userID === p.userID);
|
|
30
30
|
}
|
|
31
31
|
modify(query) {
|
|
32
32
|
return this.filter(query);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StoreJournalEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/StoreJournalEvents.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAC3D,OAAO,iBAAiB,MAAM,+DAA+D,CAAC;AAG9F,OAAO,MAAM,EAAE,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AACrF,OAAO,iBAAiB,MAAM,yBAAyB,CAAC;AACxD,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAC/D,OAAO,mBAAmB,MAAM,sDAAsD,CAAC;AACvF,OAAO,cAAc,MAAM,2CAA2C,CAAC;AAEvE,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,mBAAiC;IAK7E,MAAM,CAAC,KAAiC;QACpC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;QAC7B,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YACtB,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,OAAO,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACrC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,eAAe,CAAC;eACrD,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"StoreJournalEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/StoreJournalEvents.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAC3D,OAAO,iBAAiB,MAAM,+DAA+D,CAAC;AAG9F,OAAO,MAAM,EAAE,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AACrF,OAAO,iBAAiB,MAAM,yBAAyB,CAAC;AACxD,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAC/D,OAAO,mBAAmB,MAAM,sDAAsD,CAAC;AACvF,OAAO,cAAc,MAAM,2CAA2C,CAAC;AAEvE,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,mBAAiC;IAK7E,MAAM,CAAC,KAAiC;QACpC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;QAC7B,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YACtB,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,OAAO,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACrC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,eAAe,CAAC;eACrD,CAAC,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CACjC,CAAC;IACN,CAAC;IAED,MAAM,CAAC,KAAiC;QACpC,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IAED,MAAM,CAAC,KAAiC;QACpC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,0CAA0C;QAC1C,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC;IAClD,CAAC;IAED,aAAa,CAAC,KAAiC,EAAE,IAAU,EAAE,GAAY;QACrE,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,MAAoB,EAAE,KAAgC;QACrE,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAChB,MAAM,IAAI,iBAAiB,CAAC,mCAAmC,CAAC,CAAC;QACrE,CAAC;QAED,MAAM,IAAI,CAAC,EAAE,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC;QAClG,MAAM,IAAI,CAAC,EAAE,CAAC,qBAAqB,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC;IACxG,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,MAAoB,EAAE,KAAgC;QAErE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,IAAI,MAAM,CAAC,OAAO,CAAC,sBAAsB,CAAC,KAAK,IAAI,EAAE,CAAC;gBAClD,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;YACtC,CAAC;QACL,CAAC;QAED,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAC7B,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAChB,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QACpC,CAAC;IACL,CAAC;IACD,KAAK,CAAC,UAAU,CAAC,KAAgC;QAC7C,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;QACzB,QAAO,MAAM,CAAC,WAAW,EAAE,CAAC;YACxB,KAAK,OAAO,CAAC;YACb,KAAK,eAAe,CAAC;YACrB,KAAK,gBAAgB,CAAC;YACtB,KAAK,eAAe;gBAChB,MAAM,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;gBAC9D,MAAM,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;gBACnC,MAAM;QACd,CAAC;IACL,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,MAAoB,EAAE,KAAgC;QACrE,IAAI,MAAM,CAAC,OAAO,CAAC,sBAAsB,CAAC,KAAK,IAAI,EAAE,CAAC;YAClD,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;QACtC,CAAC;QAED,MAAM,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;QAEvD,IAAI,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7B,IAAG,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;gBACpC,MAAM,IAAI,iBAAiB,CAAC,0CAA0C,CAAC,CAAC;YAC5E,CAAC;YACD,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAEpC,CAAC;aAAM,CAAC;YACJ,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;gBAChB,MAAM,IAAI,iBAAiB,CAAC,mCAAmC,CAAC,CAAC;YACrE,CAAC;QACL,CAAC;QACD,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,KAAgC;QAChD,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;QAEzB,0BAA0B;QAC1B,MAAM,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAEhD,MAAM,CAAC,OAAO,KAAK,EAAE,CAAC;QAEtB,MAAM,cAAc,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QACrE,MAAM,cAAc,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAEhD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;YAC1B,MAAM,IAAI,iBAAiB,CAAC,2BAA2B,CAAC,CAAC;QAC7D,CAAC;QACD,IAAI,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QACzB,IAAI,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAExB,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACpC,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC;YACtB,QAAQ,CAAC,KAAK,KAAK,CAAC,CAAC;YACrB,IAAI,CAAC,CACD,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,QAAQ,CAAC,KAAK,KAAK,CAAC,CAAC;;oBAE7C,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAChD,EAAE,CAAC;gBACA,MAAM,IAAI,iBAAiB,CAAC,iEAAiE,CAAC,CAAC;YACnG,CAAC;YACD,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;YAChD,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;QACjD,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;YAC1B,sCAAsC;YACtC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC5B,MAAM,IAAI,iBAAiB,CAAC,+CAA+C,OAAO,eAAe,MAAM,iBAAiB,CAAC,CAAC;QAC9H,CAAC;IACL,CAAC;IAED,WAAW,CAAC,MAAoB,EAAE,KAAgC;QAC9D,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC9C,CAAC;IAED,WAAW,CAAC,MAAoB,EAAE,KAAgC;QAC9D,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,MAAoB,EAAE,KAAgC;QAEvE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7B,OAAO;QACX,CAAC;QAED,IAAI,MAAM,CAAC,WAAW,KAAK,eAAe,EAAE,CAAC;YACzC,IAAI,EAAE,SAAS,EAAG,KAAK,EAAE,EAAE,aAAa,EAAE,EAAE,GAAG,MAAM,CAAC;YACtD,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,EAAE,GAAG,MAAM,CAAC;YAElD,gBAAgB;YAChB,IAAG,CAAC,SAAS,EAAE,CAAC;gBACZ,MAAM,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;gBAChD,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC;gBACvC,SAAS,GAAG,GAAG,aAAa,IAAI,EAAE,GAAG,aAAa,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;gBACjF,MAAM,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;gBAC5E,aAAa,EAAE,CAAC;gBAChB,MAAM,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;YACpF,CAAC;iBAAM,CAAC;gBAEJ,IAAI,SAAS,EAAE,CAAC;oBACZ,MAAM,CAAC,GAAG,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;oBACxC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;oBAC3B,IAAI,EAAE,EAAE,CAAC;wBACL,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;wBAC3B,aAAa,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,QAAQ,EAAS,CAAC;wBACpD,MAAM,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACpE,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,OAAO;+BACrB,CAAC,CAAC,aAAa,GAAG,CAAC,CAAC,aAAa,CAAC;6BACpC,MAAM,CAAC,EAAE,aAAa,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC;oBAClE,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC;QAED,IAAI,CAAC,EAAE,CAAC,iBAAiB,CAAC,KAAK,IAAI,EAAE;YACjC,MAAM,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YAElD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;gBAC1B,OAAO;YACX,CAAC;YAED,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBACpC,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YACvC,CAAC;QAEL,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,KAAwB;QACxC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,mBAAmB,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,SAAS,CAAC;aAC7F,iBAAiB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;aACnC,KAAK,EAAE,CAAC;QACb,MAAM,WAAW,GAAG,IAAI,EAAE,OAAO,IAAI,CAAC,CAAC;QACvC,KAAK,CAAC,OAAO,GAAG,WAAW,GAAG,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC;QACzD,MAAM,IAAI,CAAC,EAAE,CAAC,mBAAmB,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,CAAC,CAAC,OAAO,CAAC;aAC5E,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;QAC3E,MAAM,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,SAAS,CAAC;aAC1E,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,EAAC,CAAC,CAAC,CAAC;QAE1E,IAAI,KAAK,CAAC,YAAY,EAAE,QAAQ,EAAE,CAAC;YAC/B,MAAM,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,QAAQ,CAAC;iBACtF,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACZ,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;aAC1D,CAAC,CAAC,CAAC;QACZ,CAAC;IACL,CAAC;CAEJ;AAzMG;IADC,MAAM;8BACH,iBAAiB;8CAAC"}
|
|
@@ -12,7 +12,7 @@ export default class StoreJournalLineItemEvents extends AuthenticatedEvents {
|
|
|
12
12
|
return query;
|
|
13
13
|
}
|
|
14
14
|
return query.where(sessionUser, (x, p) => Sql.text.likeAny(x.journal.store.folder.path, p.writeFileAccess)
|
|
15
|
-
|| x.journal.
|
|
15
|
+
|| x.journal.buyer.userID === p.userID);
|
|
16
16
|
}
|
|
17
17
|
modify(query) {
|
|
18
18
|
return this.filter(query);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StoreJournalLineItemEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/StoreJournalLineItemEvents.ts"],"names":[],"mappings":"AACA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAC3D,OAAO,iBAAiB,MAAM,+DAA+D,CAAC;AAG9F,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAErD,MAAM,CAAC,OAAO,OAAO,0BAA2B,SAAQ,mBAAyC;IAE7F,MAAM,CAAC,KAAyC;QAC5C,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;QAC7B,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YACtB,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,OAAO,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACrC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,eAAe,CAAC;eAC7D,CAAC,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"StoreJournalLineItemEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/StoreJournalLineItemEvents.ts"],"names":[],"mappings":"AACA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAC3D,OAAO,iBAAiB,MAAM,+DAA+D,CAAC;AAG9F,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAErD,MAAM,CAAC,OAAO,OAAO,0BAA2B,SAAQ,mBAAyC;IAE7F,MAAM,CAAC,KAAyC;QAC5C,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;QAC7B,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YACtB,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,OAAO,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACrC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,eAAe,CAAC;eAC7D,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CACzC,CAAC;IACN,CAAC;IAED,MAAM,CAAC,KAAyC;QAC5C,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IAED,MAAM,CAAC,KAAyC;QAC5C,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;QAC7B,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YACtB,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,IAAI,iBAAiB,CAAC,kCAAkC,CAAC,CAAC;IACpE,CAAC;IAED,aAAa,CAAC,KAAyC,EAAE,IAAU,EAAE,GAAY;QAC7E,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,YAAY,CAAC,MAA4B,EAAE,KAAwC;QAC/E,IAAI,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,sBAAsB,CAAC,EAAE,CAAC;YACnF,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;QACtC,CAAC;IAEL,CAAC;IAED,YAAY,CAAC,MAA4B,EAAE,KAAwC;QAC/E,IAAI,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,sBAAsB,CAAC,EAAE,CAAC;YACnF,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;QACtC,CAAC;IACL,CAAC;CAEJ"}
|
|
@@ -2,7 +2,11 @@ import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWit
|
|
|
2
2
|
import AuthenticatedEvents from "./AuthenticatedEvents.js";
|
|
3
3
|
import StoreSubscription from "../entities/StoreSubscription.js";
|
|
4
4
|
import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeEntry.js";
|
|
5
|
+
import StoreSubscriptionService from "../../services/store/subscriptions/StoreSubscriptionService.js";
|
|
6
|
+
import SocialMailContext from "../SocialMailContext.js";
|
|
5
7
|
export default class StoreSubscriptionEvents extends AuthenticatedEvents<StoreSubscription> {
|
|
8
|
+
db: SocialMailContext;
|
|
9
|
+
sss: StoreSubscriptionService;
|
|
6
10
|
filter(query: IEntityQuery<StoreSubscription>): IEntityQuery<StoreSubscription>;
|
|
7
11
|
beforeInsert(entity: StoreSubscription, entry: ChangeEntry<StoreSubscription>): void;
|
|
8
12
|
beforeUpdate(entity: StoreSubscription, entry: ChangeEntry<StoreSubscription>): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StoreSubscriptionEvents.d.ts","sourceRoot":"","sources":["../../../../src/server/model/events/StoreSubscriptionEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iEAAiE,CAAC;AAC/F,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAC3D,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAEjE,OAAO,WAAW,MAAM,gEAAgE,CAAC;
|
|
1
|
+
{"version":3,"file":"StoreSubscriptionEvents.d.ts","sourceRoot":"","sources":["../../../../src/server/model/events/StoreSubscriptionEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iEAAiE,CAAC;AAC/F,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAC3D,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAEjE,OAAO,WAAW,MAAM,gEAAgE,CAAC;AACzF,OAAO,wBAAwB,MAAM,gEAAgE,CAAC;AAEtG,OAAO,iBAAiB,MAAM,yBAAyB,CAAC;AAExD,MAAM,CAAC,OAAO,OAAO,uBAAwB,SAAQ,mBAAmB,CAAC,iBAAiB,CAAC;IAGvF,EAAE,EAAE,iBAAiB,CAAC;IAEtB,GAAG,EAAE,wBAAwB,CAAC;IAE9B,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,iBAAiB,CAAC;IAQ7C,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,WAAW,CAAC,iBAAiB,CAAC;IAM7E,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,WAAW,CAAC,iBAAiB,CAAC;IAMvE,WAAW,CAAC,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,WAAW,CAAC,iBAAiB,CAAC;IAM5E,WAAW,CAAC,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,WAAW,CAAC,iBAAiB,CAAC;CAIrF"}
|
|
@@ -1,12 +1,23 @@
|
|
|
1
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
2
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
3
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
4
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
5
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
|
+
};
|
|
7
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
|
+
};
|
|
1
10
|
import AuthenticatedEvents from "./AuthenticatedEvents.js";
|
|
2
11
|
import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
|
|
3
12
|
import StoreSubscriptionService from "../../services/store/subscriptions/StoreSubscriptionService.js";
|
|
13
|
+
import Inject from "@entity-access/entity-access/dist/di/di.js";
|
|
14
|
+
import SocialMailContext from "../SocialMailContext.js";
|
|
4
15
|
export default class StoreSubscriptionEvents extends AuthenticatedEvents {
|
|
5
16
|
filter(query) {
|
|
6
17
|
if (this.sessionUser.isAdmin) {
|
|
7
18
|
return query;
|
|
8
19
|
}
|
|
9
|
-
return query.where(this.sessionUser, (x, p) => x.
|
|
20
|
+
return query.where(this.sessionUser, (x, p) => x.buyer.userID === p.userID
|
|
10
21
|
|| Sql.text.likeAny(x.store.folder.path, p.readFileAccess));
|
|
11
22
|
}
|
|
12
23
|
beforeInsert(entity, entry) {
|
|
@@ -21,10 +32,19 @@ export default class StoreSubscriptionEvents extends AuthenticatedEvents {
|
|
|
21
32
|
}
|
|
22
33
|
async afterInsert(entity, entry) {
|
|
23
34
|
// need to create journal and pay
|
|
24
|
-
|
|
35
|
+
this.db.verifyFilters = false;
|
|
36
|
+
this.db.queuePostSaveTask(() => this.sss.refreshSubscription(entity));
|
|
25
37
|
}
|
|
26
38
|
async afterUpdate(entity, entry) {
|
|
27
39
|
await StoreSubscriptionService.inNewScope(this).refreshSubscription(entity);
|
|
28
40
|
}
|
|
29
41
|
}
|
|
42
|
+
__decorate([
|
|
43
|
+
Inject,
|
|
44
|
+
__metadata("design:type", SocialMailContext)
|
|
45
|
+
], StoreSubscriptionEvents.prototype, "db", void 0);
|
|
46
|
+
__decorate([
|
|
47
|
+
Inject,
|
|
48
|
+
__metadata("design:type", StoreSubscriptionService)
|
|
49
|
+
], StoreSubscriptionEvents.prototype, "sss", void 0);
|
|
30
50
|
//# sourceMappingURL=StoreSubscriptionEvents.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StoreSubscriptionEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/StoreSubscriptionEvents.ts"],"names":[],"mappings":"AACA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAE3D,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAE/D,OAAO,wBAAwB,MAAM,gEAAgE,CAAC;
|
|
1
|
+
{"version":3,"file":"StoreSubscriptionEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/StoreSubscriptionEvents.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAE3D,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAE/D,OAAO,wBAAwB,MAAM,gEAAgE,CAAC;AACtG,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,iBAAiB,MAAM,yBAAyB,CAAC;AAExD,MAAM,CAAC,OAAO,OAAO,uBAAwB,SAAQ,mBAAsC;IAOvF,MAAM,CAAC,KAAsC;QACzC,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,OAAO,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM;eACnE,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;IACpE,CAAC;IAED,YAAY,CAAC,MAAyB,EAAE,KAAqC;QACzE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;QACtC,CAAC;IACL,CAAC;IAED,YAAY,CAAC,MAAyB,EAAE,KAAqC;QACzE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;QACtC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAyB,EAAE,KAAqC;QAC9E,iCAAiC;QACjC,IAAI,CAAC,EAAE,CAAC,aAAa,GAAG,KAAK,CAAC;QAC9B,IAAI,CAAC,EAAE,CAAC,iBAAiB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAyB,EAAE,KAAqC;QAC9E,MAAM,wBAAwB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAChF,CAAC;CAEJ;AAlCG;IADC,MAAM;8BACH,iBAAiB;mDAAC;AAEtB;IADC,MAAM;8BACF,wBAAwB;oDAAC"}
|
|
@@ -14,7 +14,7 @@ export default async function seedUI(config) {
|
|
|
14
14
|
await config.saveVersion(UIPackageConfig, {
|
|
15
15
|
package: "@social-mail/social-mail-client",
|
|
16
16
|
view: "dist/web/AppIndex",
|
|
17
|
-
version: "1.10.
|
|
17
|
+
version: "1.10.69"
|
|
18
18
|
});
|
|
19
19
|
await config.saveVersion(WebComponentsPackageConfig, {
|
|
20
20
|
package: "@social-mail/web-components",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JournalService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/accounts/JournalService.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,gEAAgE,CAAC;AACzF,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,eAAe,MAAM,wCAAwC,CAAC;AAErE,OAAO,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAGpE,MAAM,CAAC,OAAO,OAAO,cAAc;IAG/B,eAAe,EAAE,eAAe,CAAC;IAGjC,EAAE,EAAE,iBAAiB,CAAC;IAEhB,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,YAAY;YAwE1D,QAAQ;
|
|
1
|
+
{"version":3,"file":"JournalService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/accounts/JournalService.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,gEAAgE,CAAC;AACzF,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,eAAe,MAAM,wCAAwC,CAAC;AAErE,OAAO,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAGpE,MAAM,CAAC,OAAO,OAAO,cAAc;IAG/B,eAAe,EAAE,eAAe,CAAC;IAGjC,EAAE,EAAE,iBAAiB,CAAC;IAEhB,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,YAAY;YAwE1D,QAAQ;CAiDzB"}
|
|
@@ -84,6 +84,7 @@ let JournalService = class JournalService {
|
|
|
84
84
|
head,
|
|
85
85
|
name
|
|
86
86
|
});
|
|
87
|
+
entity.entries ??= [];
|
|
87
88
|
let entry = entity.entries.find((x) => x.journal === entity
|
|
88
89
|
&& x.accountID === account.accountID
|
|
89
90
|
&& (lineItemID ? x.lineItemID === lineItemID : (lineItem ? x.lineItem === lineItem : true)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JournalService.js","sourceRoot":"","sources":["../../../../src/server/services/accounts/JournalService.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"JournalService.js","sourceRoot":"","sources":["../../../../src/server/services/accounts/JournalService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,EAAE,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAEvF,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,eAAe,MAAM,wCAAwC,CAAC;AACrE,OAAO,EAAE,YAAY,EAAgB,MAAM,qCAAqC,CAAC;AAIlE,IAAM,cAAc,GAApB,MAAM,cAAc;IAQ/B,KAAK,CAAC,WAAW,CAAC,KAAgC,EAAE,MAAoB;QAEpE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;QAElC,+BAA+B;QAC/B,qBAAqB;QACrB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC;gBACrD,OAAO;gBACP,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,WAAW;aACpB,CAAC,CAAC;YACH,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC;QACvC,CAAC;QAED,MAAM,IAAI,CAAC,QAAQ,CAAC;YAChB,MAAM;YACN,OAAO,EAAG,YAAY,CAAC,kBAAkB;YACzC,KAAK,EAAE,KAAK;SACf,CAAC,CAAC;QAEH,IAAI,KAAK,GAAG,KAAK,CAAC;QAElB,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;YAEtC,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAChD,MAAM,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YAC9C,MAAM,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAC5C,MAAM,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;YAEjD,IAAG,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;gBACtC,MAAM,IAAI,CAAC,QAAQ,CAAC;oBAChB,OAAO,EAAE,YAAY,CAAC,KAAK;oBAC3B,QAAQ;oBACR,UAAU,EAAE,QAAQ,CAAC,UAAU;oBAC/B,MAAM;oBACN,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;iBAClC,CAAC,CAAC;gBACH,SAAS;YACb,CAAC;YAED,QAAO,QAAQ,CAAC,QAAQ,IAAI,QAAQ,CAAC,IAAI,EAAE,QAAQ,IAAI,QAAQ,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC;gBAC7F,KAAK,YAAY;oBACb,MAAM,IAAI,CAAC,QAAQ,CAAC;wBAChB,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,IAAI,GAAG,cAAc;wBAC3C,MAAM;wBACN,MAAM,EAAE,QAAQ,CAAC,MAAM;wBACvB,QAAQ;wBACR,UAAU,EAAE,QAAQ,CAAC,UAAU;wBAC/B,OAAO,EAAE,YAAY,CAAC,kBAAkB;qBAC3C,CAAC,CAAC;oBACH,KAAK,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;oBAChC,MAAM;gBACV,KAAK,KAAK;oBACN,MAAM,IAAI,CAAC,QAAQ,CAAC;wBAChB,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,IAAI,QAAQ,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,IAAI,KAAK;wBACzE,MAAM;wBACN,MAAM,EAAE,QAAQ,CAAC,KAAK;wBACtB,QAAQ;wBACR,UAAU,EAAE,QAAQ,CAAC,UAAU;wBAC/B,OAAO,EAAE,YAAY,CAAC,YAAY;qBACrC,CAAC,CAAC;oBACH,KAAK,IAAI,QAAQ,CAAC,KAAK,CAAC;oBACxB,MAAM;gBACV,KAAK,KAAK;oBACN,MAAM;YACd,CAAC;QAEL,CAAC;IAEL,CAAC;IAEO,KAAK,CAAC,QAAQ,CAAC,EACnB,MAAM,EACN,UAAU,EACV,QAAQ,EACR,OAAO,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,EACnC,IAAI,GAAG,UAAU,EACjB,QAAQ,EACR,KAAK,GAAG,CAAC,EACT,MAAM,GAAG,CAAC,EAWb;QAEG,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;YACtB,UAAU,GAAG,IAAI,CAAC;QACtB,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC;YACrD,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,QAAQ;YACR,UAAU;YACV,IAAI;YACJ,IAAI;SACP,CAAC,CAAC;QAEH,MAAM,CAAC,OAAO,KAAK,EAAE,CAAC;QAEtB,IAAI,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,MAAM;eACpD,CAAC,CAAC,SAAS,KAAK,OAAO,CAAC,SAAS;eACjC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAE,CAAC,CAAC,CAAC;QAClG,IAAI,CAAC,KAAK,EAAE,CAAC;YACT,KAAK,GAAG,IAAI,CAAC,EAAE,CAAC,mBAAmB,CAAC,GAAG,CAAC;gBACpC,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,UAAU;gBACV,QAAQ;aACX,CAAC,CAAC;YACH,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;QACD,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;QACtB,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC;IACxB,CAAC;CACJ,CAAA;AA9HG;IADC,MAAM;8BACU,eAAe;uDAAC;AAGjC;IADC,MAAM;8BACH,iBAAiB;0CAAC;AANL,cAAc;IADlC,iBAAiB;GACG,cAAc,CAiIlC;eAjIoB,cAAc"}
|
|
@@ -16,10 +16,10 @@ export default class StorePaymentGatewayService {
|
|
|
16
16
|
db: SocialMailContext;
|
|
17
17
|
context: AppWorkflowContext;
|
|
18
18
|
checkout({ host, storeID, orderID, ledgerID }: {
|
|
19
|
-
host:
|
|
20
|
-
storeID:
|
|
21
|
-
|
|
22
|
-
|
|
19
|
+
host: string;
|
|
20
|
+
storeID: number;
|
|
21
|
+
ledgerID?: number;
|
|
22
|
+
orderID: number;
|
|
23
23
|
}): Promise<StorePaymentAttempt>;
|
|
24
24
|
refund(payment: StorePaymentAttempt): Promise<void>;
|
|
25
25
|
checkoutResult(payment: StorePaymentAttempt): Promise<StorePaymentAttempt>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StorePaymentGatewayService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/store/StorePaymentGatewayService.ts"],"names":[],"mappings":"AACA,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAKjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,mBAAmB,MAAM,6CAA6C,CAAC;AAI9E;;;;;;;;;;GAUG;AAEH,MAAM,CAAC,OAAO,OAAO,0BAA0B;IAG3C,EAAE,EAAE,iBAAiB,CAAC;IAGtB,OAAO,EAAE,kBAAkB,CAAC;IAEtB,QAAQ,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,QAAiB,EAAE
|
|
1
|
+
{"version":3,"file":"StorePaymentGatewayService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/store/StorePaymentGatewayService.ts"],"names":[],"mappings":"AACA,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAKjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,mBAAmB,MAAM,6CAA6C,CAAC;AAI9E;;;;;;;;;;GAUG;AAEH,MAAM,CAAC,OAAO,OAAO,0BAA0B;IAG3C,EAAE,EAAE,iBAAiB,CAAC;IAGtB,OAAO,EAAE,kBAAkB,CAAC;IAEtB,QAAQ,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,QAAiB,EAAE,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAgE5J,MAAM,CAAC,OAAO,EAAE,mBAAmB;IAcnC,cAAc,CAAC,OAAO,EAAE,mBAAmB;YAmBnC,mBAAmB;CAuEpC"}
|
|
@@ -79,44 +79,62 @@ import JournalService from "../accounts/JournalService.js";
|
|
|
79
79
|
*/
|
|
80
80
|
let StorePaymentGatewayService = class StorePaymentGatewayService {
|
|
81
81
|
async checkout({ host, storeID, orderID, ledgerID = void 0 }) {
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
.
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
82
|
+
const env_1 = { stack: [], error: void 0, hasError: false };
|
|
83
|
+
try {
|
|
84
|
+
// check if any pending payment exists...
|
|
85
|
+
let payment = await this.db.storePaymentAttempts.where({ orderID }, (x, p) => x.orderID === p.orderID
|
|
86
|
+
&& x.status === null)
|
|
87
|
+
.first();
|
|
88
|
+
if (payment) {
|
|
89
|
+
if (!payment.status) {
|
|
90
|
+
await this.checkoutResult(payment);
|
|
91
|
+
}
|
|
92
|
+
if (payment.status === "paid") {
|
|
93
|
+
payment.url = void 0;
|
|
94
|
+
payment.content = void 0;
|
|
95
|
+
await this.db.storePaymentAttempts.statements.update({ url: null, content: null }, { attemptID: payment.attemptID });
|
|
96
|
+
return payment;
|
|
97
|
+
}
|
|
89
98
|
}
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
99
|
+
const order = await this.db.storeJournals.where({ orderID }, (x, p) => x.journalID === p.orderID)
|
|
100
|
+
.first();
|
|
101
|
+
let q = this.db.storePaymentGateways.where({ storeID }, (x, p) => x.storeAccount.storeID === p.storeID);
|
|
102
|
+
if (ledgerID) {
|
|
103
|
+
q = q.where({ ledgerID }, (x, p) => x.accountID === p.ledgerID);
|
|
95
104
|
}
|
|
105
|
+
else {
|
|
106
|
+
q = q.where({ ledgerID }, (x, p) => x.isGatewayActive === true);
|
|
107
|
+
}
|
|
108
|
+
const gateway = await q
|
|
109
|
+
.orderByDescending((x) => x.isDefault)
|
|
110
|
+
.first();
|
|
111
|
+
const dateCreated = DateTime.now;
|
|
112
|
+
const tx = __addDisposableResource(env_1, await this.db.connection.createTransaction(), true);
|
|
113
|
+
payment = await this.db.storePaymentAttempts.statements.insert({
|
|
114
|
+
orderID,
|
|
115
|
+
gatewayID: gateway.accountID,
|
|
116
|
+
dateCreated
|
|
117
|
+
});
|
|
118
|
+
const pg = await LedgerPaymentGateway.for(this, gateway.paymentGateway);
|
|
119
|
+
const { url, content } = await pg.createPayment(host, gateway, order, payment);
|
|
120
|
+
payment.url = url;
|
|
121
|
+
payment.content = content?.render();
|
|
122
|
+
await this.db.storePaymentAttempts.statements.update({
|
|
123
|
+
url,
|
|
124
|
+
content: payment.content
|
|
125
|
+
}, { attemptID: payment.attemptID });
|
|
126
|
+
await tx.commit();
|
|
127
|
+
return payment;
|
|
96
128
|
}
|
|
97
|
-
|
|
98
|
-
.
|
|
99
|
-
|
|
100
|
-
if (ledgerID) {
|
|
101
|
-
q = q.where({ ledgerID }, (x, p) => x.accountID === p.ledgerID);
|
|
129
|
+
catch (e_1) {
|
|
130
|
+
env_1.error = e_1;
|
|
131
|
+
env_1.hasError = true;
|
|
102
132
|
}
|
|
103
|
-
|
|
104
|
-
|
|
133
|
+
finally {
|
|
134
|
+
const result_1 = __disposeResources(env_1);
|
|
135
|
+
if (result_1)
|
|
136
|
+
await result_1;
|
|
105
137
|
}
|
|
106
|
-
const gateway = await q
|
|
107
|
-
.orderByDescending((x) => x.isDefault)
|
|
108
|
-
.first();
|
|
109
|
-
const dateCreated = DateTime.now;
|
|
110
|
-
const pa = await this.db.storePaymentAttempts.statements.insert({
|
|
111
|
-
orderID,
|
|
112
|
-
gatewayID: gateway.accountID,
|
|
113
|
-
dateCreated
|
|
114
|
-
});
|
|
115
|
-
const pg = await LedgerPaymentGateway.for(this, gateway.paymentGateway);
|
|
116
|
-
const { url, content } = await pg.createPayment(host, gateway, order, pa);
|
|
117
|
-
payment.url = url;
|
|
118
|
-
payment.content = content.render();
|
|
119
|
-
return payment;
|
|
120
138
|
}
|
|
121
139
|
async refund(payment) {
|
|
122
140
|
const gateway = await this.db.storePaymentGateways.statements.select({}, { accountID: payment.gatewayID });
|
|
@@ -153,14 +171,14 @@ let StorePaymentGatewayService = class StorePaymentGatewayService {
|
|
|
153
171
|
.include((x) => x.lineItems)
|
|
154
172
|
.first();
|
|
155
173
|
if (order.status !== "paid") {
|
|
156
|
-
const
|
|
174
|
+
const env_2 = { stack: [], error: void 0, hasError: false };
|
|
157
175
|
try {
|
|
158
|
-
const scope = __addDisposableResource(
|
|
176
|
+
const scope = __addDisposableResource(env_2, ServiceProvider.from(this).createScope(), false);
|
|
159
177
|
const db = scope.resolve(SocialMailContext);
|
|
160
178
|
if (order) {
|
|
161
|
-
const
|
|
179
|
+
const env_3 = { stack: [], error: void 0, hasError: false };
|
|
162
180
|
try {
|
|
163
|
-
const tx = __addDisposableResource(
|
|
181
|
+
const tx = __addDisposableResource(env_3, await db.connection.createTransaction(), true);
|
|
164
182
|
await db.storeJournals.statements.update({
|
|
165
183
|
status: "paid",
|
|
166
184
|
dateUpdated: DateTime.now
|
|
@@ -191,14 +209,14 @@ let StorePaymentGatewayService = class StorePaymentGatewayService {
|
|
|
191
209
|
order.journalType = "sales-invoice";
|
|
192
210
|
await tx.commit();
|
|
193
211
|
}
|
|
194
|
-
catch (
|
|
195
|
-
|
|
196
|
-
|
|
212
|
+
catch (e_2) {
|
|
213
|
+
env_3.error = e_2;
|
|
214
|
+
env_3.hasError = true;
|
|
197
215
|
}
|
|
198
216
|
finally {
|
|
199
|
-
const
|
|
200
|
-
if (
|
|
201
|
-
await
|
|
217
|
+
const result_2 = __disposeResources(env_3);
|
|
218
|
+
if (result_2)
|
|
219
|
+
await result_2;
|
|
202
220
|
}
|
|
203
221
|
}
|
|
204
222
|
const js = scope.resolve(JournalService);
|
|
@@ -209,13 +227,17 @@ let StorePaymentGatewayService = class StorePaymentGatewayService {
|
|
|
209
227
|
const entry = db.changeSet.getEntry(journal);
|
|
210
228
|
await js.syncEntries(entry, journal);
|
|
211
229
|
await db.saveChanges();
|
|
230
|
+
// mark subscription as active it if it is currentOrderID
|
|
231
|
+
await db.storeSubscriptions
|
|
232
|
+
.where(order, (x, p) => x.currentOrderID === p.journalID)
|
|
233
|
+
.update(() => ({ status: "active" }));
|
|
212
234
|
}
|
|
213
|
-
catch (
|
|
214
|
-
|
|
215
|
-
|
|
235
|
+
catch (e_3) {
|
|
236
|
+
env_2.error = e_3;
|
|
237
|
+
env_2.hasError = true;
|
|
216
238
|
}
|
|
217
239
|
finally {
|
|
218
|
-
__disposeResources(
|
|
240
|
+
__disposeResources(env_2);
|
|
219
241
|
}
|
|
220
242
|
}
|
|
221
243
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StorePaymentGatewayService.js","sourceRoot":"","sources":["../../../../src/server/services/store/StorePaymentGatewayService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,MAAM,EAAE,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AACrG,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,oBAAoB,MAAM,2BAA2B,CAAC;AAE7D,OAAO,0BAA0B,MAAM,yDAAyD,CAAC;AACjG,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAE3E,OAAO,cAAc,MAAM,+BAA+B,CAAC;AAG3D;;;;;;;;;;GAUG;AAEY,IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IAQ3C,KAAK,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,GAAG,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"StorePaymentGatewayService.js","sourceRoot":"","sources":["../../../../src/server/services/store/StorePaymentGatewayService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StoreSubscriptionService.d.ts","sourceRoot":"","sources":["../../../../../src/server/services/store/subscriptions/StoreSubscriptionService.ts"],"names":[],"mappings":"AACA,OAAO,iBAAiB,MAAM,qCAAqC,CAAC;AACpE,OAAO,iBAAiB,MAAM,8CAA8C,CAAC;AAE7E,OAAO,0BAA0B,MAAM,kCAAkC,CAAC;AAI1E,MAAM,CAAC,OAAO,OAAO,wBAAwB;IAEzC,MAAM,CAAC,UAAU,CAAC,KAAK,KAAA;IAQvB,EAAE,EAAE,iBAAiB,CAAC;IAGtB,GAAG,EAAE,0BAA0B,CAAC;IAE1B,mBAAmB,CAAC,YAAY,EAAE,iBAAiB;
|
|
1
|
+
{"version":3,"file":"StoreSubscriptionService.d.ts","sourceRoot":"","sources":["../../../../../src/server/services/store/subscriptions/StoreSubscriptionService.ts"],"names":[],"mappings":"AACA,OAAO,iBAAiB,MAAM,qCAAqC,CAAC;AACpE,OAAO,iBAAiB,MAAM,8CAA8C,CAAC;AAE7E,OAAO,0BAA0B,MAAM,kCAAkC,CAAC;AAI1E,MAAM,CAAC,OAAO,OAAO,wBAAwB;IAEzC,MAAM,CAAC,UAAU,CAAC,KAAK,KAAA;IAQvB,EAAE,EAAE,iBAAiB,CAAC;IAGtB,GAAG,EAAE,0BAA0B,CAAC;IAE1B,mBAAmB,CAAC,YAAY,EAAE,iBAAiB;CA+F5D"}
|
|
@@ -119,7 +119,7 @@ let StoreSubscriptionService = StoreSubscriptionService_1 = class StoreSubscript
|
|
|
119
119
|
renewalDate = renewalDate.addYears(itemPrice.interval || 1);
|
|
120
120
|
break;
|
|
121
121
|
}
|
|
122
|
-
if (renewalDate.msSinceEpoch > now.msSinceEpoch) {
|
|
122
|
+
if (renewalDate.msSinceEpoch > now.msSinceEpoch && /paid/i.test(lastPaidAttempt.status)) {
|
|
123
123
|
// subscription is active...
|
|
124
124
|
subscription.status = "active";
|
|
125
125
|
await db.storeSubscriptions.statements.update({
|
|
@@ -145,6 +145,7 @@ let StoreSubscriptionService = StoreSubscriptionService_1 = class StoreSubscript
|
|
|
145
145
|
lineItems: [
|
|
146
146
|
db.storeJournalLineItems.add({
|
|
147
147
|
itemPriceID,
|
|
148
|
+
itemID: itemPrice.storeItemID,
|
|
148
149
|
quantity: 1
|
|
149
150
|
})
|
|
150
151
|
]
|
|
@@ -154,7 +155,7 @@ let StoreSubscriptionService = StoreSubscriptionService_1 = class StoreSubscript
|
|
|
154
155
|
}
|
|
155
156
|
// once the order is paid
|
|
156
157
|
// we should convert it to sales-invoice
|
|
157
|
-
const host = await this.db.websiteFolderHosts.where({ storeID }, (x, p) => x.folderID === p.storeID)
|
|
158
|
+
const { host } = await this.db.websiteFolderHosts.where({ storeID }, (x, p) => x.folderID === p.storeID)
|
|
158
159
|
.first();
|
|
159
160
|
await this.pgs.checkout({ host, storeID, orderID: currentOrderID });
|
|
160
161
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StoreSubscriptionService.js","sourceRoot":"","sources":["../../../../../src/server/services/store/subscriptions/StoreSubscriptionService.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"StoreSubscriptionService.js","sourceRoot":"","sources":["../../../../../src/server/services/store/subscriptions/StoreSubscriptionService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DownloadGeoEntitiesWorkflow.d.ts","sourceRoot":"","sources":["../../../../src/server/workflows/geo-entities/DownloadGeoEntitiesWorkflow.ts"],"names":[],"mappings":"AAEA,OAAO,QAA4B,MAAM,yDAAyD,CAAC;AACnG,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAEjE,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAG/D,OAAO,eAAe,MAAM,gEAAgE,CAAC;AAC7F,OAAO,SAAS,EAAE,EAAE,OAAO,EAAE,MAAM,mCAAmC,CAAC;AAMvE;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,2BAA4B,SAAQ,QAAQ;IAE7D,MAAM,CAAC,SAAS,SAAW;IAE3B,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,eAAe;IAMrC,KAAK,kCAAyC;IAExC,GAAG;IAcH,gBAAgB,CAClB,IAAI,EAAE,OAAO,EACL,EAAE,CAAC,EAAE,iBAAiB;
|
|
1
|
+
{"version":3,"file":"DownloadGeoEntitiesWorkflow.d.ts","sourceRoot":"","sources":["../../../../src/server/workflows/geo-entities/DownloadGeoEntitiesWorkflow.ts"],"names":[],"mappings":"AAEA,OAAO,QAA4B,MAAM,yDAAyD,CAAC;AACnG,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAEjE,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAG/D,OAAO,eAAe,MAAM,gEAAgE,CAAC;AAC7F,OAAO,SAAS,EAAE,EAAE,OAAO,EAAE,MAAM,mCAAmC,CAAC;AAMvE;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,2BAA4B,SAAQ,QAAQ;IAE7D,MAAM,CAAC,SAAS,SAAW;IAE3B,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,eAAe;IAMrC,KAAK,kCAAyC;IAExC,GAAG;IAcH,gBAAgB,CAClB,IAAI,EAAE,OAAO,EACL,EAAE,CAAC,EAAE,iBAAiB;IAwC5B,oBAAoB,CACd,EAAE,CAAC,EAAE,iBAAiB,EACtB,GAAG,CAAC,EAAE,eAAe;IAc3B,iBAAiB,CAAC,GAAG,EAAE,eAAe,EAAE,EAAE,EAAE,iBAAiB;IA+E7D,IAAI,CAAC,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,KAAA,EAAE,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC;IAejF,cAAc,CAAC,GAAG,EAAE,eAAe,EAAE,EAAE,EAAE,iBAAiB;IA8C1D,cAAc,CAAC,GAAG,EAAE,eAAe,EAAE,EAAE,EAAE,iBAAiB;IA8EhE,SAAS,CAAC,GAAG,KAAA,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,SAAS,CAAC;IASrC,MAAM,CAAC,EAAE,EAAE,iBAAiB;CAQrC"}
|
|
@@ -89,7 +89,7 @@ class DownloadGeoEntitiesWorkflow extends Workflow {
|
|
|
89
89
|
});
|
|
90
90
|
}
|
|
91
91
|
async run() {
|
|
92
|
-
if (!globalEnv.isRootHost) {
|
|
92
|
+
if (!globalEnv.isRootHost || globalEnv.otpIn.host) {
|
|
93
93
|
// download from parent...
|
|
94
94
|
await this.downloadFromHost("country");
|
|
95
95
|
await this.downloadFromHost("state");
|
|
@@ -99,7 +99,11 @@ class DownloadGeoEntitiesWorkflow extends Workflow {
|
|
|
99
99
|
await this.downloadFromGeoNames();
|
|
100
100
|
}
|
|
101
101
|
async downloadFromHost(type, db) {
|
|
102
|
-
|
|
102
|
+
// get past from last saved geotype
|
|
103
|
+
const last = await db.geoEntities.where({ type }, (x, p) => x.type === p.type)
|
|
104
|
+
.orderByDescending((x) => x.dateUpdated)
|
|
105
|
+
.first();
|
|
106
|
+
const past = last?.dateUpdated;
|
|
103
107
|
const client = SecureFetchBuilder
|
|
104
108
|
.url(`https://${globalEnv.otpIn.host}/`)
|
|
105
109
|
.logWhenFailed(console.error)
|
|
@@ -108,11 +112,14 @@ class DownloadGeoEntitiesWorkflow extends Workflow {
|
|
|
108
112
|
for (;;) {
|
|
109
113
|
let q = new QueryBuilder(client, GeoEntity.name);
|
|
110
114
|
q = q.where({ start, type, past }, (p) => (x) => x.type === p.type
|
|
111
|
-
&& x.geoEntityID > p.start
|
|
112
|
-
|
|
115
|
+
&& x.geoEntityID > p.start);
|
|
116
|
+
if (past) {
|
|
117
|
+
q = q.where({ past }, (p) => (x) => x.dateUpdated > p.past);
|
|
118
|
+
}
|
|
113
119
|
const { items, more } = await q.orderBy(void 0, (p) => (x) => x.geoEntityID)
|
|
114
120
|
.range(0, 1000)
|
|
115
121
|
.toPage();
|
|
122
|
+
console.log(`Downloaded ${items.length} items for ${type}`);
|
|
116
123
|
for (const item of items) {
|
|
117
124
|
start = item.geoEntityID;
|
|
118
125
|
await this.save(db, type, item.externalID, item);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DownloadGeoEntitiesWorkflow.js","sourceRoot":"","sources":["../../../../src/server/workflows/geo-entities/DownloadGeoEntitiesWorkflow.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,QAAQ,EAAE,EAAE,cAAc,EAAE,MAAM,yDAAyD,CAAC;AACnG,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAC/D,OAAO,UAAU,MAAM,qDAAqD,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,OAAO,SAAsB,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,YAAY,MAAM,iCAAiC,CAAC;AAC3D,OAAO,kBAAkB,MAAM,6CAA6C,CAAC;AAC7E,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAE/D;;GAEG;AACH,MAAqB,2BAA4B,SAAQ,QAAQ;IAAjE;;QAUI,UAAK,GAAG,IAAI,GAAG,EAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"DownloadGeoEntitiesWorkflow.js","sourceRoot":"","sources":["../../../../src/server/workflows/geo-entities/DownloadGeoEntitiesWorkflow.ts"],"names":[],"mappings":"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"}
|