payment api updated and running, invoice print format updated.

ns_app/api/payments.py

@@ -1,5 +1,6 @@
 import frappe
 import requests
+import urllib.parse
 from frappe.utils import nowdate
 
 
@@ -9,7 +10,7 @@ def check_autopay(customer):
 
     return {
         "autopay_enabled": bool(cust.custom_auto_pay_status),
-        "autopay_id": cust.auto_pay_id if cust.custom_auto_pay_status else None
+        "autopay_id": cust.custom_auto_pay_id if cust.custom_auto_pay_status else None
     }
 
 
@@ -22,11 +23,11 @@ def run_autopay_payment(invoice):
 
     cust = frappe.get_doc("Customer", inv.customer)
 
-    if not cust.custom_auto_pay_status or not cust.auto_pay_id:
+    if not cust.custom_auto_pay_status or not cust.custom_auto_pay_id:
         frappe.throw("Customer does not have AutoPay enabled")
 
     payload = {
-        "autopay_id": cust.auto_pay_id,
+        "autopay_id": cust.custom_auto_pay_id,
         "amount": float(inv.outstanding_amount),
         "invoice": inv.name
     }
@@ -57,33 +58,62 @@ def call_payment_api(payload):
     if not api_username or not api_password:
         frappe.throw("Payment gateway credentials not configured")
 
+    invoice = payload["invoice"]
+
     data = {
         "username": api_username,
         "password": api_password,
         "type": "sale",
         "customer_vault_id": payload["autopay_id"],
         "amount": payload["amount"],
-        "orderid": payload["invoice"],
-        "response": "json"
+        "orderid": invoice
     }
 
     try:
         response = requests.post(url, data=data, timeout=30)
         response.raise_for_status()
-        result = response.json()
+        frappe.logger("payments").info(
+            f"NMI PAYMENT | Invoice: {invoice} | Amount: {payload['amount']} | Response: {response.text}"
+        )
+
+        if not response.text:
+            frappe.throw("Payment processor returned empty response")
+
+        # Parse gateway response
+        result = urllib.parse.parse_qs(response.text)
+
+        success = result.get("response", ["0"])[0]
+        transaction_id = result.get("transactionid", [""])[0]
+        message = result.get("responsetext", ["Payment failed"])[0]
+        payment_type = result.get("type", [""])[0]
+
     except Exception:
         frappe.log_error(frappe.get_traceback(), "NMI Payment API Error")
         frappe.throw("Payment processor unreachable")
 
-    if result.get("response") == "1":
+    if success == "1":
+
+        # Detect payment mode
+        if payment_type == "check":
+            mode_of_payment = "ACH"
+        else:
+            mode_of_payment = "Credit Card"
+
+        create_payment_entry(
+            invoice=invoice,
+            amount=payload["amount"],
+            transaction_id=transaction_id,
+            mode_of_payment=mode_of_payment
+        )
+
         return {
             "success": True,
-            "transaction_id": result.get("transactionid")
+            "transaction_id": transaction_id
         }
 
     return {
         "success": False,
-        "error": result.get("responsetext", "Payment failed")
+        "error": message
     }
 
 
@@ -101,47 +131,64 @@ def get_collect_checkout_url(invoice):
 def crystalclear_webhook():
     data = frappe.local.form_dict
 
-    # Validate success
     if data.get("response") != "1":
         return "ignored"
 
     invoice = data.get("orderid")
     amount = data.get("amount")
     transaction_id = data.get("transactionid")
+    payment_type = data.get("type")
 
-    # Prevent duplicates
-    if frappe.db.exists("Payment Entry", {"reference_no": transaction_id}):
-        return "duplicate"
+    if payment_type == "check":
+        mode_of_payment = "ACH"
+    else:
+        mode_of_payment = "Credit Card"
 
     create_payment_entry(
         invoice=invoice,
         amount=amount,
-        transaction_id=transaction_id
+        transaction_id=transaction_id,
+        mode_of_payment=mode_of_payment
     )
 
     return "ok"
 
 
-def create_payment_entry(invoice, amount, transaction_id=None):
+def create_payment_entry(invoice, amount, transaction_id=None, mode_of_payment=None):
+
+    # Prevent duplicates
+    if transaction_id and frappe.db.exists(
+        "Payment Entry", {"reference_no": transaction_id}
+    ):
+        return
+
     inv = frappe.get_doc("Sales Invoice", invoice)
 
-    paid_to = frappe.db.get_value(
-        "Company",
-        inv.company,
-        "default_cash_account"
-    )
+    # Account logic
+    if mode_of_payment in ["ACH", "Credit Card"]:
+        paid_to = "ENB Bank Account - NIL"
+    else:
+        paid_to = frappe.db.get_value(
+            "Company",
+            inv.company,
+            "default_cash_account"
+        )
 
     if not paid_to:
-        frappe.throw("Default cash account not set for company")
+        frappe.throw("No receiving account configured")
 
     pe = frappe.new_doc("Payment Entry")
     pe.payment_type = "Receive"
     pe.party_type = "Customer"
     pe.party = inv.customer
     pe.posting_date = nowdate()
+
+    pe.mode_of_payment = mode_of_payment or "Credit Card"
+
     pe.paid_amount = amount
     pe.received_amount = amount
     pe.paid_to = paid_to
+
     pe.reference_no = transaction_id
     pe.reference_date = nowdate()
 
@@ -154,4 +201,4 @@ def create_payment_entry(invoice, amount, transaction_id=None):
     pe.insert(ignore_permissions=True)
     pe.submit()
 
-    return pe.name
+    return pe.name