use product accounting data instead of last sale to be able to update…

… customer addresses
jsreport · Jan 19, 2022 · 1df249f · 1df249f
1 parent 6221474
commit 1df249f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/dist/lib/payments/subscriptionRenewal.js b/dist/lib/payments/subscriptionRenewal.js
diff --git a/dist/lib/payments/subscriptionRenewal.js.map b/dist/lib/payments/subscriptionRenewal.js.map
diff --git a/src/lib/payments/subscriptionRenewal.ts b/src/lib/payments/subscriptionRenewal.ts
@@ -64,15 +64,14 @@ export default class SubscriptionRenewal {
       return this._processCancellation(customer, product)
     }
 
-    const lastSale = product.sales[product.sales.length - 1]
     let paymentIntent
     try {
-      logger.info(`Initiating charge for ${product.name} for ${customer.email} of ${lastSale.accountingData.amount} USD`)
+      logger.info(`Initiating charge for ${product.name} for ${customer.email} of ${product.accountingData.amount} USD`)
       const stripeCustomer = await this.services.stripe.findOrCreateCustomer(customer.email)
       paymentIntent = await this.services.stripe.createConfirmedPaymentIntent(
         stripeCustomer.id,
         product.subscription.stripe.paymentMethodId,
-        lastSale.accountingData.amount
+        product.accountingData.amount
       )
     } catch (e) {
       if (product.subscription.retryPlannedPayment) {
@@ -115,8 +114,7 @@ export default class SubscriptionRenewal {
   }
 
   async processSucesfullPayment(customer, product, paymentIntent) {
-    const lastSale = product.sales[product.sales.length - 1]
-    const sale = await this.services.customerRepository.createSale(lastSale.accountingData, {
+    const sale = await this.services.customerRepository.createSale(product.accountingData, {
       paymentIntentId: paymentIntent.id,
     })
 

diff --git a/test/payments/subscriptionRenewalTest.ts b/test/payments/subscriptionRenewalTest.ts
@@ -26,7 +26,7 @@ databaseTest((getDb) => {
         customerRepository,
         stripe,
         sendEmail: async (m) => emails.push(m),
-        renderInvoice: async (s: Sale) => {},
+        renderInvoice: async (s: Sale) => { },
         notifyLicensingServer: async (customer, product, sale) => {
           licensingServerNotifications.push({
             customer,
@@ -41,6 +41,8 @@ databaseTest((getDb) => {
       let customer = await customerRepository.findOrCreate('[email protected]')
       const product = createProduct()
       const originalNextPayment = (product.subscription.nextPayment = moment().add('-1', 'days').toDate())
+      product.accountingData.email = '[email protected]'
+      product.accountingData.vatNumber = 'DIFERENT'
       customer.products = [product]
       await customerRepository.update(customer)
 
@@ -74,7 +76,9 @@ databaseTest((getDb) => {
       emails[0].to.should.be.eql(customer.email)
       emails[0].content.should.containEql('renewed')
 
-      customer.products[0].sales[1].accountingData.amount.should.be.eql(customer.products[0].sales[0].accountingData.amount)
+      customer.products[0].sales[1].accountingData.amount.should.be.eql(customer.products[0].accountingData.amount)
+      customer.products[0].sales[1].accountingData.email.should.be.eql(customer.products[0].accountingData.email)
+      customer.products[0].sales[1].accountingData.vatNumber.should.be.eql(customer.products[0].accountingData.vatNumber)
 
       licensingServerNotifications[0].customer.email.should.be.eql(customer.email)
     })