diff --git a/src/common/queryConstants/businessActivities.ts b/src/common/queryConstants/businessActivities.ts
index e5e9405..3a777d1 100644
--- a/src/common/queryConstants/businessActivities.ts
+++ b/src/common/queryConstants/businessActivities.ts
@@ -24,9 +24,10 @@ export const summarySelect: BusinessActivitySelect = {
         select: {
           activation: {
             select: {
-              _count: {
+              account_allocations: {
                 select: {
-                  account_allocations: true,
+                  id: true,
+                  account_id: true,
                 },
               },
             },
@@ -44,13 +45,18 @@ export const select: BusinessActivitySelect = {
 export const mappedData = (businessActivity: any) => {
   const { license_activation, ...rest } = businessActivity
   const { license, ...license_activation_rest } = license_activation
-  const { _count } = license.activation
+  const { account_allocations } = license.activation
+
+  console.log('license_activation', license_activation)
 
   return {
     ...rest,
     license_info: {
       ...license_activation_rest,
-      accounts_limit: _count.account_allocations,
+      accounts_limit: account_allocations.length,
+      allocated_account_count: account_allocations.filter(
+        allocation => allocation.account_id,
+      ).length,
     },
   }
 }
diff --git a/src/modules/admin/partners/chargeAccountQoutaTransactions/chargeAccountQuotaTransactions.service.ts b/src/modules/admin/partners/chargeAccountQoutaTransactions/chargeAccountQuotaTransactions.service.ts
index ae509d2..e3fbbac 100644
--- a/src/modules/admin/partners/chargeAccountQoutaTransactions/chargeAccountQuotaTransactions.service.ts
+++ b/src/modules/admin/partners/chargeAccountQoutaTransactions/chargeAccountQuotaTransactions.service.ts
@@ -105,7 +105,9 @@ export class PartnerAccountChargeTransactionService {
           try {
             createdTransaction = await tx.partnerAccountQuotaChargeTransaction.create({
               data: {
-                activation_expires_at: data.activated_expires_at,
+                activation_expires_at: data.activated_expires_at
+                  ? new Date(data.activated_expires_at).toISOString()
+                  : new Date().toISOString(),
                 tracking_code: generateTrackingCode('AQC', this.TRACKING_CODE_LENGTH),
                 purchased_count: data.quantity,
                 partner: { connect: { id: partner_id } },
diff --git a/src/modules/admin/partners/chargedLicenseTransactions/chargedLicenseTransactions.service.ts b/src/modules/admin/partners/chargedLicenseTransactions/chargedLicenseTransactions.service.ts
index 40cf6ba..3c75866 100644
--- a/src/modules/admin/partners/chargedLicenseTransactions/chargedLicenseTransactions.service.ts
+++ b/src/modules/admin/partners/chargedLicenseTransactions/chargedLicenseTransactions.service.ts
@@ -121,7 +121,9 @@ export class PartnerLicenseChargeTransactionService {
           try {
             createdTransaction = await tx.licenseChargeTransaction.create({
               data: {
-                activation_expires_at: data.activated_expires_at,
+                activation_expires_at: data.activated_expires_at
+                  ? new Date(data.activated_expires_at).toISOString()
+                  : new Date().toISOString(),
                 tracking_code: generateTrackingCode('LIC', this.TRACKING_CODE_LENGTH),
                 purchased_count: data.quantity,
                 partner: { connect: { id: partner_id } },
diff --git a/src/modules/tspProviders/utils/sales-invoice-tsp.utils.ts b/src/modules/tspProviders/utils/sales-invoice-tsp.utils.ts
index 54280c6..d249f69 100644
--- a/src/modules/tspProviders/utils/sales-invoice-tsp.utils.ts
+++ b/src/modules/tspProviders/utils/sales-invoice-tsp.utils.ts
@@ -419,6 +419,9 @@ export async function buildOriginalPayload(
             select: {
               stan: true,
               rrn: true,
+              transaction_date_time: true,
+              customer_card_no: true,
+              terminal_id: true,
             },
           },
         },
@@ -465,7 +468,9 @@ export async function buildOriginalPayload(
       payment_method: payment.payment_method,
       paid_at: payment.paid_at,
       terminal_info: {
-        card_number: payment.terminal_info ? payment.terminal_info.stan : undefined,
+        card_number: payment.terminal_info?.customer_card_no
+          ? payment.terminal_info.customer_card_no
+          : undefined,
         tracking_code: payment.terminal_info ? payment.terminal_info.rrn : undefined,
       },
     })),