quickpos 1.0.917 → 1.0.918

package/lib/2checkout.js

@@ -1,165 +1,121 @@
-const axios = require('axios');
 const crypto = require('crypto');
 
 class TwoCheckoutClient {
     constructor(config) {
-        const requiredFields = ['merchantCode', 'secretKey'];
+        const requiredFields = ['merchantCode', 'secretWord'];
         for (let field of requiredFields) {
             if (!config[field]) throw new Error(`Missing required field: ${field}`);
         }
 
         this.merchantCode = config.merchantCode;
-        this.secretKey = config.secretKey;
-        this.baseURL = config.sandbox 
-            ? 'https://api.sandbox.2checkout.com' 
-            : 'https://api.2checkout.com';
-
-        this.client = axios.create({
-            baseURL: this.baseURL,
-            headers: {
-                'Content-Type': 'application/json'
+        this.secretWord = config.secretWord;
+        this.sandbox = config.sandbox || false;
+    }
+
+    generateHash(params, algo = 'md5') {
+        let signatureString = '';
+
+        Object.keys(params).forEach(key => {
+            const value = String(params[key]); // Değer string olmalı
+            if (value.length > 0) { // Boş değerler bazen hash'e katılmaz
+                 signatureString += value.length + value;
             }
         });
-    }
 
-    generateSignature(params) {
-        const signatureString = Object.keys(params)
-            .sort()
-            .map(key => params[key].length + params[key])
-            .join('');
-        
         return crypto
-            .createHmac('sha256', this.secretKey)
+            .createHmac(algo, this.secretWord)
             .update(signatureString)
             .digest('hex');
     }
 
-    async createPayment(options) {
-        try {
-            const orderId = options.orderId || `ORDER-${Date.now()}`;
-            const timestamp = new Date().toISOString();
-            
-            const params = {
-                'merchant': this.merchantCode,
-                'dynamic': '1',
-                'return-url': options.successUrl || options.callback_link,
-                'return-type': 'redirect',
-                'expiration': timestamp,
-                'order-ext-ref': orderId,
-                'item-ext-ref': orderId,
-                'customer-ext-ref': options.customerId || '',
-                'currency': options.currency || 'USD',
-                'language': options.language || 'en',
-                'test': options.sandbox ? '1' : '0',
-                'prod-name[0]': options.name || 'Payment',
-                'prod-type[0]': 'PRODUCT',
-                'prod-price[0]': parseFloat(options.amount).toString(),
-                'prod-qty[0]': '1',
-                'prod-description[0]': options.description || '',
-                'customer-email': options.email || '',
-                'customer-name': options.customerName || ''
-            };
-
-            const signature = this.generateSignature(params);
-            params.signature = signature;
-
-            // Create form URL
-            const formParams = new URLSearchParams(params);
-            const paymentUrl = `https://secure.2checkout.com/order/checkout.php?${formParams.toString()}`;
-
-            return {
-                status: 'success',
-                data: {
-                    url: paymentUrl,
-                    orderId: orderId,
-                    params: params
-                }
-            };
-        } catch (error) {
-            throw new Error(`Payment creation error: ${error.message}`);
-        }
-    }
+    createPaymentUrl(options) {
+        const orderId = options.orderId || `ORDER-${Date.now()}`;
+        
+        const params = {
+            'merchant': this.merchantCode,
+            'dynamic': '1', // Dinamik ürün modu
+            'prod-name[]': options.name || 'Payment',
+            'prod-type[]': 'GLOBAL_SERVICE', // Ürün tipi
+            'prod-price[]': parseFloat(options.amount).toFixed(2),
+            'prod-qty[]': '1',
+            'currency': options.currency || 'USD',
+            'return-type': 'redirect',
+            'return-url': options.callbackUrl,
+            'expiration': Math.floor(Date.now() / 1000) + 3600, // 1 saat geçerli
+            'order-ext-ref': orderId,
+            'customer-ref': options.customerId || '',
+            'customer-email': options.email || ''
+        };
+
+        let signatureData = '';
+        
+        const keysToSign = [
+            'merchant', 'dynamic', 'prod-name[]', 'prod-type[]', 'prod-price[]', 
+            'prod-qty[]', 'currency', 'return-type', 'return-url', 'expiration', 
+            'order-ext-ref', 'customer-ref', 'customer-email'
+        ];
+        
+        keysToSign.forEach(key => {
+            const val = String(params[key] || '');
+            if(val) signatureData += val.length + val;
+        });
 
-    async handleCallback(callbackData) {
-        try {
-            const verification = await this.verifyCallback(callbackData);
-            
-            if (!verification.status) {
-                throw new Error(verification.error.message);
-            }
+        const signature = crypto.createHmac('md5', this.secretWord).update(signatureData).digest('hex');
+        params['signature'] = signature;
 
-            const data = verification.data;
-            
-            // Status mapping
-            const statusMapping = {
-                'COMPLETE': 'success',
-                'PENDING': 'pending',
-                'REFUND': 'refunded',
-                'REVERSED': 'failed'
-            };
-
-            return {
-                status: statusMapping[data.order_status] || 'unknown',
-                orderId: data['order-ext-ref'] || data.order_number,
-                transactionId: data.order_number,
-                amount: parseFloat(data.invoice_list_amount || data.order_amount),
-                currency: data.list_currency,
-                paymentStatus: data.order_status,
-                invoiceId: data.invoice_id
-            };
-        } catch (error) {
-            throw new Error(`Error in 2Checkout callback handling: ${error.message}`);
-        }
+        // URL Parametrelerini oluştur
+        const queryParams = new URLSearchParams();
+        Object.keys(params).forEach(key => queryParams.append(key, params[key]));
+
+        return `https://secure.2checkout.com/order/checkout.php?${queryParams.toString()}`;
     }
 
-    async verifyCallback(data) {
+    /**
+     * IPN (Callback) Doğrulama
+     * Bu kısım, sunucunuza gelen POST isteğini doğrular.
+     */
+    verifyCallback(postData) {
         try {
-            const hash = data.hash || data.HASH;
-            
-            if (!hash) {
-                return {
-                    status: false,
-                    error: {
-                        code: 400,
-                        message: 'Hash not found in callback data'
-                    }
-                };
+            // Gelen veriden HASH'i ayıralım
+            const receivedHash = postData['HASH'];
+            if (!receivedHash) {
+                return { status: false, message: 'No hash found' };
             }
 
-            // Verify IPN hash
-            const params = { ...data };
-            delete params.hash;
-            delete params.HASH;
+            let hashString = '';
             
+            // 2Checkout, HASH parametresi hariç tüm parametreleri gönderdiği sırayla kullanır.
+            for (let key in postData) {
+                if (key !== 'HASH') {
+                    const val = String(postData[key]);
+                    hashString += val.length + val;
+                }
+            }
+
             const calculatedHash = crypto
-                .createHmac('md5', this.secretKey)
-                .update(JSON.stringify(params))
+                .createHmac('md5', this.secretWord) 
+                .update(hashString)
                 .digest('hex');
 
-            if (hash !== calculatedHash) {
-                return {
-                    status: false,
-                    error: {
-                        code: 401,
-                        message: 'Invalid hash'
-                    }
+            if (calculatedHash === receivedHash) {
+                const date = new Date().toISOString().replace(/T/, ' ').replace(/\..+/, '');
+                const responseHash = crypto.createHmac('md5', this.secretWord).update(postData.IPN_PID[0].length + postData.IPN_PID[0] + postData.IPN_PNAME[0].length + postData.IPN_PNAME[0] + postData.IPN_DATE.length + postData.IPN_DATE + date.length + date).digest('hex');
+                
+                return { 
+                    status: true, 
+                    transactionId: postData.REFNO,
+                    orderStatus: postData.ORDERSTATUS,
+                    raw: postData
                 };
+            } else {
+                console.error("Hash Mismatch. Calculated:", calculatedHash, "Received:", receivedHash);
+                return { status: false, message: 'Invalid hash signature' };
             }
 
-            return {
-                status: true,
-                data: data
-            };
         } catch (error) {
-            return {
-                status: false,
-                error: {
-                    code: 500,
-                    message: error.message
-                }
-            };
+            return { status: false, message: error.message };
         }
     }
 }
 
-module.exports = TwoCheckoutClient;
+module.exports = TwoCheckoutClient;

package/lib/cryptomus.js

@@ -98,7 +98,7 @@ class Cryptomus {
                 throw new Error("Cryptomus notification failed: invalid signature");
             }
     
-            if (callbackData.status === 'paid') {
+            if (callbackData.status === 'paid' || callbackData.status === 'paid_over') {
                 return {
                     status: 'success',
                     orderId: callbackData.order_id,

package/lib/paratika.js

@@ -0,0 +1,121 @@
+const crypto = require('crypto');
+
+class TwoCheckoutClient {
+    constructor(config) {
+        const requiredFields = ['merchantCode', 'secretWord'];
+        for (let field of requiredFields) {
+            if (!config[field]) throw new Error(`Missing required field: ${field}`);
+        }
+
+        this.merchantCode = config.merchantCode;
+        this.secretWord = config.secretWord;
+        this.sandbox = config.sandbox || false;
+    }
+
+    generateHash(params, algo = 'md5') {
+        let signatureString = '';
+
+        Object.keys(params).forEach(key => {
+            const value = String(params[key]); // Değer string olmalı
+            if (value.length > 0) { // Boş değerler bazen hash'e katılmaz
+                 signatureString += value.length + value;
+            }
+        });
+
+        return crypto
+            .createHmac(algo, this.secretWord)
+            .update(signatureString)
+            .digest('hex');
+    }
+
+    createPaymentUrl(options) {
+        const orderId = options.orderId || `ORDER-${Date.now()}`;
+        
+        const params = {
+            'merchant': this.merchantCode,
+            'dynamic': '1', // Dinamik ürün modu
+            'prod-name[]': options.name || 'Payment',
+            'prod-type[]': 'GLOBAL_SERVICE', // Ürün tipi
+            'prod-price[]': parseFloat(options.amount).toFixed(2),
+            'prod-qty[]': '1',
+            'currency': options.currency || 'USD',
+            'return-type': 'redirect',
+            'return-url': options.callbackUrl,
+            'expiration': Math.floor(Date.now() / 1000) + 3600, // 1 saat geçerli
+            'order-ext-ref': orderId,
+            'customer-ref': options.customerId || '',
+            'customer-email': options.email || ''
+        };
+
+        let signatureData = '';
+        
+        const keysToSign = [
+            'merchant', 'dynamic', 'prod-name[]', 'prod-type[]', 'prod-price[]', 
+            'prod-qty[]', 'currency', 'return-type', 'return-url', 'expiration', 
+            'order-ext-ref', 'customer-ref', 'customer-email'
+        ];
+        
+        keysToSign.forEach(key => {
+            const val = String(params[key] || '');
+            if(val) signatureData += val.length + val;
+        });
+
+        const signature = crypto.createHmac('md5', this.secretWord).update(signatureData).digest('hex');
+        params['signature'] = signature;
+
+        // URL Parametrelerini oluştur
+        const queryParams = new URLSearchParams();
+        Object.keys(params).forEach(key => queryParams.append(key, params[key]));
+
+        return `https://secure.2checkout.com/order/checkout.php?${queryParams.toString()}`;
+    }
+
+    /**
+     * IPN (Callback) Doğrulama
+     * Bu kısım, sunucunuza gelen POST isteğini doğrular.
+     */
+    verifyCallback(postData) {
+        try {
+            // Gelen veriden HASH'i ayıralım
+            const receivedHash = postData['HASH'];
+            if (!receivedHash) {
+                return { status: false, message: 'No hash found' };
+            }
+
+            let hashString = '';
+            
+            // 2Checkout, HASH parametresi hariç tüm parametreleri gönderdiği sırayla kullanır.
+            for (let key in postData) {
+                if (key !== 'HASH') {
+                    const val = String(postData[key]);
+                    hashString += val.length + val;
+                }
+            }
+
+            const calculatedHash = crypto
+                .createHmac('md5', this.secretWord) 
+                .update(hashString)
+                .digest('hex');
+
+            if (calculatedHash === receivedHash) {
+                const date = new Date().toISOString().replace(/T/, ' ').replace(/\..+/, '');
+                const responseHash = crypto.createHmac('md5', this.secretWord).update(postData.IPN_PID[0].length + postData.IPN_PID[0] + postData.IPN_PNAME[0].length + postData.IPN_PNAME[0] + postData.IPN_DATE.length + postData.IPN_DATE + date.length + date).digest('hex');
+                
+                return { 
+                    status: true, 
+                    transactionId: postData.REFNO,
+                    orderStatus: postData.ORDERSTATUS,
+                    raw: postData
+                };
+            } else {
+                console.error("Hash Mismatch. Calculated:", calculatedHash, "Received:", receivedHash);
+                return { status: false, message: 'Invalid hash signature' };
+            }
+
+        } catch (error) {
+            return { status: false, message: error.message };
+        }
+    }
+}
+
+module.exports = TwoCheckoutClient;

package/lib/paytr.js

@@ -98,63 +98,91 @@ class PayTR {
     }
   }
 
-  async createDirectPayment(params) {
+// Direkt API için Otomatik Submit Eden HTML Formu Üretir
+  createDirectPayment(params) {
     try {
-      const userBasket = JSON.stringify(params.userBasket);
-      const userIp = params.userIp;
-      const merchantOid = params.merchantOid;
+      // 1. Gerekli Parametrelerin Hazırlanması
+      const merchant_id = this.merchantId;
+      const user_ip = params.userIp;
+      const merchant_oid = params.merchantOid;
       const email = params.email;
-      const paymentAmount = params.paymentAmount.toString();
+      const payment_amount = params.paymentAmount.toString();
+      const payment_type = 'card';
+      const installment_count = params.installmentCount || '0';
       const currency = params.currency || 'TL';
-      const installmentCount = params.installmentCount || '0';
-      const paymentType = 'card';
-      const non3D = params.non3D ? params.non3D : '0'; 
-
-      const rawString = `${this.merchantId}${userIp}${merchantOid}${email}${paymentAmount}${paymentType}${installmentCount}${currency}${this.testMode}${non3D}`;
-      const paytrToken = this.generateToken(rawString);
+      const test_mode = this.testMode;
+      const non_3d = params.non3D || '0';
+      
+      // Sepet verisi JSON string olmalı
+      const user_basket = JSON.stringify(params.userBasket);
+
+      // 2. Token Oluşturma (Sıralama: merchant_id + user_ip + merchant_oid + email + payment_amount + payment_type + installment_count + currency + test_mode + non_3d)
+      const rawString = `${merchant_id}${user_ip}${merchant_oid}${email}${payment_amount}${payment_type}${installment_count}${currency}${test_mode}${non_3d}`;
+      const paytr_token = this.generateToken(rawString);
+
+      // 3. Form Verilerinin Hazırlanması
+      const formFields = {
+        merchant_id,
+        user_ip,
+        merchant_oid,
+        email,
+        payment_type,
+        payment_amount: Number(payment_amount),
+        currency,
+        test_mode,
+        non_3d,
+        merchant_ok_url: params.merchantOkUrl,
+        merchant_fail_url: params.merchantFailUrl,
+        user_name: params.userName,
+        user_address: params.userAddress,
+        user_phone: params.userPhone,
+        user_basket,
+        debug_on: this.debugOn,
+        client_lang: params.clientLang || 'tr',
+        paytr_token,
+        installment_count: installment_count,
+        card_type: params.cardType, 
+        non3d_test_failed: params.non3dTestFailed || '0',
+        no_installment: params.noInstallment || '0',
+        max_installment: params.maxInstallment || '0',
+        lang: params.lang || 'tr',
+        // Kart Bilgileri (Form otomatik post edileceği için buraya eklenmeli)
+        cc_owner: params.cardOwner,
+        card_number: params.cardNumber,
+        expiry_month: params.cardExpireMonth,
+        expiry_year: params.cardExpireYear,
+        cvv: params.cardCvc
+      };
 
-      const formData = new URLSearchParams();
-      formData.append('merchant_id', this.merchantId);
-      formData.append('user_ip', userIp);
-      formData.append('merchant_oid', merchantOid);
-      formData.append('email', email);
-      formData.append('payment_amount', paymentAmount);
-      formData.append('paytr_token', paytrToken);
-      formData.append('user_basket', userBasket);
-      formData.append('debug_on', this.debugOn);
-      formData.append('test_mode', this.testMode);
-      formData.append('payment_type', paymentType);
-      formData.append('installment_count', installmentCount);
-      formData.append('currency', currency);
-      formData.append('non_3d', non3D);
-      formData.append('cc_owner', params.cardOwner);
-      formData.append('card_number', params.cardNumber);
-      formData.append('expiry_month', params.cardExpireMonth);
-      formData.append('expiry_year', params.cardExpireYear);
-      formData.append('cvc', params.cardCvc);
-      formData.append('user_name', params.userName);
-      formData.append('user_address', params.userAddress);
-      formData.append('user_phone', params.userPhone);
-      formData.append('merchant_ok_url', params.merchantOkUrl);
-      formData.append('merchant_fail_url', params.merchantFailUrl);
+      // 4. HTML Formunun Oluşturulması
+      // Form oluşturulur, inputlar gizlenir ve script ile otomatik submit edilir.
+      let html = `
+        <!DOCTYPE html>
+        <html>
+        <head><title>Redirecting to Payment...</title></head>
+        <body>
+            <form id="paytr_auto_form" action="https://www.paytr.com/odeme" method="post">
+      `;
+
+      for (const [key, value] of Object.entries(formFields)) {
+        // Değer undefined veya null ise boş string gönderelim, güvenlik için escape yapalım
+        const safeValue = value ? String(value).replace(/"/g, '&quot;') : '';
+        html += `<input type="hidden" name="${key}" value="${safeValue}">\n`;
+      }
 
-      const response = await axios({
-        method: 'POST',
-        url: 'https://www.paytr.com/odeme/api/direct',
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-        data: formData
-      });
+      html += `
+            </form>
+            <script>
+                document.getElementById("paytr_auto_form").submit();
+            </script>
+        </body>
+        </html>
+      `;
 
-      const result = response.data;
+      return html;
 
-      if (result.status === 'success') {
-        return result; 
-      } else {
-        throw new Error(result.reason || 'PayTR Direct API Hatası');
-      }
     } catch (error) {
-       if (error.response) throw new Error(`PayTR API Error: ${error.response.data.reason || error.response.statusText}`);
-      throw error;
+      throw new Error(`PayTR HTML oluşturma hatası: ${error.message}`);
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quickpos",
-  "version": "1.0.917",
+  "version": "1.0.918",
   "main": "app.js",
   "scripts": {
     "test": "node test.js"