@osovitny/anatoly 3.17.140 → 3.17.141
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/esm2022/lib/billing/services/payments.service.mjs +6 -9
- package/esm2022/lib/data/services/billing/payments-api.service.mjs +5 -8
- package/fesm2022/osovitny-anatoly.mjs +9 -15
- package/fesm2022/osovitny-anatoly.mjs.map +1 -1
- package/lib/billing/components/index.d.ts +1 -1
- package/lib/billing/services/payments.service.d.ts +1 -1
- package/lib/data/services/billing/payments-api.service.d.ts +1 -1
- package/package.json +1 -1
|
@@ -124,33 +124,30 @@ export class PaymentsService {
|
|
|
124
124
|
createBraintreeToken() {
|
|
125
125
|
return this.api.createBraintreeToken();
|
|
126
126
|
}
|
|
127
|
-
pay(paidFor,
|
|
127
|
+
pay(paidFor, pmId, pmStatus, pmDetails) {
|
|
128
128
|
//GA
|
|
129
129
|
this.ga.event(GABillingEvents.payment);
|
|
130
|
+
let paymentMethod = this.selectedPaymentMethod;
|
|
130
131
|
let paidForAsString = JSON.stringify(paidFor);
|
|
131
132
|
let payType = this.selectedPaymentType;
|
|
132
|
-
let payMethod = this.selectedPaymentMethod;
|
|
133
133
|
//Amount
|
|
134
134
|
let subtotal = this.subtotal;
|
|
135
135
|
let promoCode = this.discountCode;
|
|
136
136
|
let total = this.getTotal();
|
|
137
137
|
let currency = this.currency;
|
|
138
138
|
if (total == 0) {
|
|
139
|
-
|
|
139
|
+
paymentMethod = PaymentMethod.None;
|
|
140
140
|
}
|
|
141
141
|
this.zone.run(() => {
|
|
142
|
-
this.api.pay(
|
|
142
|
+
this.api.pay(paymentMethod, paidForAsString,
|
|
143
143
|
//Amount
|
|
144
144
|
subtotal, promoCode, total, currency,
|
|
145
145
|
//Payment method details (PayPal/Stripe/Braintree)
|
|
146
|
-
|
|
146
|
+
pmId, pmStatus, pmDetails, (data) => {
|
|
147
147
|
if (!data || !data?.isPaymentValid) {
|
|
148
148
|
this.paymentFailed(PaymentStage.External);
|
|
149
149
|
return;
|
|
150
150
|
}
|
|
151
|
-
if (payMethod == PaymentMethod.CreditCard) {
|
|
152
|
-
//this.closeBraintreePaymentDialog();
|
|
153
|
-
}
|
|
154
151
|
this.paymentInProgress = false;
|
|
155
152
|
this.firePaymentAdded(data.paymentId);
|
|
156
153
|
}, () => {
|
|
@@ -170,4 +167,4 @@ export class PaymentsService {
|
|
|
170
167
|
(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(PaymentsService, [{
|
|
171
168
|
type: Injectable
|
|
172
169
|
}], () => [{ type: i0.NgZone }, { type: i1.PaymentsApiService }, { type: i2.NotificationService }, { type: i3.GoogleAnalyticsService }], null); })();
|
|
173
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"payments.service.js","sourceRoot":"","sources":["../../../../../../projects/anatoly/src/lib/billing/services/payments.service.ts"],"names":[],"mappings":"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","sourcesContent":["/*\r\n<file>\r\n  Project:\r\n    @osovitny/anatoly\r\n\r\n  Authors:\r\n    Vadim Osovitny vadim.osovitny@osovitny.com\r\n    Dhruv Agarwal dhruv.agarwal@osovitny.com\r\n\r\n  Created:\r\n    11 Aug 2024\r\n\r\n  Details:\r\n    https://blog.thoughtram.io/angular/2017/02/21/using-zones-in-angular-for-better-performance.html\r\n\r\n  Copyright (c) 2016-2025 Osovitny Inc. All rights reserved.\r\n</file>\r\n*/\r\n\r\n//Node\r\nimport { Injectable, NgZone } from '@angular/core';\r\nimport { Subject } from 'rxjs';\r\n\r\n//App\r\nimport { GABillingEvents } from '../../core/consts/ga';\r\nimport { PaymentMethod, PaymentStage } from '../../core/enums/billing';\r\nimport { PaymentsApiService } from '../../data/services/billing/payments-api.service';\r\nimport { NotificationService } from '../../core/notifications/services/notification-service';\r\nimport { GoogleAnalyticsService } from '../../core/services/google-analytics.service';\r\n\r\n@Injectable()\r\nexport class PaymentsService {\r\n  //Payment\r\n  paymentStage;\r\n  paymentInProgress = false;\r\n  isPaymentFailed = false;\r\n\r\n  selectedPaymentType;\r\n  selectedPaymentMethod;\r\n  subtotal = 0;\r\n  discountCode = null;\r\n  discountPercentage = null;\r\n  discountAmount = null;\r\n  total = 0;\r\n  currency = 'USD';\r\n\r\n  //Private Streams\r\n  private _discountCodeApplied = new Subject<any>();\r\n  private _paymentAdded = new Subject<any>();\r\n  private _showStripeDialog = new Subject<any>();\r\n  private _showBraintreeDialog = new Subject<any>();\r\n\r\n  //Public Streams\r\n  readonly discountCodeApplied$ = this._discountCodeApplied.asObservable();\r\n  readonly paymentAdded$ = this._paymentAdded.asObservable();\r\n  readonly showStripeDialog$ = this._showStripeDialog.asObservable();\r\n  readonly showBraintreeDialog$ = this._showBraintreeDialog.asObservable();\r\n\r\n  constructor(\r\n    private zone: NgZone,\r\n    private api: PaymentsApiService,\r\n    private ns: NotificationService,\r\n    private ga: GoogleAnalyticsService) {\r\n  }\r\n\r\n  private setDefaults() {\r\n  }\r\n\r\n  private setValues() {\r\n  }\r\n\r\n  //fires\r\n  private fireDiscountCodeApplied() {\r\n    this._discountCodeApplied.next(this.discountCode);\r\n  }\r\n\r\n  private firePaymentAdded(paymentId) {\r\n    this._paymentAdded.next(paymentId);\r\n  }\r\n\r\n  //Public\r\n  init() {\r\n    this.setDefaults();\r\n    this.setValues();\r\n  }\r\n\r\n  resetState() {\r\n    this.subtotal = 0;\r\n    this.total = 0;\r\n  }\r\n\r\n  getTotal() {\r\n    let subtotal = this.subtotal;\r\n\r\n    if (this.discountAmount != 0) {\r\n      subtotal = subtotal - this.discountAmount;\r\n    }\r\n    else if (this.discountPercentage != 0) {\r\n      subtotal = subtotal - (subtotal * (this.discountPercentage / 100));\r\n      subtotal = +subtotal.toFixed(2);\r\n    }\r\n\r\n    return subtotal > 0 ? subtotal : 0;\r\n  }\r\n\r\n  //DiscountCode\r\n  applyDiscountCode(discountCode, data) {\r\n    if (!data) {\r\n      return;\r\n    }\r\n\r\n    this.discountCode = discountCode;\r\n\r\n    if (data.amount) {\r\n      this.discountPercentage = 0;\r\n      this.discountAmount = parseInt(data.amount);\r\n    }\r\n    else if (data.percentage) {\r\n      this.discountPercentage = parseInt(data.percentage);\r\n      this.discountAmount = 0;\r\n    }\r\n\r\n    this.fireDiscountCodeApplied();\r\n  }\r\n\r\n  getDiscountCodeAsString(): string {\r\n    if (this.discountAmount > 0) {\r\n      return \"$\" + this.discountAmount;\r\n    }\r\n    else if (this.discountPercentage > 0) {\r\n      return this.discountPercentage + \"%\";\r\n    }\r\n\r\n    return '$0';\r\n  }\r\n\r\n  openStripePaymentDialog() {\r\n    this._showStripeDialog.next(true);\r\n  }\r\n\r\n  openBraintreePaymentDialog() {\r\n    this._showBraintreeDialog.next(true);\r\n  }\r\n\r\n  closeBraintreePaymentDialog() {\r\n    this._showBraintreeDialog.next(false);\r\n  }\r\n\r\n  createStripeSession(title, description, image) {\r\n    const amount = this.getTotal();\r\n    const currency = this.currency;\r\n\r\n    return this.api.createStripeSession(amount, currency, title, description, image);\r\n  }\r\n\r\n  createBraintreeToken() {\r\n    return this.api.createBraintreeToken();\r\n  }\r\n\r\n  pay(paidFor, payId, payStatus, payDetails) {\r\n    //GA\r\n    this.ga.event(GABillingEvents.payment);\r\n\r\n    let paidForAsString = JSON.stringify(paidFor);\r\n    let payType = this.selectedPaymentType;\r\n    let payMethod = this.selectedPaymentMethod;\r\n\r\n    //Amount\r\n    let subtotal = this.subtotal;\r\n    let promoCode = this.discountCode;\r\n    let total = this.getTotal();\r\n    let currency = this.currency;\r\n\r\n    if (total == 0) {\r\n      payMethod = PaymentMethod.None;\r\n    }\r\n\r\n    this.zone.run(() => {\r\n      this.api.pay(\r\n        paidForAsString, payMethod,\r\n\r\n        //Amount\r\n        subtotal, promoCode, total, currency,\r\n\r\n        //Payment method details (PayPal/Stripe/Braintree)\r\n        payId, payStatus, payDetails,\r\n\r\n        (data) => {\r\n          if (!data || !data?.isPaymentValid) {\r\n            this.paymentFailed(PaymentStage.External);\r\n            return;\r\n          }\r\n\r\n          if (payMethod == PaymentMethod.CreditCard) {\r\n            //this.closeBraintreePaymentDialog();\r\n          }\r\n\r\n          this.paymentInProgress = false;\r\n          this.firePaymentAdded(data.paymentId);\r\n        },\r\n        () => {\r\n          this.paymentFailed(PaymentStage.External);\r\n        });\r\n    });\r\n  }\r\n\r\n  paymentFailed(stage: PaymentStage) {\r\n    this.paymentStage = stage;\r\n    this.paymentInProgress = false;\r\n    this.isPaymentFailed = true;\r\n\r\n    this.ns.error(\"Payment Failed\");\r\n  }\r\n}\r\n"]}
|
|
170
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"payments.service.js","sourceRoot":"","sources":["../../../../../../projects/anatoly/src/lib/billing/services/payments.service.ts"],"names":[],"mappings":"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","sourcesContent":["/*\r\n<file>\r\n  Project:\r\n    @osovitny/anatoly\r\n\r\n  Authors:\r\n    Vadim Osovitny vadim.osovitny@osovitny.com\r\n    Dhruv Agarwal dhruv.agarwal@osovitny.com\r\n\r\n  Created:\r\n    11 Aug 2024\r\n\r\n  Details:\r\n    https://blog.thoughtram.io/angular/2017/02/21/using-zones-in-angular-for-better-performance.html\r\n\r\n  Copyright (c) 2016-2025 Osovitny Inc. All rights reserved.\r\n</file>\r\n*/\r\n\r\n//Node\r\nimport { Injectable, NgZone } from '@angular/core';\r\nimport { Subject } from 'rxjs';\r\n\r\n//App\r\nimport { GABillingEvents } from '../../core/consts/ga';\r\nimport { PaymentMethod, PaymentStage } from '../../core/enums/billing';\r\nimport { PaymentsApiService } from '../../data/services/billing/payments-api.service';\r\nimport { NotificationService } from '../../core/notifications/services/notification-service';\r\nimport { GoogleAnalyticsService } from '../../core/services/google-analytics.service';\r\n\r\n@Injectable()\r\nexport class PaymentsService {\r\n  //Payment\r\n  paymentStage;\r\n  paymentInProgress = false;\r\n  isPaymentFailed = false;\r\n\r\n  selectedPaymentType;\r\n  selectedPaymentMethod;\r\n  subtotal = 0;\r\n  discountCode = null;\r\n  discountPercentage = null;\r\n  discountAmount = null;\r\n  total = 0;\r\n  currency = 'USD';\r\n\r\n  //Private Streams\r\n  private _discountCodeApplied = new Subject<any>();\r\n  private _paymentAdded = new Subject<any>();\r\n  private _showStripeDialog = new Subject<any>();\r\n  private _showBraintreeDialog = new Subject<any>();\r\n\r\n  //Public Streams\r\n  readonly discountCodeApplied$ = this._discountCodeApplied.asObservable();\r\n  readonly paymentAdded$ = this._paymentAdded.asObservable();\r\n  readonly showStripeDialog$ = this._showStripeDialog.asObservable();\r\n  readonly showBraintreeDialog$ = this._showBraintreeDialog.asObservable();\r\n\r\n  constructor(\r\n    private zone: NgZone,\r\n    private api: PaymentsApiService,\r\n    private ns: NotificationService,\r\n    private ga: GoogleAnalyticsService) {\r\n  }\r\n\r\n  private setDefaults() {\r\n  }\r\n\r\n  private setValues() {\r\n  }\r\n\r\n  //fires\r\n  private fireDiscountCodeApplied() {\r\n    this._discountCodeApplied.next(this.discountCode);\r\n  }\r\n\r\n  private firePaymentAdded(paymentId) {\r\n    this._paymentAdded.next(paymentId);\r\n  }\r\n\r\n  //Public\r\n  init() {\r\n    this.setDefaults();\r\n    this.setValues();\r\n  }\r\n\r\n  resetState() {\r\n    this.subtotal = 0;\r\n    this.total = 0;\r\n  }\r\n\r\n  getTotal() {\r\n    let subtotal = this.subtotal;\r\n\r\n    if (this.discountAmount != 0) {\r\n      subtotal = subtotal - this.discountAmount;\r\n    }\r\n    else if (this.discountPercentage != 0) {\r\n      subtotal = subtotal - (subtotal * (this.discountPercentage / 100));\r\n      subtotal = +subtotal.toFixed(2);\r\n    }\r\n\r\n    return subtotal > 0 ? subtotal : 0;\r\n  }\r\n\r\n  //DiscountCode\r\n  applyDiscountCode(discountCode, data) {\r\n    if (!data) {\r\n      return;\r\n    }\r\n\r\n    this.discountCode = discountCode;\r\n\r\n    if (data.amount) {\r\n      this.discountPercentage = 0;\r\n      this.discountAmount = parseInt(data.amount);\r\n    }\r\n    else if (data.percentage) {\r\n      this.discountPercentage = parseInt(data.percentage);\r\n      this.discountAmount = 0;\r\n    }\r\n\r\n    this.fireDiscountCodeApplied();\r\n  }\r\n\r\n  getDiscountCodeAsString(): string {\r\n    if (this.discountAmount > 0) {\r\n      return \"$\" + this.discountAmount;\r\n    }\r\n    else if (this.discountPercentage > 0) {\r\n      return this.discountPercentage + \"%\";\r\n    }\r\n\r\n    return '$0';\r\n  }\r\n\r\n  openStripePaymentDialog() {\r\n    this._showStripeDialog.next(true);\r\n  }\r\n\r\n  openBraintreePaymentDialog() {\r\n    this._showBraintreeDialog.next(true);\r\n  }\r\n\r\n  closeBraintreePaymentDialog() {\r\n    this._showBraintreeDialog.next(false);\r\n  }\r\n\r\n  createStripeSession(title, description, image) {\r\n    const amount = this.getTotal();\r\n    const currency = this.currency;\r\n\r\n    return this.api.createStripeSession(amount, currency, title, description, image);\r\n  }\r\n\r\n  createBraintreeToken() {\r\n    return this.api.createBraintreeToken();\r\n  }\r\n\r\n  pay(paidFor, pmId, pmStatus, pmDetails) {\r\n    //GA\r\n    this.ga.event(GABillingEvents.payment);\r\n\r\n    let paymentMethod = this.selectedPaymentMethod;\r\n    let paidForAsString = JSON.stringify(paidFor);\r\n    let payType = this.selectedPaymentType;    \r\n\r\n    //Amount\r\n    let subtotal = this.subtotal;\r\n    let promoCode = this.discountCode;\r\n    let total = this.getTotal();\r\n    let currency = this.currency;\r\n\r\n    if (total == 0) {\r\n      paymentMethod = PaymentMethod.None;\r\n    }\r\n\r\n    this.zone.run(() => {\r\n      this.api.pay(\r\n        paymentMethod, paidForAsString, \r\n\r\n        //Amount\r\n        subtotal, promoCode, total, currency,\r\n\r\n        //Payment method details (PayPal/Stripe/Braintree)\r\n        pmId, pmStatus, pmDetails,\r\n\r\n        (data) => {\r\n          if (!data || !data?.isPaymentValid) {\r\n            this.paymentFailed(PaymentStage.External);\r\n            return;\r\n          }\r\n\r\n          this.paymentInProgress = false;\r\n          this.firePaymentAdded(data.paymentId);\r\n        },\r\n        () => {\r\n          this.paymentFailed(PaymentStage.External);\r\n        });\r\n    });\r\n  }\r\n\r\n  paymentFailed(stage: PaymentStage) {\r\n    this.paymentStage = stage;\r\n    this.paymentInProgress = false;\r\n    this.isPaymentFailed = true;\r\n\r\n    this.ns.error(\"Payment Failed\");\r\n  }\r\n}\r\n"]}
|
|
@@ -33,20 +33,17 @@ export class PaymentsApiService extends ApiServiceBase {
|
|
|
33
33
|
createBraintreeToken() {
|
|
34
34
|
return this.get('createBraintreeToken');
|
|
35
35
|
}
|
|
36
|
-
pay(
|
|
37
|
-
//System
|
|
38
|
-
paidFor, payMethod,
|
|
36
|
+
pay(paymentMethod, paidFor,
|
|
39
37
|
//Amount
|
|
40
38
|
subtotal, promoCode, total, currency,
|
|
41
39
|
//Payment method details (PayPal/Stripe/Braintree)
|
|
42
|
-
|
|
40
|
+
pmId, pmStatus, pmDetails, success, error) {
|
|
43
41
|
return this.post('pay', {
|
|
44
|
-
|
|
45
|
-
paidFor, payMethod,
|
|
42
|
+
paymentMethod, paidFor,
|
|
46
43
|
//Amount
|
|
47
44
|
subtotal, promoCode, total, currency,
|
|
48
45
|
//Payment method details (PayPal/Stripe/Braintree)
|
|
49
|
-
|
|
46
|
+
pmId, pmStatus, pmDetails,
|
|
50
47
|
}, 'json').subscribe({
|
|
51
48
|
next: (data) => {
|
|
52
49
|
if (success)
|
|
@@ -64,4 +61,4 @@ export class PaymentsApiService extends ApiServiceBase {
|
|
|
64
61
|
(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(PaymentsApiService, [{
|
|
65
62
|
type: Injectable
|
|
66
63
|
}], () => [{ type: i1.HttpClient }], null); })();
|
|
67
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
64
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGF5bWVudHMtYXBpLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9hbmF0b2x5L3NyYy9saWIvZGF0YS9zZXJ2aWNlcy9iaWxsaW5nL3BheW1lbnRzLWFwaS5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7Ozs7O0VBYUU7QUFFRixNQUFNO0FBQ04sT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUkzQyxLQUFLO0FBQ0wsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ3hELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQzs7O0FBRzVELE1BQU0sT0FBTyxrQkFBbUIsU0FBUSxjQUFjO0lBQ3BELFlBQXNCLElBQWdCO1FBQ3BDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQztRQURRLFNBQUksR0FBSixJQUFJLENBQVk7UUFFcEMsSUFBSSxDQUFDLE9BQU8sR0FBRyxHQUFHLE1BQU0sbUJBQW1CLENBQUM7SUFDOUMsQ0FBQztJQUVELFFBQVE7SUFDUixtQkFBbUIsQ0FBQyxNQUFNLEVBQUUsUUFBUSxFQUFFLElBQUksRUFBRSxXQUFXLEVBQUUsS0FBSztRQUM1RCxPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMscUJBQXFCLEVBQUUsRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLElBQUksRUFBRSxXQUFXLEVBQUUsS0FBSyxFQUFFLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDbEcsQ0FBQztJQUVELFdBQVc7SUFDWCxvQkFBb0I7UUFDbEIsT0FBTyxJQUFJLENBQUMsR0FBRyxDQUFTLHNCQUFzQixDQUFDLENBQUM7SUFDbEQsQ0FBQztJQUVELEdBQUcsQ0FDRCxhQUFhLEVBQUUsT0FBTztJQUV0QixRQUFRO0lBQ1IsUUFBUSxFQUFFLFNBQVMsRUFBRSxLQUFLLEVBQUUsUUFBUTtJQUVwQyxrREFBa0Q7SUFDbEQsSUFBSSxFQUFFLFFBQVEsRUFBRSxTQUFTLEVBRXpCLE9BQWtCLEVBQUUsS0FBZ0I7UUFDcEMsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssRUFBRTtZQUN0QixhQUFhLEVBQUUsT0FBTztZQUV0QixRQUFRO1lBQ1IsUUFBUSxFQUFFLFNBQVMsRUFBRSxLQUFLLEVBQUUsUUFBUTtZQUVwQyxrREFBa0Q7WUFDbEQsSUFBSSxFQUFFLFFBQVEsRUFBRSxTQUFTO1NBQzFCLEVBQUUsTUFBTSxDQUFDLENBQUMsU0FBUyxDQUFDO1lBQ25CLElBQUksRUFBRSxDQUFDLElBQUksRUFBRSxFQUFFO2dCQUNiLElBQUksT0FBTztvQkFBRSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDN0IsQ0FBQztZQUNELEtBQUssRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFO2dCQUNYLElBQUksS0FBSztvQkFBRSxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDdEIsQ0FBQztTQUNGLENBQUMsQ0FBQztJQUNMLENBQUM7bUZBMUNVLGtCQUFrQjt1RUFBbEIsa0JBQWtCLFdBQWxCLGtCQUFrQjs7aUZBQWxCLGtCQUFrQjtjQUQ5QixVQUFVIiwic291cmNlc0NvbnRlbnQiOlsiLypcclxuPGZpbGU+XHJcbiAgUHJvamVjdDpcclxuICAgIEBvc292aXRueS9hbmF0b2x5XHJcblxyXG4gIEF1dGhvcnM6XHJcbiAgICBWYWRpbSBPc292aXRueSB2YWRpbS5vc292aXRueUBvc292aXRueS5jb21cclxuXHJcbiAgQ3JlYXRlZDpcclxuICAgIDEwIE5vdiAyMDI0XHJcblxyXG4gIENvcHlyaWdodCAoYykgMjAxNy0yMDI1IE9zb3ZpdG55IEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC5cclxuPC9maWxlPlxyXG4qL1xyXG5cclxuLy9Ob2RlXHJcbmltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcclxuaW1wb3J0IHsgSHR0cENsaWVudCB9IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcclxuaW1wb3J0IHsgT2JzZXJ2YWJsZSB9IGZyb20gJ3J4anMnO1xyXG5cclxuLy9BcHBcclxuaW1wb3J0IHsgQXBpU2VydmljZUJhc2UgfSBmcm9tICcuLi8uLi9iYXNlL2FwaS5zZXJ2aWNlJztcclxuaW1wb3J0IHsgQXBpVXJsIH0gZnJvbSAnLi4vLi4vLi4vY29yZS9jb25zdHMvY29yZS1zZXR0aW5ncyc7XHJcblxyXG5ASW5qZWN0YWJsZSgpXHJcbmV4cG9ydCBjbGFzcyBQYXltZW50c0FwaVNlcnZpY2UgZXh0ZW5kcyBBcGlTZXJ2aWNlQmFzZSB7XHJcbiAgY29uc3RydWN0b3IocHJvdGVjdGVkIGh0dHA6IEh0dHBDbGllbnQpIHtcclxuICAgIHN1cGVyKGh0dHApO1xyXG4gICAgdGhpcy5iYXNlVXJsID0gYCR7QXBpVXJsfS9iaWxsaW5nL3BheW1lbnRzYDtcclxuICB9XHJcblxyXG4gIC8vU3RyaXBlXHJcbiAgY3JlYXRlU3RyaXBlU2Vzc2lvbihhbW91bnQsIGN1cnJlbmN5LCBuYW1lLCBkZXNjcmlwdGlvbiwgaW1hZ2UpIHtcclxuICAgIHJldHVybiB0aGlzLnBvc3QoJ2NyZWF0ZVN0cmlwZVNlc3Npb24nLCB7IGFtb3VudCwgY3VycmVuY3ksIG5hbWUsIGRlc2NyaXB0aW9uLCBpbWFnZSB9LCAnanNvbicpO1xyXG4gIH1cclxuXHJcbiAgLy9CcmFpbnRyZWVcclxuICBjcmVhdGVCcmFpbnRyZWVUb2tlbigpOiBPYnNlcnZhYmxlPGFueT4ge1xyXG4gICAgcmV0dXJuIHRoaXMuZ2V0PHN0cmluZz4oJ2NyZWF0ZUJyYWludHJlZVRva2VuJyk7XHJcbiAgfVxyXG5cclxuICBwYXkoXHJcbiAgICBwYXltZW50TWV0aG9kLCBwYWlkRm9yLFxyXG5cclxuICAgIC8vQW1vdW50XHJcbiAgICBzdWJ0b3RhbCwgcHJvbW9Db2RlLCB0b3RhbCwgY3VycmVuY3ksXHJcblxyXG4gICAgLy9QYXltZW50IG1ldGhvZCBkZXRhaWxzIChQYXlQYWwvU3RyaXBlL0JyYWludHJlZSlcclxuICAgIHBtSWQsIHBtU3RhdHVzLCBwbURldGFpbHMsXHJcblxyXG4gICAgc3VjY2Vzcz86IEZ1bmN0aW9uLCBlcnJvcj86IEZ1bmN0aW9uKSB7XHJcbiAgICByZXR1cm4gdGhpcy5wb3N0KCdwYXknLCB7XHJcbiAgICAgIHBheW1lbnRNZXRob2QsIHBhaWRGb3IsXHJcblxyXG4gICAgICAvL0Ftb3VudFxyXG4gICAgICBzdWJ0b3RhbCwgcHJvbW9Db2RlLCB0b3RhbCwgY3VycmVuY3ksXHJcblxyXG4gICAgICAvL1BheW1lbnQgbWV0aG9kIGRldGFpbHMgKFBheVBhbC9TdHJpcGUvQnJhaW50cmVlKVxyXG4gICAgICBwbUlkLCBwbVN0YXR1cywgcG1EZXRhaWxzLFxyXG4gICAgfSwgJ2pzb24nKS5zdWJzY3JpYmUoe1xyXG4gICAgICBuZXh0OiAoZGF0YSkgPT4ge1xyXG4gICAgICAgIGlmIChzdWNjZXNzKSBzdWNjZXNzKGRhdGEpO1xyXG4gICAgICB9LFxyXG4gICAgICBlcnJvcjogKGUpID0+IHtcclxuICAgICAgICBpZiAoZXJyb3IpIGVycm9yKGUpO1xyXG4gICAgICB9XHJcbiAgICB9KTtcclxuICB9XHJcbn1cclxuIl19
|
|
@@ -4155,20 +4155,17 @@ class PaymentsApiService extends ApiServiceBase {
|
|
|
4155
4155
|
createBraintreeToken() {
|
|
4156
4156
|
return this.get('createBraintreeToken');
|
|
4157
4157
|
}
|
|
4158
|
-
pay(
|
|
4159
|
-
//System
|
|
4160
|
-
paidFor, payMethod,
|
|
4158
|
+
pay(paymentMethod, paidFor,
|
|
4161
4159
|
//Amount
|
|
4162
4160
|
subtotal, promoCode, total, currency,
|
|
4163
4161
|
//Payment method details (PayPal/Stripe/Braintree)
|
|
4164
|
-
|
|
4162
|
+
pmId, pmStatus, pmDetails, success, error) {
|
|
4165
4163
|
return this.post('pay', {
|
|
4166
|
-
|
|
4167
|
-
paidFor, payMethod,
|
|
4164
|
+
paymentMethod, paidFor,
|
|
4168
4165
|
//Amount
|
|
4169
4166
|
subtotal, promoCode, total, currency,
|
|
4170
4167
|
//Payment method details (PayPal/Stripe/Braintree)
|
|
4171
|
-
|
|
4168
|
+
pmId, pmStatus, pmDetails,
|
|
4172
4169
|
}, 'json').subscribe({
|
|
4173
4170
|
next: (data) => {
|
|
4174
4171
|
if (success)
|
|
@@ -4304,33 +4301,30 @@ class PaymentsService {
|
|
|
4304
4301
|
createBraintreeToken() {
|
|
4305
4302
|
return this.api.createBraintreeToken();
|
|
4306
4303
|
}
|
|
4307
|
-
pay(paidFor,
|
|
4304
|
+
pay(paidFor, pmId, pmStatus, pmDetails) {
|
|
4308
4305
|
//GA
|
|
4309
4306
|
this.ga.event(GABillingEvents.payment);
|
|
4307
|
+
let paymentMethod = this.selectedPaymentMethod;
|
|
4310
4308
|
let paidForAsString = JSON.stringify(paidFor);
|
|
4311
4309
|
let payType = this.selectedPaymentType;
|
|
4312
|
-
let payMethod = this.selectedPaymentMethod;
|
|
4313
4310
|
//Amount
|
|
4314
4311
|
let subtotal = this.subtotal;
|
|
4315
4312
|
let promoCode = this.discountCode;
|
|
4316
4313
|
let total = this.getTotal();
|
|
4317
4314
|
let currency = this.currency;
|
|
4318
4315
|
if (total == 0) {
|
|
4319
|
-
|
|
4316
|
+
paymentMethod = PaymentMethod.None;
|
|
4320
4317
|
}
|
|
4321
4318
|
this.zone.run(() => {
|
|
4322
|
-
this.api.pay(
|
|
4319
|
+
this.api.pay(paymentMethod, paidForAsString,
|
|
4323
4320
|
//Amount
|
|
4324
4321
|
subtotal, promoCode, total, currency,
|
|
4325
4322
|
//Payment method details (PayPal/Stripe/Braintree)
|
|
4326
|
-
|
|
4323
|
+
pmId, pmStatus, pmDetails, (data) => {
|
|
4327
4324
|
if (!data || !data?.isPaymentValid) {
|
|
4328
4325
|
this.paymentFailed(PaymentStage.External);
|
|
4329
4326
|
return;
|
|
4330
4327
|
}
|
|
4331
|
-
if (payMethod == PaymentMethod.CreditCard) {
|
|
4332
|
-
//this.closeBraintreePaymentDialog();
|
|
4333
|
-
}
|
|
4334
4328
|
this.paymentInProgress = false;
|
|
4335
4329
|
this.firePaymentAdded(data.paymentId);
|
|
4336
4330
|
}, () => {
|