2026-04-16-1

2026-04-16 03:39:49 +03:00
parent 3d61362602
commit 58f06eeba3
15 changed files with 579 additions and 106 deletions
@@ -51,6 +51,89 @@ export class BillingController {
    throw new BadRequestException('Invalid payment provider');
  }

+  /**
+   * PayMob Redirection Callback (Success/Fail)
+   * This handles the GET request when PayMob redirects the user back to our site
+   */
+  @Get('callback/paymob')
+  @ApiOperation({ summary: 'PayMob Redirection Handler' })
+  async handlePaymobCallback(@Query() query: any, @Req() req: any) {
+    this.logger.log(`🔄 PayMob Redirect Callback: ID ${query.id}, Success: ${query.success}`);
+    
+    // Fallback: If success=true, proactively fetch transaction details and upgrade
+    if (query.success === 'true' && query.id) {
+        try {
+            const txDetails = await this.paymobProvider.getTransactionDetails(query.id);
+            if (txDetails && txDetails.success === true) {
+                const extraDesc = txDetails.order?.shipping_data?.extra_description || "";
+                const [tenantId, plan] = extraDesc.split('|');
+                
+                if (tenantId) {
+                    await this.billingService.processSuccessfulPayment(
+                        query.id.toString(),
+                        PaymentProvider.PAYMOB,
+                        txDetails.amount_cents / 100,
+                        { tenantId, plan: plan || 'PRO' }
+                    );
+                    this.logger.log(`🚀 Immediate Activation triggered via Callback for Tenant ${tenantId}`);
+                }
+            }
+        } catch (e) {
+            this.logger.error(`Failed during immediate activation fallback: ${e.message}`);
+        }
+    }
+
+    // Redirect back to dashboard with status
+    const targetUrl = `https://map-dashbord.intaleqapp.com/dashboard.html#billing?payment_status=${query.success === 'true' ? 'success' : 'failed'}&id=${query.id}`;
+    
+    return `
+      <!DOCTYPE html>
+      <html lang="ar" dir="rtl">
+      <head>
+          <meta charset="UTF-8">
+          <title>Intaleq Maps | تمت العملية بنجاح</title>
+          <script src="https://cdn.tailwindcss.com"></script>
+          <link href="https://fonts.googleapis.com/css2?family=Cairo:wght@400;700;900&display=swap" rel="stylesheet">
+          <style>
+              body { font-family: 'Cairo', sans-serif; background: #050505; color: white; overflow: hidden; }
+              .pulse { animation: pulse 2s cubic-bezier(0.4, 0, 0.6, 1) infinite; }
+              @keyframes pulse { 0%, 100% { opacity: 1; transform: scale(1); } 50% { opacity: .7; transform: scale(0.95); } }
+          </style>
+      </head>
+      <body class="flex items-center justify-center h-screen">
+          <div class="text-center space-y-8 max-w-md p-10 bg-white shadow-2xl rounded-[3rem] border border-white/10 relative overflow-hidden">
+              <!-- Animated Background Glow -->
+              <div class="absolute -top-20 -left-20 w-40 h-40 bg-blue-600/20 blur-[80px] rounded-full"></div>
+              <div class="absolute -bottom-20 -right-20 w-40 h-40 bg-emerald-600/20 blur-[80px] rounded-full"></div>
+              
+              <div class="relative z-10">
+                  <div class="w-24 h-24 bg-emerald-500 rounded-full mx-auto flex items-center justify-center shadow-[0_0_50px_rgba(16,185,129,0.4)] pulse mb-8">
+                      <svg class="w-12 h-12 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="3" d="M5 13l4 4L19 7"></path>
+                      </svg>
+                  </div>
+                  
+                  <h1 class="text-3xl font-black text-slate-900 mb-4">شكراً لك، حمزة!</h1>
+                  <p class="text-slate-500 font-bold mb-8">تم تفعيل خطة <span class="text-blue-600">PRO</span> بنجاح. يتم الآن توجيهك إلى لوحة التحكم...</p>
+                  
+                  <div class="flex items-center justify-center gap-2">
+                      <div class="w-2 h-2 bg-blue-600 rounded-full animate-bounce"></div>
+                      <div class="w-2 h-2 bg-blue-600 rounded-full animate-bounce [animation-delay:-0.15s]"></div>
+                      <div class="w-2 h-2 bg-blue-600 rounded-full animate-bounce [animation-delay:-0.3s]"></div>
+                  </div>
+              </div>
+
+              <script>
+                  setTimeout(() => {
+                      window.location.href = "${targetUrl}";
+                  }, 2500);
+              </script>
+          </div>
+      </body>
+      </html>
+    `;
+  }
+
  /**
   * PayMob Transaction Processed Webhook
   * This is called by PayMob when a transaction is attempted
@@ -16,20 +16,17 @@ export class PayMobProvider {
  async createPaymentKey(tenantId: string, amount: number, plan: string): Promise<{ paymentKey: string; orderId: string }> {
    try {
      // 1. Authentication Request
-      const authRes = await axios.post(`${this.baseUrl}/auth/tokens`, {
-        api_key: this.configService.get('PAYMOB_API_KEY'),
-      });
-      const authToken = authRes.data.token;
+      const authToken = await this.getAuthToken();

      // 2. Order Registration
      const orderRes = await axios.post(`${this.baseUrl}/ecommerce/orders`, {
        auth_token: authToken,
        delivery_needed: "false",
-        amount_cents: amount * 100, // PayMob uses cents
-        currency: "EGP", // Or USD based on integration
+        amount_cents: amount * 50 * 100, // Convert USD to EGP (1:50) and then to Cents
+        currency: "EGP",
        items: [{
          name: `${plan} Subscription`,
-          amount_cents: amount * 100,
+          amount_cents: amount * 50 * 100,
          description: `Intaleq Maps ${plan} Plan`
        }],
        shipping_data: {
@@ -46,7 +43,7 @@ export class PayMobProvider {
      // 3. Payment Key Generation
      const keyRes = await axios.post(`${this.baseUrl}/acceptance/payment_keys`, {
        auth_token: authToken,
-        amount_cents: amount * 100,
+        amount_cents: amount * 50 * 100, // FIXED: Now using the x50 multiplier here too
        expiration: 3600,
        order_id: orderId,
        billing_data: {
@@ -79,6 +76,33 @@ export class PayMobProvider {
    }
  }

+  /**
+   * Fetch transaction details from PayMob by ID
+   */
+  async getTransactionDetails(transactionId: string): Promise<any> {
+    try {
+      const authToken = await this.getAuthToken();
+      const res = await axios.get(`${this.baseUrl}/acceptance/transactions/${transactionId}`, {
+        headers: { Authorization: `Bearer ${authToken}` }
+      });
+      return res.data;
+    } catch (error) {
+       this.logger.error(`Failed to fetch PayMob transaction ${transactionId}: ${error.message}`);
+       return null;
+    }
+  }
+
+  /**
+   * Get Authentication Token
+   */
+  private async getAuthToken(): Promise<string> {
+    const authRes = await axios.post(`${this.baseUrl}/auth/tokens`, {
+        api_key: this.configService.get('PAYMOB_API_KEY'),
+    });
+    return authRes.data.token;
+  }
+
+
  /**
   * Verify HMAC signature from PayMob Webhook
   */
@@ -104,15 +128,12 @@ export class PayMobProvider {
       order,
       owner,
       pending,
-       source_data_pan,
-       source_data_sub_type,
-       source_data_type,
       success
    } = payload;

-    const source_pan = source_data_pan || "";
-    const source_sub_type = source_data_sub_type || "";
-    const source_type = source_data_type || "";
+    const source_pan = payload.source_data?.pan || "";
+    const source_sub_type = payload.source_data?.sub_type || "";
+    const source_type = payload.source_data?.type || "";

    const data = [
      amount_cents,
@@ -128,7 +149,7 @@ export class PayMobProvider {
      is_refunded,
      is_standalone_payment,
      is_voided,
-      order.id, // PayMob sends order as object
+      order.id || order, // Can be object or ID depending on version
      owner,
      pending,
      source_pan,