@sellout/models 0.0.63 → 0.0.64
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/enums/OrderItemTypeEnum.d.ts +4 -0
- package/.dist/enums/OrderItemTypeEnum.js +10 -0
- package/.dist/enums/OrderItemTypeEnum.js.map +1 -0
- package/.dist/graphql/fragments/order.fragment.js +2 -0
- package/.dist/graphql/fragments/order.fragment.js.map +1 -1
- package/.dist/graphql/mutations/attachStripePaymentMethod.mutation.js +10 -1
- package/.dist/graphql/mutations/attachStripePaymentMethod.mutation.js.map +1 -1
- package/.dist/graphql/mutations/breakApartOrder.js +1 -8
- package/.dist/graphql/mutations/breakApartOrder.js.map +1 -1
- package/.dist/graphql/mutations/register.mutation.js +2 -9
- package/.dist/graphql/mutations/register.mutation.js.map +1 -1
- package/.dist/graphql/queries/order.query.js +1 -0
- package/.dist/graphql/queries/order.query.js.map +1 -1
- package/.dist/graphql/queries/publicEvent.query.js +1 -0
- package/.dist/graphql/queries/publicEvent.query.js.map +1 -1
- package/.dist/graphql/queries/userProfile.query.js +3 -2
- package/.dist/graphql/queries/userProfile.query.js.map +1 -1
- package/.dist/interfaces/ICreateOrderParams.d.ts +1 -2
- package/.dist/interfaces/IOrder.d.ts +0 -2
- package/.dist/interfaces/IOrder.js.map +1 -1
- package/.dist/interfaces/IStripeCustomer.d.ts +2 -2
- package/.dist/interfaces/IStripePaymentMethod.d.ts +10 -0
- package/.dist/interfaces/IStripePaymentMethod.js +3 -0
- package/.dist/interfaces/IStripePaymentMethod.js.map +1 -0
- package/.dist/schemas/Order.d.ts +0 -4
- package/.dist/schemas/Order.js +0 -4
- package/.dist/schemas/Order.js.map +1 -1
- package/.dist/sellout-proto.js +463 -116
- package/.dist/utils/PaymentUtil.js +6 -6
- package/.dist/utils/PaymentUtil.js.map +1 -1
- package/package.json +4 -4
- package/src/enums/OrderItemTypeEnum.ts +4 -0
- package/src/graphql/fragments/order.fragment.ts +2 -0
- package/src/graphql/mutations/attachStripePaymentMethod.mutation.ts +10 -1
- package/src/graphql/mutations/breakApartOrder.ts +1 -8
- package/src/graphql/mutations/register.mutation.ts +2 -9
- package/src/graphql/queries/order.query.ts +1 -0
- package/src/graphql/queries/publicEvent.query.ts +1 -0
- package/src/graphql/queries/userProfile.query.ts +3 -2
- package/src/interfaces/ICreateOrderParams.ts +1 -2
- package/src/interfaces/IOrder.ts +0 -2
- package/src/interfaces/IStripeCustomer.ts +2 -2
- package/src/interfaces/{IStripeSource.ts → IStripePaymentMethod.ts} +2 -2
- package/src/proto/order.proto +5 -5
- package/src/proto/stripe.proto +14 -3
- package/src/schemas/Order.ts +0 -4
- package/src/utils/PaymentUtil.ts +6 -6
- package/src/enums/OrderDeliveryMethodEnum.ts +0 -5
|
@@ -56,7 +56,7 @@ exports.default = {
|
|
|
56
56
|
// const minFee = fee.minAppliedToPrice || 0;
|
|
57
57
|
// const maxFee = fee.maxAppliedToPrice || Infinity;
|
|
58
58
|
// if (minFee <= price && price <= maxFee) {
|
|
59
|
-
//
|
|
59
|
+
// console.log(fee);
|
|
60
60
|
// if (fee.type === FeeTypeEnum.Flat) {
|
|
61
61
|
// return price - fee.value;
|
|
62
62
|
// } if (fee.type === FeeTypeEnum.Percent) {
|
|
@@ -81,7 +81,7 @@ exports.default = {
|
|
|
81
81
|
// }
|
|
82
82
|
// tickets = tickets.map((ticket: ICreateOrderTicketParams): ICreateOrderTicketParams => {
|
|
83
83
|
// const price = Math.floor(calculateTicketPrice(ticket));
|
|
84
|
-
//
|
|
84
|
+
// console.log(`Ticket Price: `, price);
|
|
85
85
|
// return {
|
|
86
86
|
// ...ticket,
|
|
87
87
|
// price,
|
|
@@ -178,7 +178,7 @@ exports.default = {
|
|
|
178
178
|
const ticketFeeTotal = tickets.reduce((cur, ticket) => {
|
|
179
179
|
return cur + ticketFees.reduce((cur, fee) => {
|
|
180
180
|
const value = cur + applyTicketFee(ticket, fee);
|
|
181
|
-
console.log(`${fee.name}: ${value}`);
|
|
181
|
+
// console.log(`${fee.name}: ${value}`);
|
|
182
182
|
return value;
|
|
183
183
|
}, 0);
|
|
184
184
|
}, 0);
|
|
@@ -186,12 +186,12 @@ exports.default = {
|
|
|
186
186
|
const upgradeFeeTotal = upgrades.reduce((cur, upgrade) => {
|
|
187
187
|
return cur + upgradeFees.reduce((cur, fee) => cur + applyUpgradeFee(upgrade, fee), 0);
|
|
188
188
|
}, 0);
|
|
189
|
-
const orderSubtotal = ticketTotal + ticketFeeTotal + upgradeTotal + upgradeFeeTotal;
|
|
190
|
-
console.log(`Order SubTotal:`, orderSubtotal);
|
|
189
|
+
const orderSubtotal = Math.round(ticketTotal + ticketFeeTotal + upgradeTotal + upgradeFeeTotal);
|
|
190
|
+
// console.log(`Order SubTotal:`, orderSubtotal);
|
|
191
191
|
const orderTotal = orderFees.reduce((cur, fee) => {
|
|
192
192
|
return applyOrderFee(cur, fee);
|
|
193
193
|
}, orderSubtotal);
|
|
194
|
-
console.log(`Order Total`, orderTotal);
|
|
194
|
+
// console.log(`Order Total`, orderTotal);
|
|
195
195
|
return orderTotal;
|
|
196
196
|
}
|
|
197
197
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PaymentUtil.js","sourceRoot":"","sources":["../../src/utils/PaymentUtil.ts"],"names":[],"mappings":";;AACA,6CAAyF;AACzF,0EAAuE;AAUvE,0BAA0B;AAC1B,yCAAyC;AACzC,2CAA2C;AAC3C,IAAI;AAEJ,kBAAe;IACb,qCAAqC;IACrC,4EAA4E;IAE5E,UAAU;IACV,qBAAqB;IACrB,qBAAqB;IACrB,iBAAiB;IACjB,yBAAyB;IACzB,gBAAgB;IAGhB,mBAAmB;IACnB,wCAAwC;IACxC,8DAA8D;IAC9D,sIAAsI;IACtI,sBAAsB;IACtB,QAAQ;IAER,4DAA4D;IAC5D,oIAAoI;IACpI,sBAAsB;IACtB,QAAQ;IAER,mBAAmB;IACnB,QAAQ;IAER,iFAAiF;IACjF,4BAA4B;IAC5B,kDAAkD;IAClD,uBAAuB;IACvB,UAAU;IACV,oFAAoF;IACpF,mFAAmF;IACnF,+EAA+E;IAC/E,0BAA0B;IAC1B,mDAAmD;IACnD,qBAAqB;IACrB,OAAO;IACP,kBAAkB;IAClB,0CAA0C;IAC1C,iBAAiB;IACjB,kBAAkB;IAClB,6CAA6C;IAC7C,UAAU;IACV,QAAQ;IACR,uBAAuB;IACvB,QAAQ;IAER,sGAAsG;IACtG,4BAA4B;IAC5B,wFAAwF;IACxF,sBAAsB;IACtB,QAAQ;IAER,iDAAiD;IACjD,wDAAwD;IAExD,gDAAgD;
|
|
1
|
+
{"version":3,"file":"PaymentUtil.js","sourceRoot":"","sources":["../../src/utils/PaymentUtil.ts"],"names":[],"mappings":";;AACA,6CAAyF;AACzF,0EAAuE;AAUvE,0BAA0B;AAC1B,yCAAyC;AACzC,2CAA2C;AAC3C,IAAI;AAEJ,kBAAe;IACb,qCAAqC;IACrC,4EAA4E;IAE5E,UAAU;IACV,qBAAqB;IACrB,qBAAqB;IACrB,iBAAiB;IACjB,yBAAyB;IACzB,gBAAgB;IAGhB,mBAAmB;IACnB,wCAAwC;IACxC,8DAA8D;IAC9D,sIAAsI;IACtI,sBAAsB;IACtB,QAAQ;IAER,4DAA4D;IAC5D,oIAAoI;IACpI,sBAAsB;IACtB,QAAQ;IAER,mBAAmB;IACnB,QAAQ;IAER,iFAAiF;IACjF,4BAA4B;IAC5B,kDAAkD;IAClD,uBAAuB;IACvB,UAAU;IACV,oFAAoF;IACpF,mFAAmF;IACnF,+EAA+E;IAC/E,0BAA0B;IAC1B,mDAAmD;IACnD,qBAAqB;IACrB,OAAO;IACP,kBAAkB;IAClB,0CAA0C;IAC1C,iBAAiB;IACjB,kBAAkB;IAClB,6CAA6C;IAC7C,UAAU;IACV,QAAQ;IACR,uBAAuB;IACvB,QAAQ;IAER,sGAAsG;IACtG,4BAA4B;IAC5B,wFAAwF;IACxF,sBAAsB;IACtB,QAAQ;IAER,iDAAiD;IACjD,wDAAwD;IAExD,gDAAgD;IAC1C,oBAAoB;IAC1B,6CAA6C;IAC7C,oCAAoC;IACpC,kDAAkD;IAClD,gDAAgD;IAChD,UAAU;IACV,QAAQ;IAGR,gDAAgD;IAChD,iDAAiD;IACjD,WAAW;IAEX,6CAA6C;IAC7C,qCAAqC;IACrC,WAAW;IAEX,oBAAoB;IACpB,MAAM;IAEN,8EAA8E;IAC9E,gDAAgD;IAEhD,qDAAqD;IAErD,4CAA4C;IAC5C,wDAAwD;IACxD,qBAAqB;IACrB,wBAAwB;IAExB,MAAM;IAEN,4FAA4F;IAC5F,8DAA8D;IAC1D,wCAAwC;IAC5C,eAAe;IACf,mBAAmB;IACnB,eAAe;IACf,QAAQ;IACR,QAAQ;IAIR,oGAAoG;IACpG,kBAAkB;IAClB,uBAAuB;IACvB,kDAAkD;IAClD,WAAW;IACX,WAAW;IAEX,aAAa;IACb,eAAe;IACf,gBAAgB;IAChB,OAAO;IACP,KAAK;IACL,cAAc,CAAC,MAAgC;QAE7C,IAAI,EACF,OAAO,GAAG,EAAE,EACZ,QAAQ,GAAG,EAAE,EACb,IAAI,GAAG,EAAE,EACT,iBAAiB,GAClB,GAAG,MAAM,CAAC;QAEX,8BAA8B;QAC9B,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM;YAAE,OAAO,CAAC,CAAC;QAElD,cAAc;QACd,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAS,EAAE,EAAE;YAC/B,uDAAuD;YACvD,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,qBAAc,CAAC,UAAU,CAAC,IAAI,iBAAiB,KAAK,6CAAqB,CAAC,UAAU,EAAE;gBAC5H,OAAO,KAAK,CAAC;aACd;YAED,qDAAqD;YACrD,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,qBAAc,CAAC,SAAS,CAAC,IAAI,iBAAiB,KAAK,6CAAqB,CAAC,SAAS,EAAE;gBAC1H,OAAO,KAAK,CAAC;aACd;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,uBAAgB,CAAC,MAAM,CAAC;aACzE,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;YACjB,IAAI,IAAI,KAAK,kBAAW,CAAC,IAAI;gBAAE,OAAO,CAAC,CAAC,CAAC;;gBACpC,OAAO,CAAC,CAAC;QAChB,CAAC,CAAC,CAAA;QACJ,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,uBAAgB,CAAC,OAAO,CAAC,CAAC;QAC/E,8EAA8E;QAC9E,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,uBAAgB,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;YAC3F,IAAI,IAAI,KAAK,MAAM;gBAAE,OAAO,CAAC,CAAC,CAAC;;gBAC1B,OAAO,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;QAGH,SAAS,cAAc,CAAC,MAAgC,EAAE,GAAS;YACjE,mCAAmC;YACnC,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,qBAAc,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;gBAC9E,OAAO,CAAC,CAAC;aACV;YAED,MAAM,MAAM,GAAG,GAAG,CAAC,iBAAiB,IAAI,CAAC,CAAC;YAC1C,MAAM,MAAM,GAAG,GAAG,CAAC,iBAAiB,IAAI,QAAQ,CAAC;YAEjD,IAAI,MAAM,IAAI,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,IAAI,MAAM,EAAE;gBACpD,IAAI,GAAG,CAAC,IAAI,KAAK,kBAAW,CAAC,IAAI,EAAE;oBACjC,OAAO,GAAG,CAAC,KAAK,CAAC;iBAClB;gBAAC,IAAI,GAAG,CAAC,IAAI,KAAK,kBAAW,CAAC,OAAO,EAAE;oBACtC,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG,GAAG,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC;iBACzC;aACF;iBAAM;gBACL,OAAO,CAAC,CAAC;aACV;YAED,OAAO,CAAC,CAAC;QACX,CAAC;QAED,SAAS,eAAe,CAAC,OAAkC,EAAE,GAAS;YACpE,MAAM,MAAM,GAAG,GAAG,CAAC,iBAAiB,IAAI,CAAC,CAAC;YAC1C,MAAM,MAAM,GAAG,GAAG,CAAC,iBAAiB,IAAI,QAAQ,CAAC;YAEjD,IAAI,MAAM,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,IAAI,MAAM,EAAE;gBACtD,IAAI,GAAG,CAAC,IAAI,KAAK,kBAAW,CAAC,IAAI,EAAE;oBACjC,OAAO,OAAO,CAAC,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC;iBAClC;gBAAC,IAAI,GAAG,CAAC,IAAI,KAAK,kBAAW,CAAC,OAAO,EAAE;oBACtC,OAAO,CAAC,OAAO,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC;iBAChD;aACF;iBAAM;gBACL,OAAO,CAAC,CAAC;aACV;YAED,OAAO,CAAC,CAAC;QACX,CAAC;QAED,SAAS,aAAa,CAAC,aAAa,EAAE,GAAG;YACvC,IAAI,GAAG,CAAC,IAAI,KAAK,kBAAW,CAAC,IAAI,EAAE;gBACjC,OAAO,aAAa,GAAG,GAAG,CAAC,KAAK,CAAC;aAClC;YAAC,IAAI,GAAG,CAAC,IAAI,KAAK,kBAAW,CAAC,OAAO,EAAE;gBACtC,OAAO,CAAC,aAAa,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC;aAChD;QACH,CAAC;QAED,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,GAAG,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAE3E,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;YACpD,OAAO,GAAG,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;gBAC1C,MAAM,KAAK,GAAG,GAAG,GAAG,cAAc,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;gBAChD,wCAAwC;gBACxC,OAAO,KAAK,CAAC;YACf,CAAC,EAAE,CAAC,CAAC,CAAC;QACR,CAAC,EAAE,CAAC,CAAC,CAAC;QAEN,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,CAAC,GAAG,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAE/E,MAAM,eAAe,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE;YACvD,OAAO,GAAG,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,eAAe,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QACxF,CAAC,EAAE,CAAC,CAAC,CAAC;QAEN,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,cAAc,GAAG,YAAY,GAAG,eAAe,CAAC,CAAC;QAEhG,iDAAiD;QAEjD,MAAM,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAC/C,OAAO,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACjC,CAAC,EAAE,aAAa,CAAC,CAAC;QAElB,0CAA0C;QAE1C,OAAO,UAAU,CAAC;IACpB,CAAC;CACF,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sellout/models",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.64",
|
|
4
4
|
"description": "Sellout.io models",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -16,8 +16,8 @@
|
|
|
16
16
|
"author": "samheutmaker@gmail.com",
|
|
17
17
|
"license": "MIT",
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"@sellout/service": "^0.0.
|
|
20
|
-
"@sellout/utils": "^0.0.
|
|
19
|
+
"@sellout/service": "^0.0.64",
|
|
20
|
+
"@sellout/utils": "^0.0.64",
|
|
21
21
|
"@types/shortid": "0.0.29",
|
|
22
22
|
"apollo-link-debounce": "^2.1.0",
|
|
23
23
|
"graphql": "^14.6.0",
|
|
@@ -30,5 +30,5 @@
|
|
|
30
30
|
"protobufjs": "~6.10.1",
|
|
31
31
|
"typescript": "^3.8.3"
|
|
32
32
|
},
|
|
33
|
-
"gitHead": "
|
|
33
|
+
"gitHead": "33349f3d3da7633d43b091f233c5de22b6df6ee1"
|
|
34
34
|
}
|
|
@@ -2,7 +2,16 @@ import gql from 'graphql-tag';
|
|
|
2
2
|
|
|
3
3
|
const mutation = gql`
|
|
4
4
|
mutation attachStripePaymentMethod($paymentMethodId: String!) {
|
|
5
|
-
attachStripePaymentMethod(paymentMethodId: $paymentMethodId)
|
|
5
|
+
attachStripePaymentMethod(paymentMethodId: $paymentMethodId) {
|
|
6
|
+
paymentMethodId
|
|
7
|
+
brand
|
|
8
|
+
last4
|
|
9
|
+
expMonth
|
|
10
|
+
expYear
|
|
11
|
+
funding
|
|
12
|
+
country
|
|
13
|
+
type
|
|
14
|
+
}
|
|
6
15
|
}
|
|
7
16
|
`;
|
|
8
17
|
|
|
@@ -8,17 +8,13 @@ const mutation = gql`
|
|
|
8
8
|
event {
|
|
9
9
|
_id
|
|
10
10
|
name
|
|
11
|
-
|
|
12
|
-
sendQRCode
|
|
11
|
+
subtitle
|
|
13
12
|
performances {
|
|
14
13
|
schedule {
|
|
15
14
|
doorsAt
|
|
16
15
|
startsAt
|
|
17
16
|
}
|
|
18
17
|
}
|
|
19
|
-
schedule {
|
|
20
|
-
startsAt
|
|
21
|
-
}
|
|
22
18
|
venue {
|
|
23
19
|
name
|
|
24
20
|
address {
|
|
@@ -31,9 +27,6 @@ const mutation = gql`
|
|
|
31
27
|
}
|
|
32
28
|
}
|
|
33
29
|
state
|
|
34
|
-
refundedAmount
|
|
35
|
-
refundReason
|
|
36
|
-
promotionCode
|
|
37
30
|
type
|
|
38
31
|
...OrderTickets
|
|
39
32
|
...OrderUpgrades
|
|
@@ -3,15 +3,8 @@ import gql from 'graphql-tag';
|
|
|
3
3
|
const mutation = gql`
|
|
4
4
|
mutation Register($user: UserInput!) {
|
|
5
5
|
register(user: $user) {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
firstName
|
|
9
|
-
lastName
|
|
10
|
-
email
|
|
11
|
-
phoneNumber
|
|
12
|
-
createdAt
|
|
13
|
-
}
|
|
14
|
-
token
|
|
6
|
+
registered
|
|
7
|
+
emailVerified
|
|
15
8
|
}
|
|
16
9
|
}
|
|
17
10
|
`;
|
|
@@ -4,6 +4,7 @@ const query = gql`
|
|
|
4
4
|
query userProfile {
|
|
5
5
|
userProfile {
|
|
6
6
|
user {
|
|
7
|
+
_id
|
|
7
8
|
firstName
|
|
8
9
|
lastName
|
|
9
10
|
phoneNumber
|
|
@@ -11,8 +12,8 @@ const query = gql`
|
|
|
11
12
|
}
|
|
12
13
|
stripeCustomerId
|
|
13
14
|
stripeCustomer {
|
|
14
|
-
|
|
15
|
-
|
|
15
|
+
paymentMethods {
|
|
16
|
+
paymentMethodId
|
|
16
17
|
brand
|
|
17
18
|
last4
|
|
18
19
|
expMonth
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import IOrderCustomField from "../interfaces/IOrderCustomField";
|
|
2
2
|
import { OrderTypeEnum } from "../interfaces/IOrderType";
|
|
3
|
-
import { OrderDeliveryMethodEnum } from "../enums/OrderDeliveryMethodEnum";
|
|
4
3
|
import { PaymentMethodTypeEnum } from '../enums/PaymentMethodTypeEnum';
|
|
5
4
|
|
|
6
5
|
export default interface ICreateOrderParams {
|
|
@@ -12,8 +11,8 @@ export default interface ICreateOrderParams {
|
|
|
12
11
|
type: OrderTypeEnum;
|
|
13
12
|
promotionCode: string;
|
|
14
13
|
customFields: IOrderCustomField[];
|
|
15
|
-
deliveryMethod: OrderDeliveryMethodEnum;
|
|
16
14
|
paymentMethodType: PaymentMethodTypeEnum;
|
|
15
|
+
paymentMethodId: string;
|
|
17
16
|
holdToken?: string;
|
|
18
17
|
}
|
|
19
18
|
|
package/src/interfaces/IOrder.ts
CHANGED
|
@@ -5,7 +5,6 @@ import IOrderUpgrade from './IOrderUpgrade';
|
|
|
5
5
|
import IOrderCustomField from './IOrderCustomField'
|
|
6
6
|
import { OrderStateEnum } from './IOrderState';
|
|
7
7
|
import { OrderTypeEnum } from './IOrderType';
|
|
8
|
-
import { OrderDeliveryMethodEnum } from "../enums/OrderDeliveryMethodEnum";
|
|
9
8
|
|
|
10
9
|
export default interface IOrder {
|
|
11
10
|
_id?: string;
|
|
@@ -33,5 +32,4 @@ export default interface IOrder {
|
|
|
33
32
|
customFields?: IOrderCustomField[];
|
|
34
33
|
refundReason?: string; // BACKFILL
|
|
35
34
|
payments: IPayment[];
|
|
36
|
-
deliveryMethod: OrderDeliveryMethodEnum,
|
|
37
35
|
};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import
|
|
1
|
+
import IStripePaymentMethod from './IStripePaymentMethod';
|
|
2
2
|
|
|
3
3
|
export default interface IStripeCustomer {
|
|
4
4
|
stripeCustomerId: string;
|
|
5
5
|
email: string;
|
|
6
|
-
|
|
6
|
+
paymentMethods: IStripePaymentMethod[];
|
|
7
7
|
}
|
package/src/proto/order.proto
CHANGED
|
@@ -32,7 +32,6 @@ message Order {
|
|
|
32
32
|
repeated OrderCustomField customFields = 21;
|
|
33
33
|
string refundReason = 22;
|
|
34
34
|
repeated Payment payments = 23;
|
|
35
|
-
string deliveryMethod = 24;
|
|
36
35
|
}
|
|
37
36
|
|
|
38
37
|
message OrderTicket {
|
|
@@ -47,6 +46,7 @@ message OrderTicket {
|
|
|
47
46
|
Refund refund = 8;
|
|
48
47
|
Scan scan = 9;
|
|
49
48
|
string state = 10;
|
|
49
|
+
string qrCodeUrl = 11;
|
|
50
50
|
}
|
|
51
51
|
|
|
52
52
|
message OrderUpgrade {
|
|
@@ -59,6 +59,7 @@ message OrderUpgrade {
|
|
|
59
59
|
Refund refund = 6;
|
|
60
60
|
Scan scan = 7;
|
|
61
61
|
string state = 8;
|
|
62
|
+
string qrCodeUrl = 9;
|
|
62
63
|
}
|
|
63
64
|
|
|
64
65
|
message Scan {
|
|
@@ -108,10 +109,9 @@ message CreateOrderParams {
|
|
|
108
109
|
string type = 5;
|
|
109
110
|
string promotionCode = 6;
|
|
110
111
|
repeated OrderCustomField customFields = 7;
|
|
111
|
-
string
|
|
112
|
-
string
|
|
113
|
-
string
|
|
114
|
-
string ipAddress = 11;
|
|
112
|
+
string paymentMethodType = 8;
|
|
113
|
+
string holdToken = 9;
|
|
114
|
+
string ipAddress = 10;
|
|
115
115
|
}
|
|
116
116
|
|
|
117
117
|
message CreateOrderTicketParams {
|
package/src/proto/stripe.proto
CHANGED
|
@@ -22,7 +22,7 @@ message StripeCharge {
|
|
|
22
22
|
message StripeCustomer {
|
|
23
23
|
string stripeCustomerId = 0;
|
|
24
24
|
string email = 1;
|
|
25
|
-
repeated
|
|
25
|
+
repeated StripePaymentMethod paymentMethods = 2;
|
|
26
26
|
}
|
|
27
27
|
|
|
28
28
|
message StripeSource {
|
|
@@ -36,6 +36,17 @@ message StripeSource {
|
|
|
36
36
|
string type = 7;
|
|
37
37
|
}
|
|
38
38
|
|
|
39
|
+
message StripePaymentMethod {
|
|
40
|
+
string paymentMethodId = 0;
|
|
41
|
+
string brand = 1;
|
|
42
|
+
string last4 = 2;
|
|
43
|
+
string expMonth = 3;
|
|
44
|
+
string expYear = 4;
|
|
45
|
+
string funding = 5;
|
|
46
|
+
string country = 6;
|
|
47
|
+
string type = 7;
|
|
48
|
+
}
|
|
49
|
+
|
|
39
50
|
/***************************************************************************************
|
|
40
51
|
Connect Account
|
|
41
52
|
****************************************************************************************/
|
|
@@ -122,7 +133,6 @@ message RetrieveStripeChargeResponse {
|
|
|
122
133
|
message CreateStripeCustomerRequest {
|
|
123
134
|
string spanContext = 0;
|
|
124
135
|
string userId = 1;
|
|
125
|
-
string stripeToken = 2;
|
|
126
136
|
}
|
|
127
137
|
|
|
128
138
|
message CreateStripeCustomerResponse {
|
|
@@ -189,7 +199,7 @@ message AttachStripePaymentMethodRequest {
|
|
|
189
199
|
message AttachStripePaymentMethodResponse {
|
|
190
200
|
StatusCode status = 0;
|
|
191
201
|
repeated Error errors = 1;
|
|
192
|
-
|
|
202
|
+
StripePaymentMethod paymentMethod = 2;
|
|
193
203
|
}
|
|
194
204
|
|
|
195
205
|
/***************************************************************************************
|
|
@@ -210,6 +220,7 @@ message CreateStripePaymentIntentRequest {
|
|
|
210
220
|
int32 feeAmount = 5;
|
|
211
221
|
string description = 6;
|
|
212
222
|
string currency = 7;
|
|
223
|
+
string paymentMethodId = 8;
|
|
213
224
|
}
|
|
214
225
|
|
|
215
226
|
message CreateStripePaymentIntentResponse {
|
package/src/schemas/Order.ts
CHANGED
package/src/utils/PaymentUtil.ts
CHANGED
|
@@ -74,7 +74,7 @@ export default {
|
|
|
74
74
|
// const maxFee = fee.maxAppliedToPrice || Infinity;
|
|
75
75
|
|
|
76
76
|
// if (minFee <= price && price <= maxFee) {
|
|
77
|
-
|
|
77
|
+
// console.log(fee);
|
|
78
78
|
// if (fee.type === FeeTypeEnum.Flat) {
|
|
79
79
|
// return price - fee.value;
|
|
80
80
|
// } if (fee.type === FeeTypeEnum.Percent) {
|
|
@@ -108,7 +108,7 @@ export default {
|
|
|
108
108
|
|
|
109
109
|
// tickets = tickets.map((ticket: ICreateOrderTicketParams): ICreateOrderTicketParams => {
|
|
110
110
|
// const price = Math.floor(calculateTicketPrice(ticket));
|
|
111
|
-
|
|
111
|
+
// console.log(`Ticket Price: `, price);
|
|
112
112
|
// return {
|
|
113
113
|
// ...ticket,
|
|
114
114
|
// price,
|
|
@@ -221,7 +221,7 @@ export default {
|
|
|
221
221
|
const ticketFeeTotal = tickets.reduce((cur, ticket) => {
|
|
222
222
|
return cur + ticketFees.reduce((cur, fee) => {
|
|
223
223
|
const value = cur + applyTicketFee(ticket, fee);
|
|
224
|
-
console.log(`${fee.name}: ${value}`);
|
|
224
|
+
// console.log(`${fee.name}: ${value}`);
|
|
225
225
|
return value;
|
|
226
226
|
}, 0);
|
|
227
227
|
}, 0);
|
|
@@ -232,15 +232,15 @@ export default {
|
|
|
232
232
|
return cur + upgradeFees.reduce((cur, fee) => cur + applyUpgradeFee(upgrade, fee), 0);
|
|
233
233
|
}, 0);
|
|
234
234
|
|
|
235
|
-
const orderSubtotal = ticketTotal + ticketFeeTotal + upgradeTotal + upgradeFeeTotal;
|
|
235
|
+
const orderSubtotal = Math.round(ticketTotal + ticketFeeTotal + upgradeTotal + upgradeFeeTotal);
|
|
236
236
|
|
|
237
|
-
console.log(`Order SubTotal:`, orderSubtotal);
|
|
237
|
+
// console.log(`Order SubTotal:`, orderSubtotal);
|
|
238
238
|
|
|
239
239
|
const orderTotal = orderFees.reduce((cur, fee) => {
|
|
240
240
|
return applyOrderFee(cur, fee);
|
|
241
241
|
}, orderSubtotal);
|
|
242
242
|
|
|
243
|
-
console.log(`Order Total`, orderTotal);
|
|
243
|
+
// console.log(`Order Total`, orderTotal);
|
|
244
244
|
|
|
245
245
|
return orderTotal;
|
|
246
246
|
}
|