@winible/winible-typed 1.0.5 → 1.0.6
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/migrations/20221122051433-default-plan.js +13 -0
- package/dist/migrations/20221122051433-default-plan.js.map +1 -0
- package/dist/scripts/payoutRecurlySubs.js +12 -1
- package/dist/scripts/payoutRecurlySubs.js.map +1 -1
- package/dist/scripts/payoutSubscriptions.js +23 -15
- package/dist/scripts/payoutSubscriptions.js.map +1 -1
- package/dist/typed-model/subscription-plan.js +4 -0
- package/dist/typed-model/subscription-plan.js.map +1 -1
- package/package.json +1 -1
- package/typed-model/subscription-plan.ts +6 -0
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const sequelize_1 = require("sequelize");
|
|
4
|
+
exports.default = {
|
|
5
|
+
async up(queryInterface, sequelize) {
|
|
6
|
+
queryInterface.addColumn("subscription_plans", "order", {
|
|
7
|
+
type: sequelize_1.DataTypes.INTEGER,
|
|
8
|
+
defaultValue: 0,
|
|
9
|
+
});
|
|
10
|
+
},
|
|
11
|
+
async down(queryInterface, sequelize) { },
|
|
12
|
+
};
|
|
13
|
+
//# sourceMappingURL=20221122051433-default-plan.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"20221122051433-default-plan.js","sourceRoot":"","sources":["../../migrations/20221122051433-default-plan.ts"],"names":[],"mappings":";;AAAA,yCAAqE;AAErE,kBAAe;IACb,KAAK,CAAC,EAAE,CAAC,cAA8B,EAAE,SAAoB;QAC3D,cAAc,CAAC,SAAS,CAAC,oBAAoB,EAAE,OAAO,EAAE;YACtD,IAAI,EAAE,qBAAS,CAAC,OAAO;YACvB,YAAY,EAAE,CAAC;SAChB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,cAA8B,EAAE,SAAoB,IAAG,CAAC;CACpE,CAAC"}
|
|
@@ -22,7 +22,13 @@ class ActiveSub {
|
|
|
22
22
|
if (!this._recurlySub.autoRenew) {
|
|
23
23
|
return true;
|
|
24
24
|
}
|
|
25
|
-
return ["canceled", "expired", "failed", "paused"].includes(this.
|
|
25
|
+
return ["canceled", "expired", "failed", "paused"].includes(this.getRecurlyStatus());
|
|
26
|
+
}
|
|
27
|
+
getRecurlyStatus() {
|
|
28
|
+
return this._recurlySub.state;
|
|
29
|
+
}
|
|
30
|
+
getWinibleStatus() {
|
|
31
|
+
return this._subscription.status;
|
|
26
32
|
}
|
|
27
33
|
async cancelRecurlySubscription() {
|
|
28
34
|
console.log("cancelRecurlySubscription");
|
|
@@ -95,6 +101,11 @@ const run = async () => {
|
|
|
95
101
|
});
|
|
96
102
|
if (!activeSub)
|
|
97
103
|
continue;
|
|
104
|
+
if (activeSub.getWinibleStatus() != activeSub.getRecurlyStatus()) {
|
|
105
|
+
console.log("Updating winible status" + sub.numberOfPayments);
|
|
106
|
+
sub.status = activeSub.getRecurlyStatus();
|
|
107
|
+
await sub.save();
|
|
108
|
+
}
|
|
98
109
|
if (activeSub.getNumberOfRecurlyPayments() == sub.numberOfPayments) {
|
|
99
110
|
console.log("activeSub.getNumberOfRecurlyPayments(): " +
|
|
100
111
|
activeSub.getNumberOfRecurlyPayments());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"payoutRecurlySubs.js","sourceRoot":"","sources":["../../scripts/payoutRecurlySubs.ts"],"names":[],"mappings":";;AAAA,iCAAkC;AAElC,gDAKwB;AAExB,yCAAsC;AAEtC,iCAAkC;AAClC,gCAAyC;AAGzC,MAAM,CAAC,MAAM,EAAE,CAAC;AAEhB,MAAM,SAAS;IAQb,YACE,YAA0B,EAC1B,gBAAkC,EAClC,KAAiB,EACjB,kBAA0B,EAC1B,oBAA6B,EAC7B,mBAAiC;QAEjC,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC;QAClC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,iBAAiB,GAAG,gBAAgB,CAAC;QAC1C,IAAI,CAAC,mBAAmB,GAAG,kBAAkB,CAAC;QAC9C,IAAI,CAAC,qBAAqB,GAAG,oBAAoB,CAAC;QAClD,IAAI,CAAC,WAAW,GAAG,mBAAmB,CAAC;IACzC,CAAC;IAED,mBAAmB;QACjB,OAAO,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC;IACzC,CAAC;IAED,mBAAmB;QACjB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE;YAC/B,OAAO,IAAI,CAAC;SACb;QACD,OAAO,CAAC,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,QAAQ,CACzD,IAAI,CAAC,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"payoutRecurlySubs.js","sourceRoot":"","sources":["../../scripts/payoutRecurlySubs.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ const typed_model_1 = require("../typed-model");
|
|
|
5
5
|
const pk_client_1 = require("../src/pk-client");
|
|
6
6
|
const sequelize_1 = require("sequelize");
|
|
7
7
|
const moment = require("moment");
|
|
8
|
+
const customer_profile_1 = require("../typed-model/customer-profile");
|
|
8
9
|
dotenv.config();
|
|
9
10
|
class ActiveSub {
|
|
10
11
|
constructor(subscription, subscriptionPlan, owner, pkSubscription, status, processorId) {
|
|
@@ -55,12 +56,19 @@ class ActiveSub {
|
|
|
55
56
|
console.log("createCreditPayment");
|
|
56
57
|
let transaction = await typed_model_1.pbSequelize.transaction();
|
|
57
58
|
let trans = this.getLatestPayment();
|
|
58
|
-
let cp = await
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
59
|
+
// let cp = await CreditPayments.logSubscriptionPayment(
|
|
60
|
+
// this._subscription.userId,
|
|
61
|
+
// this._owner,
|
|
62
|
+
// Math.round(amountInCents),
|
|
63
|
+
// this._subscription,
|
|
64
|
+
// transaction,
|
|
65
|
+
// trans && trans.getTransId()
|
|
66
|
+
// );
|
|
67
|
+
// if (cp) {
|
|
68
|
+
this._subscription.lastPaymentDate = new Date();
|
|
69
|
+
this._subscription.numberOfPayments = this.getNumberOfAuthorizePayments();
|
|
70
|
+
await this._subscription.save({ transaction });
|
|
71
|
+
// }
|
|
64
72
|
await transaction.commit();
|
|
65
73
|
}
|
|
66
74
|
getNumberOfAuthorizePayments() {
|
|
@@ -100,15 +108,15 @@ class ActiveSub {
|
|
|
100
108
|
if (!subscription.pkSubscriptionId) {
|
|
101
109
|
throw new Error("No pkSubscriptionId for this subscription");
|
|
102
110
|
}
|
|
103
|
-
const profile = await
|
|
104
|
-
|
|
105
|
-
});
|
|
106
|
-
if (!profile) {
|
|
107
|
-
|
|
108
|
-
}
|
|
109
|
-
const status = await (0, pk_client_1.getSubscriptionStatus)(subscription.pkSubscriptionId,
|
|
110
|
-
const pkSub = await (0, pk_client_1.getSubscription)(subscription.pkSubscriptionId,
|
|
111
|
-
return new ActiveSub(subscription, subscriptionPlan, owner, pkSub, status,
|
|
111
|
+
// const profile = await CustomerProfile.findOne({
|
|
112
|
+
// where: { userId: subscription.userId },
|
|
113
|
+
// });
|
|
114
|
+
// if (!profile) {
|
|
115
|
+
// throw new Error("No customer profile for this user");
|
|
116
|
+
// }
|
|
117
|
+
const status = await (0, pk_client_1.getSubscriptionStatus)(subscription.pkSubscriptionId, customer_profile_1.ProcessorId.KAJA);
|
|
118
|
+
const pkSub = await (0, pk_client_1.getSubscription)(subscription.pkSubscriptionId, customer_profile_1.ProcessorId.KAJA);
|
|
119
|
+
return new ActiveSub(subscription, subscriptionPlan, owner, pkSub, status, customer_profile_1.ProcessorId.KAJA);
|
|
112
120
|
}
|
|
113
121
|
}
|
|
114
122
|
const run = async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"payoutSubscriptions.js","sourceRoot":"","sources":["../../scripts/payoutSubscriptions.ts"],"names":[],"mappings":";;AAAA,iCAAkC;AAElC,gDAQwB;AAExB,gDAI0B;AAE1B,yCAA0C;AAE1C,iCAAkC;
|
|
1
|
+
{"version":3,"file":"payoutSubscriptions.js","sourceRoot":"","sources":["../../scripts/payoutSubscriptions.ts"],"names":[],"mappings":"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"}
|
|
@@ -71,6 +71,10 @@ SubscriptionPlan.init({
|
|
|
71
71
|
type: sequelize_1.DataTypes.STRING,
|
|
72
72
|
field: "recurly_plan_id",
|
|
73
73
|
},
|
|
74
|
+
order: {
|
|
75
|
+
type: sequelize_1.DataTypes.INTEGER,
|
|
76
|
+
field: "order",
|
|
77
|
+
},
|
|
74
78
|
createdAt: sequelize_1.DataTypes.DATE,
|
|
75
79
|
updatedAt: sequelize_1.DataTypes.DATE,
|
|
76
80
|
}, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscription-plan.js","sourceRoot":"","sources":["../../typed-model/subscription-plan.ts"],"names":[],"mappings":";;;;;AAAA,yCASmB;AAEnB,kEAAuC;AACvC,gEAAuC;AACvC,kEAA0C;AAC1C,sFAA6D;AAE7D,mEAAmE;AACnE,MAAM,gBAAiB,SAAQ,iBAG9B;
|
|
1
|
+
{"version":3,"file":"subscription-plan.js","sourceRoot":"","sources":["../../typed-model/subscription-plan.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -34,6 +34,7 @@ class SubscriptionPlan extends Model<
|
|
|
34
34
|
declare oneTimePurchase?: boolean;
|
|
35
35
|
declare accessEndDate?: Date;
|
|
36
36
|
declare recurlyPlanId?: string;
|
|
37
|
+
declare order?: number;
|
|
37
38
|
declare createdAt: CreationOptional<Date>;
|
|
38
39
|
declare updatedAt: CreationOptional<Date>;
|
|
39
40
|
static getById: (id: string) => Promise<SubscriptionPlan | null>;
|
|
@@ -108,6 +109,11 @@ SubscriptionPlan.init(
|
|
|
108
109
|
type: DataTypes.STRING,
|
|
109
110
|
field: "recurly_plan_id",
|
|
110
111
|
},
|
|
112
|
+
order: {
|
|
113
|
+
type: DataTypes.INTEGER,
|
|
114
|
+
field: "order",
|
|
115
|
+
defaultValue: 0,
|
|
116
|
+
},
|
|
111
117
|
createdAt: DataTypes.DATE,
|
|
112
118
|
updatedAt: DataTypes.DATE,
|
|
113
119
|
},
|