diff --git a/backend/cmd/app/main.go b/backend/cmd/app/main.go index ac0f1a6..0570e1b 100644 --- a/backend/cmd/app/main.go +++ b/backend/cmd/app/main.go @@ -91,13 +91,13 @@ func main() { mux.HandleFunc("GET /u/{username}/dashboard", userHandler.DashboardView) mux.HandleFunc("GET /u/{username}/card", userHandler.CardView) mux.HandleFunc("GET /u/{username}/topup", userHandler.TopUpView) - // Your frontend calls this to get the Stripe URL - mux.HandleFunc("POST /api/topup/create-session/{username}", userHandler.CreateStripeCheckoutSession) + // Your frontend calls this to get the Xendit URL + mux.HandleFunc("POST /api/topup/create-session/{username}", userHandler.CreateXenditInvoice) // Payment gateway endpoints - // STRIPE'S servers call this behind the scenes when the payment is done - mux.HandleFunc("POST /api/webhooks/stripe", userHandler.StripeWebhook) - mux.HandleFunc("POST /v1/user/{username}/topup/checkout", userHandler.CreateStripeCheckoutSession) // + // Xendit's servers call this behind the scenes when the payment is done + mux.HandleFunc("POST /api/webhooks/xendit", userHandler.XenditWebhook) + mux.HandleFunc("POST /v1/user/{username}/topup/checkout", userHandler.CreateXenditInvoice) // //mux.HandleFunc("GET /v1/user/{username}/topup/success", userHandler.TopUpSuccessHandler) mux.HandleFunc("GET /u/{username}/transaction", userHandler.TransactionView) mux.HandleFunc("GET /u/{username}/transactions", userHandler.TransactionView) diff --git a/backend/internal/user/customer_topup.go b/backend/internal/user/customer_topup.go index 8d642d3..ee1f941 100644 --- a/backend/internal/user/customer_topup.go +++ b/backend/internal/user/customer_topup.go @@ -10,15 +10,20 @@ import ( "time" jsonwrite "unicard-go/backend/internal/pkg/handler" - "github.com/stripe/stripe-go/v85" - "github.com/stripe/stripe-go/v85/checkout/session" + "github.com/xendit/xendit-go" + "github.com/xendit/xendit-go/invoice" ) +// struct for topup request only, for api call not for saving in db type TopUpRequest struct { CardNumber string `json:"card_number"` Amount float64 `json:"amount"` } +// struct for topup record, for saving in db and for webhook callback processing +// note the fields that match the db schema +// the external_id is encoded in the external_id field of the xendit invoice +// this is necessary because xendit v1 doesn't have a metadata field type TopUpRecord struct { TopupID string `json:"topup_id" db:"topup_id"` CardNumber string `json:"card_number" db:"card_number"` @@ -28,9 +33,11 @@ type TopUpRecord struct { PaymentMethod string `json:"payment_method" db:"payment_method"` } +// TopUpView displays the top-up page for a user func (h *Handler) TopUpView(w http.ResponseWriter, r *http.Request) { fmt.Println("TopUp view is running...") + // get username from url parameter username := r.PathValue("username") data := struct { Username string @@ -41,9 +48,13 @@ func (h *Handler) TopUpView(w http.ResponseWriter, r *http.Request) { h.Tpl.ExecuteTemplate(w, "customer_topup.html", data) } -func (h *Handler) CreateStripeCheckoutSession(w http.ResponseWriter, r *http.Request) { +// create xendit invoice - Payment Methods Options +// CREDIT_CARD, QR_CODE, EWALLET +func (h *Handler) CreateXenditInvoice(w http.ResponseWriter, r *http.Request) { + // get username from url parameter username := r.PathValue("username") + // get request body var req TopUpRequest if err := json.NewDecoder(r.Body).Decode(&req); err != nil { jsonwrite.WriteJSON(w, http.StatusBadRequest, jsonwrite.APIResponse{ @@ -52,6 +63,8 @@ func (h *Handler) CreateStripeCheckoutSession(w http.ResponseWriter, r *http.Req }) return } + + // check if amount is at least 50 pesos if req.Amount < 50 { jsonwrite.WriteJSON(w, http.StatusBadRequest, jsonwrite.APIResponse{ Success: false, @@ -70,6 +83,8 @@ func (h *Handler) CreateStripeCheckoutSession(w http.ResponseWriter, r *http.Req `, username).Scan(&cardNumber, &email) if err != nil { + // print error and return + log.Println("Failed to find card for user:", err) jsonwrite.WriteJSON(w, http.StatusInternalServerError, jsonwrite.APIResponse{ Success: false, Message: "Failed to find card for user", @@ -77,59 +92,43 @@ func (h *Handler) CreateStripeCheckoutSession(w http.ResponseWriter, r *http.Req return } - // Stripe takes amount in cents/lowest denomination. For PHP, it's centavos. - topupCentavos := int64(req.Amount * 100) // ex: 100 -> 10000 - feeCentavos := int64(15 * 100) // 15 pesos for fee + // set fee amount and total amount + topupAmount := req.Amount + feeAmount := 15.00 + totalAmount := topupAmount + feeAmount + + // set domain domain := "http://" + os.Getenv("SERVER_PORT") + os.Getenv("PORT") // Fallback if domain is malformed if domain == "http://" { - domain = "http://localhost:3000" + domain = "http://127.0.0.1:3000" } - stripe.Key = os.Getenv("STRIPE_SECRET_KEY") - params := &stripe.CheckoutSessionParams{ - PaymentMethodTypes: stripe.StringSlice([]string{ - "card", - }), - Metadata: map[string]string{ - "card_number": cardNumber, // Use securely fetched card number from DB! - "base_amount": fmt.Sprintf("%.2f", req.Amount), - "convenience_fee": "15.00", - }, - LineItems: []*stripe.CheckoutSessionLineItemParams{ - { - PriceData: &stripe.CheckoutSessionLineItemPriceDataParams{ - Currency: stripe.String("php"), - ProductData: &stripe.CheckoutSessionLineItemPriceDataProductDataParams{ - Name: stripe.String("Unicard Top-Up"), - Description: stripe.String("Top up your unicard with stripe payment"), - }, - UnitAmount: stripe.Int64(topupCentavos), - }, - Quantity: stripe.Int64(1), - }, - { - PriceData: &stripe.CheckoutSessionLineItemPriceDataParams{ - Currency: stripe.String("php"), - ProductData: &stripe.CheckoutSessionLineItemPriceDataProductDataParams{ - Name: stripe.String("Convienence Fee"), - Description: stripe.String("15 peso convienence fee"), - }, - UnitAmount: stripe.Int64(feeCentavos), - }, - Quantity: stripe.Int64(1), - }, - }, - Mode: stripe.String(string(stripe.CheckoutSessionModePayment)), - SuccessURL: stripe.String(domain + "/u/" + username + "/dashboard"), - CancelURL: stripe.String(domain + "/u/" + username + "/topup"), + + // set xendit secret key + xendit.Opt.SecretKey = os.Getenv("XENDIT_SECRET_KEY") + + // Encode metadata into ExternalID since Xendit v1 doesn't have metadata field on CreateParams + // Format: TOPUP{CardNumber}{TopupAmount}{FeeAmount}{Timestamp} + externalID := fmt.Sprintf("TOPUP%s%.2f%.2f%d", cardNumber, topupAmount, feeAmount, time.Now().UnixNano()) + + // create xendit invoice struct with parameters + data := invoice.CreateParams{ + ExternalID: externalID, + Amount: totalAmount, + PayerEmail: email, + Description: fmt.Sprintf("Unicard Top-Up (Card: %s)", cardNumber), + SuccessRedirectURL: domain + "/u/" + username + "/dashboard", + FailureRedirectURL: domain + "/u/" + username + "/topup", + PaymentMethods: []string{"CREDIT_CARD", "EWALLET", "QR_CODE"}, + Currency: "PHP", } // creating the checkout session - s, err := session.New(params) + resp, xErr := invoice.Create(&data) // Handle error if session creation fails - if err != nil { - log.Println("Failed to create checkout session:", err) + if xErr != nil { + log.Println("Failed to create checkout session:", xErr) jsonwrite.WriteJSON(w, http.StatusInternalServerError, jsonwrite.APIResponse{ Success: false, Message: "Failed to create checkout session", @@ -138,13 +137,15 @@ func (h *Handler) CreateStripeCheckoutSession(w http.ResponseWriter, r *http.Req } // Handle success case + // return the checkout session url to the frontend jsonwrite.WriteJSON(w, http.StatusOK, jsonwrite.APIResponse{ Success: true, Message: "Checkout session created successfully", - Data: map[string]string{"url": s.URL}, + Data: map[string]string{"url": resp.InvoiceURL}, }) - log.Println("Checkout session created successfully:", s.URL) + // log the checkout session url + log.Println("Checkout session created successfully:", resp.InvoiceURL) } // save topup tp database @@ -202,7 +203,7 @@ func (h *Handler) SaveTopUpToDatabase(w http.ResponseWriter, r *http.Request) { // Insert into Spending Ledger (transactions table) // *Note: Adjust 'category' if your enum doesn't include 'top_up' queryTx := `INSERT INTO transactions (transaction_id, card_number, merchant_id, terminal_id, transaction_type, amount, service_fee, processed_by) VALUES (?, ?, ?, ?, ?, ?, ?, ?)` - // "Stripe" as the merchant_id since this is an internal load, not a retail/Fare purchase + // "xendit" as the merchant_id since this is an internal load, not a retail/Fare purchase if _, err := tx.Exec(queryTx, transactionID, req.CardNumber, sql.NullString{}, sql.NullString{}, "topup", req.Amount, req.ConvenienceFee, sql.NullString{}); err != nil { log.Println("Failed to record global transaction:", err) jsonwrite.WriteJSON(w, http.StatusInternalServerError, jsonwrite.APIResponse{ diff --git a/backend/internal/user/dashboard.go b/backend/internal/user/dashboard.go index 5fe8f6f..3298fd8 100644 --- a/backend/internal/user/dashboard.go +++ b/backend/internal/user/dashboard.go @@ -17,6 +17,7 @@ type Transaction struct { Description string `json:"description" db:"description"` Type string `json:"type" db:"transaction_type"` Amount float64 `json:"amount" db:"transaction_amount"` + Status string `json:"status" db:"status"` } // DashboardUser info struct for the user dashboard view @@ -50,10 +51,9 @@ func (h *Handler) DashboardView(w http.ResponseWriter, r *http.Request) { h.Tpl.ExecuteTemplate(w, "dashboard.html", data) } - func (h *Handler) DashboardHandler(w http.ResponseWriter, r *http.Request) { fmt.Println("Dashboard JSON handler is running...") - + // Get user ID from path param (No cookies for now) userID := r.PathValue("username") if userID == "" { @@ -136,39 +136,43 @@ func (h *Handler) DashboardHandler(w http.ResponseWriter, r *http.Request) { // Fetch recent transactions txnQuery := ` - SELECT t.transaction_id, t.created_at, m.business_name, t.transaction_type, t.amount, t.terminal_id, t.processed_by - FROM transactions t - JOIN cards c ON t.card_number = c.card_number - JOIN users u ON c.user_id = u.user_id - LEFT JOIN merchants m ON t.merchant_id = m.user_id - WHERE u.username = ? - ORDER BY t.created_at DESC LIMIT 5 - ` - rows, err := h.DB.Query(txnQuery, userID) - var transactions []Transaction - if err == nil { - defer rows.Close() - for rows.Next() { - var t Transaction - var createdAt string - var businessName sql.NullString - var processedBy sql.NullString - if err := rows.Scan(&t.TransactionID, &createdAt, &businessName, &t.Type, &t.Amount, &t.TerminalID, &processedBy); err == nil { - t.Date = formatDate(createdAt) - t.Time = formatTime(createdAt) - if businessName.Valid { - t.Description = businessName.String - } else if processedBy.Valid && processedBy.String == "stripe" { - t.Description = "Stripe Top-Up" - } else { - t.Description = "Terminal Simulation" - } - transactions = append(transactions, t) - } - } - } else { - fmt.Printf("Error fetching transactions: %v\n", err) - } + SELECT t.transaction_id, t.description, t.created_at, t.transaction_type, t.amount, t.terminal_id, t.status + FROM transactions t + JOIN cards c ON t.card_number = c.card_number + JOIN users u ON c.user_id = u.user_id + WHERE u.username = ? + ORDER BY t.created_at DESC LIMIT 5 +` +rows, err := h.DB.Query(txnQuery, userID) +var transactions []Transaction +if err != nil { + fmt.Printf("Error fetching transactions: %v\n", err) +} else { + defer rows.Close() + for rows.Next() { + var t Transaction + var createdAt string + var description sql.NullString + if err := rows.Scan( + &t.TransactionID, + &description, + &createdAt, + &t.Type, + &t.Amount, + &t.TerminalID, + &t.Status, + ); err != nil { + fmt.Printf("Error scanning transaction row: %v\n", err) + continue + } + t.Date = formatDate(createdAt) + t.Time = formatTime(createdAt) + if description.Valid { + t.Description = description.String + } + transactions = append(transactions, t) + } +} dashboardUser := DashboardUser{ ID: id, diff --git a/backend/internal/user/stripe_webhook.go b/backend/internal/user/stripe_webhook.go deleted file mode 100644 index 82f98a2..0000000 --- a/backend/internal/user/stripe_webhook.go +++ /dev/null @@ -1,105 +0,0 @@ -package user - -import ( - "encoding/json" - "fmt" - "io" - "log" - "net/http" - "os" - "strconv" - "time" - - "github.com/stripe/stripe-go/v85" - "github.com/stripe/stripe-go/v85/webhook" -) - -// StripeWebhook is the endpoint Stripe will POST to when a payment succeeds -func (h *Handler) StripeWebhook(w http.ResponseWriter, r *http.Request) { - const MaxBodyBytes = int64(65536) - r.Body = http.MaxBytesReader(w, r.Body, MaxBodyBytes) - - payload, err := io.ReadAll(r.Body) - if err != nil { - http.Error(w, "Error reading request body", http.StatusServiceUnavailable) - return - } - - // 1. Verify the request actually came from Stripe - endpointSecret := os.Getenv("STRIPE_WEBHOOK_SECRET") // Get this from your Stripe Dashboard - signatureHeader := r.Header.Get("Stripe-Signature") - - event, err := webhook.ConstructEventWithOptions(payload, signatureHeader, endpointSecret, webhook.ConstructEventOptions{ - IgnoreAPIVersionMismatch: true, - }) - if err != nil { - log.Println("Webhook signature verification failed:", err) - http.Error(w, "Bad signature", http.StatusBadRequest) - return - } - - // 2. Only process successful checkout sessions - if event.Type == "checkout.session.completed" { - var session stripe.CheckoutSession - err := json.Unmarshal(event.Data.Raw, &session) - if err != nil { - log.Println("Error parsing webhook JSON:", err) - http.Error(w, "Error parsing webhook JSON", http.StatusBadRequest) - return - } - - // 3. Extract the hidden data we passed earlier - cardNumber := session.Metadata["card_number"] - amountStr := session.Metadata["base_amount"] - feeStr := session.Metadata["convenience_fee"] - - baseAmount, _ := strconv.ParseFloat(amountStr, 64) - convenienceFee, _ := strconv.ParseFloat(feeStr, 64) - - // 4. Safely write to the database - err = h.processSuccessfulTopUp(cardNumber, baseAmount, convenienceFee) - if err != nil { - log.Println("Database transaction failed:", err) - http.Error(w, "Database error", http.StatusInternalServerError) - return - } - - log.Printf("Successfully loaded ₱%.2f onto card %s", baseAmount, cardNumber) - } - - // Stripe expects a 200 OK immediately to know we received the event - w.WriteHeader(http.StatusOK) -} - -// Helper function to handle the database transaction (This replaces your old HTTP handler) -func (h *Handler) processSuccessfulTopUp(cardNumber string, baseAmount float64, convenienceFee float64) error { - topupID := fmt.Sprintf("TOPUP-%d", time.Now().UnixNano()) - transactionID := fmt.Sprintf("TX-%d", time.Now().UnixNano()) - - tx, err := h.DB.Begin() - if err != nil { - return err - } - defer tx.Rollback() - - // Update User Balance - if _, err := tx.Exec(`UPDATE cards SET balance = balance + ? WHERE card_number = ?`, baseAmount, cardNumber); err != nil { - return err - } - - // Insert into Loading Ledger (top_ups table) - // NOTE: handled_by is nil because this is automated - queryTopUp := `INSERT INTO top_ups (topup_id, card_number, amount, convenience_fee, payment_method) VALUES (?, ?, ?, ?, ?)` - if _, err := tx.Exec(queryTopUp, topupID, cardNumber, baseAmount, convenienceFee, "stripe"); err != nil { - return err - } - - // Insert into Spending Ledger (transactions table) - // NOTE: Ensure "SYS_STRIPE", "SYS_TERM" and "SYS_BOT" exist in your merchants, terminals and users tables to prevent Foreign Key crashes! - queryTx := `INSERT INTO transactions (transaction_id, card_number, transaction_type, amount, service_fee) VALUES (?, ?, ?, ?, ?)` - if _, err := tx.Exec(queryTx, transactionID, cardNumber, "topup", baseAmount, convenienceFee); err != nil { - return err - } - - return tx.Commit() -} diff --git a/backend/internal/user/transaction.go b/backend/internal/user/transaction.go index c41a42e..8b9ea46 100644 --- a/backend/internal/user/transaction.go +++ b/backend/internal/user/transaction.go @@ -36,7 +36,7 @@ func (h *Handler) TransactionsJSONHandler(w http.ResponseWriter, r *http.Request // Fetch transactions txnQuery := ` - SELECT t.transaction_id, t.created_at, m.business_name, t.transaction_type, t.amount, t.terminal_id + SELECT t.transaction_id, t.created_at, m.business_name, t.transaction_type, t.amount, t.terminal_id, t.description, t.status FROM transactions t JOIN cards c ON t.card_number = c.card_number JOIN users u ON c.user_id = u.user_id @@ -65,8 +65,16 @@ func (h *Handler) TransactionsJSONHandler(w http.ResponseWriter, r *http.Request var createdAt string var businessName sql.NullString var terminalId sql.NullString - if err := rows.Scan(&t.TransactionID, &createdAt, &businessName, &t.Type, &t.Amount, &terminalId); err == nil { - t.Status = "Completed" + var dbDescription sql.NullString + var dbStatus sql.NullString + if err := rows.Scan(&t.TransactionID, &createdAt, &businessName, &t.Type, &t.Amount, &terminalId, &dbDescription, &dbStatus); err == nil { + + if dbStatus.Valid && dbStatus.String != "" { + t.Status = dbStatus.String + } else { + t.Status = "Completed" + } + t.Date = formatDate(createdAt) // Uses formatDate from dashboard.go t.Time = formatTime(createdAt) // Uses formatTime from dashboard.go @@ -76,7 +84,9 @@ func (h *Handler) TransactionsJSONHandler(w http.ResponseWriter, r *http.Request t.TerminalID = "N/A" } - if businessName.Valid { + if dbDescription.Valid && dbDescription.String != "" { + t.Description = dbDescription.String + } else if businessName.Valid { t.Description = businessName.String } else if t.Type == "topup" { t.Description = "Stripe Top-Up" diff --git a/backend/internal/user/xendit_webhook.go b/backend/internal/user/xendit_webhook.go new file mode 100644 index 0000000..a4cc81a --- /dev/null +++ b/backend/internal/user/xendit_webhook.go @@ -0,0 +1,182 @@ +package user + +import ( + "encoding/json" + "fmt" + "io" + "log" + "net/http" + "os" + "strconv" + "strings" + "time" +) + +// XenditWebhookPayload represents the expected payload from Xendit Invoice webhook +type XenditWebhookPayload struct { + ID string `json:"id"` + ExternalID string `json:"external_id"` + UserID string `json:"user_id"` + IsHigh bool `json:"is_high"` + PaymentMethod string `json:"payment_method"` + Status string `json:"status"` + MerchantName string `json:"merchant_name"` + Amount float64 `json:"amount"` + PaidAmount float64 `json:"paid_amount"` + BankCode string `json:"bank_code"` + PaidAt string `json:"paid_at"` + PayerEmail string `json:"payer_email"` + Description string `json:"description"` + AdjustedReceivedAmount float64 `json:"adjusted_received_amount"` + FeesPaidAmount float64 `json:"fees_paid_amount"` + Updated string `json:"updated"` + Created string `json:"created"` + Currency string `json:"currency"` + PaymentChannel string `json:"payment_channel"` + PaymentDestination string `json:"payment_destination"` +} + +// XenditWebhook handles incoming webhook notifications from Xendit for invoice payments. +// It validates the callback token, processes the payment payload, and updates the user's balance. +// more info here: https://developers.xendit.co/docs/invoices#handling-invoice-completion-via-webhooks +func (h *Handler) XenditWebhook(w http.ResponseWriter, r *http.Request) { + // Verify Xendit Callback Token + xenditToken := os.Getenv("XENDIT_WEBHOOK_KEY") + callbackToken := r.Header.Get("x-callback-token") + + // If no token is configured, skip validation for development, but it's recommended to have it + if xenditToken != "" && callbackToken != xenditToken { + log.Println("Invalid x-callback-token") + http.Error(w, "Unauthorized", http.StatusUnauthorized) + return + } + + // read body from xendit invoice webhook + body, err := io.ReadAll(r.Body) + if err != nil { + log.Println("Failed to read body") + http.Error(w, "Bad request", http.StatusBadRequest) + return + } + + // parse body + var payload XenditWebhookPayload + if err := json.Unmarshal(body, &payload); err != nil { + log.Println("Failed to parse webhook JSON:", err) + http.Error(w, "Bad request", http.StatusBadRequest) + return + } + + // switch case for payment status + switch payload.Status { + case "PAID", "SETTLED": + externalID := payload.ExternalID + // check if external id is for top up + if strings.HasPrefix(externalID, "TOPUP") && len(externalID) > 21 { + // TOPUP is 5 chars, CardNumber is strictly 16 chars + // indexes 5 to 21 + cardNumber := externalID[5:21] + + remainder := externalID[21:] + // find first dot + firstDot := strings.Index(remainder, ".") + if firstDot == -1 || len(remainder) < firstDot+3 { + log.Println("Invalid external ID format: missing base amount") + http.Error(w, "Invalid external ID data", http.StatusBadRequest) + return + } + baseAmountStr := remainder[:firstDot+3] // e.g. 50.00 + + remainder2 := remainder[firstDot+3:] + // find second dot + secondDot := strings.Index(remainder2, ".") + if secondDot == -1 || len(remainder2) < secondDot+3 { + log.Println("Invalid external ID format: missing fee amount") + http.Error(w, "Invalid external ID data", http.StatusBadRequest) + return + } + convenienceFeeStr := remainder2[:secondDot+3] // e.g. 15.00 + + // convert string to float + baseAmount, err1 := strconv.ParseFloat(baseAmountStr, 64) + convenienceFee, err2 := strconv.ParseFloat(convenienceFeeStr, 64) + + if err1 != nil || err2 != nil { + log.Println("Failed to parse amounts from external ID") + http.Error(w, "Invalid external ID data", http.StatusBadRequest) + return + } + + // process successful top up + err := h.processSuccessfulTopUp(cardNumber, baseAmount, convenienceFee, 0.0, "xendit", payload.ExternalID) + if err != nil { + log.Println("Database transaction failed:", err) + w.WriteHeader(http.StatusOK) // don't return 500 to Xendit + return + } + + log.Printf("Successfully loaded ₱%.2f onto card %s via Xendit", baseAmount, cardNumber) + } else { + log.Println("Unrecognized External ID format:", payload.ExternalID) + } + // log if payment failed or expired + case "EXPIRED", "FAILED": + log.Printf("Payment failed for external ID: %s, status: %s", payload.ExternalID, payload.Status) + } + + // Always 200 OK to Xendit + w.WriteHeader(http.StatusOK) +} + +// Helper function to handle the database transaction +func (h *Handler) processSuccessfulTopUp(cardNumber string, baseAmount float64, convenienceFee float64, paymentGatewayCost float64, paymentMethod string, externalID string) error { + topupID := fmt.Sprintf("TOPUP-%d", time.Now().UnixNano()) + transactionID := fmt.Sprintf("TX-%d", time.Now().UnixNano()) + + // begin transaction to make sure that all database operations are performed in a single unit of work + // if any operation fails, the entire transaction will be rolled back and the database will be left unchanged + tx, err := h.DB.Begin() + if err != nil { + return err + } + // if transaction fails, rollback not close the transaction + // Rollback() will do nothing if the transaction is already closed (committed or rolled back) + // so that's why we use defer tx.Rollback() + // This pattern ensures that the database connection is properly managed + // and that any errors during the transaction are handled gracefully. + defer tx.Rollback() + + // Check if already processed + // this prevents double top up if xendit sends multiple webhooks or network delay causes multiple requests + // using external_id as unique identifier for each top up + var exists bool + if err := tx.QueryRow(`SELECT EXISTS(SELECT 1 FROM top_ups WHERE external_id = ?)`, externalID).Scan(&exists); err != nil { + return err + } + if exists { + return nil // already processed, skip silently + } + + // Update User Balance + // Using atomic update to prevent race conditions + if _, err := tx.Exec(`UPDATE cards SET balance = balance + ? WHERE card_number = ?`, baseAmount, cardNumber); err != nil { + return err + } + + // Insert into Loading Ledger (top_ups table) + // top_ups table is our loading ledger + queryTopUp := `INSERT INTO top_ups (topup_id, card_number, amount, convenience_fee, gateway_cost, payment_method, handled_by, external_id) VALUES (?, ?, ?, ?, ?, ?, ?, ?)` + if _, err := tx.Exec(queryTopUp, topupID, cardNumber, baseAmount, convenienceFee, paymentGatewayCost, paymentMethod, "payment gateway", externalID); err != nil { + return err + } + + // Insert into Spending Ledger (transactions table) + // transactions table is our spending ledger + queryTx := `INSERT INTO transactions (transaction_id, card_number, merchant_id, terminal_id, transaction_type, amount, service_fee, processed_by, description) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)` + if _, err := tx.Exec(queryTx, transactionID, cardNumber, "xendit", "xendit", "topup", baseAmount, convenienceFee, "xendit", "Successful topup via Xendit"); err != nil { + return err + } + + // Commit the transaction if everything is fine + return tx.Commit() +} diff --git a/frontend/assets/js/customer_topup.js b/frontend/assets/js/customer_topup.js index 826e767..aee6794 100644 --- a/frontend/assets/js/customer_topup.js +++ b/frontend/assets/js/customer_topup.js @@ -68,7 +68,7 @@ document.addEventListener("DOMContentLoaded", function () { const amount = parseFloat(amountText); const method = document.querySelector('input[name="payment_method"]:checked'); - if (!method || method.value !== 'stripe' || isNaN(amount) || amount < 50) { + if (!method || method.value !== 'xendit' || isNaN(amount) || amount < 50) { return; } @@ -105,8 +105,8 @@ document.addEventListener("DOMContentLoaded", function () { } const data = await response.json(); - if (data.url) { - window.location.href = data.url; + if (data.data && data.data.url) { + window.location.href = data.data.url; } else { throw new Error('No checkout URL returned'); } diff --git a/frontend/assets/js/dashboard.js b/frontend/assets/js/dashboard.js index e348c2c..a22384a 100644 --- a/frontend/assets/js/dashboard.js +++ b/frontend/assets/js/dashboard.js @@ -179,7 +179,7 @@ document.addEventListener("DOMContentLoaded", function () { const balanceEl = document.getElementById("user-balance"); const loyaltyPointsEl = document.getElementById("user-loyalty-points"); const accountTypeEl = document.getElementById("user-account-type"); - const transactionsBody = document.getElementById("transactions-table-body"); + const transactionsBody = document.getElementById("recent-transactions-table-body"); const cardNoEl = document.getElementById("user-card-number"); const cardHolderEl = document.getElementById("user-card-holder"); @@ -287,7 +287,7 @@ document.addEventListener("DOMContentLoaded", function () { }) .catch(error => { console.error("Error loading dashboard data:", error); - const transactionsBody = document.getElementById("transactions-table-body"); + const transactionsBody = document.getElementById("recent-transactions-table-body"); if (transactionsBody) { transactionsBody.innerHTML = ` diff --git a/frontend/assets/js/transaction.js b/frontend/assets/js/transaction.js index a1505a3..03d04b1 100644 --- a/frontend/assets/js/transaction.js +++ b/frontend/assets/js/transaction.js @@ -125,7 +125,7 @@ document.addEventListener("DOMContentLoaded", function () { let txDate = "N/A"; let txTime = ""; if (tx.date) { - const d = new Date(tx.date); + const d = new Date(tx.date + " " + (tx.time || "")); if (!isNaN(d.getTime())) { txDate = d.toLocaleDateString(undefined, { year: 'numeric', month: 'short', day: 'numeric' }); txTime = d.toLocaleTimeString(undefined, { hour: '2-digit', minute: '2-digit' }); diff --git a/frontend/templates/customer/customer_topup.html b/frontend/templates/customer/customer_topup.html index 3524391..bedbd7f 100644 --- a/frontend/templates/customer/customer_topup.html +++ b/frontend/templates/customer/customer_topup.html @@ -133,40 +133,18 @@

Add Balance

Select Payment Method

- -
diff --git a/frontend/templates/customer/dashboard.html b/frontend/templates/customer/dashboard.html index 6adbcba..3c2531a 100644 --- a/frontend/templates/customer/dashboard.html +++ b/frontend/templates/customer/dashboard.html @@ -116,7 +116,7 @@

Recent Transactions

- + Loading transactions... diff --git a/go.mod b/go.mod index 6dbcdd8..a3a6a8d 100644 --- a/go.mod +++ b/go.mod @@ -6,6 +6,8 @@ require ( github.com/go-playground/validator/v10 v10.30.2 github.com/go-sql-driver/mysql v1.9.3 github.com/joho/godotenv v1.5.1 + github.com/stripe/stripe-go/v85 v85.2.0 + github.com/xendit/xendit-go v1.0.25 golang.org/x/crypto v0.49.0 golang.org/x/time v0.15.0 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df @@ -20,8 +22,6 @@ require ( github.com/leodido/go-urn v1.4.0 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/stretchr/testify v1.11.1 // indirect - github.com/stripe/stripe-go/v81 v81.4.0 // indirect - github.com/stripe/stripe-go/v85 v85.2.0 // indirect golang.org/x/sys v0.42.0 // indirect golang.org/x/text v0.35.0 // indirect gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect diff --git a/go.sum b/go.sum index bdd44be..20dee08 100644 --- a/go.sum +++ b/go.sum @@ -5,50 +5,59 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/gabriel-vasile/mimetype v1.4.13 h1:46nXokslUBsAJE/wMsp5gtO500a4F3Nkz9Ufpk2AcUM= github.com/gabriel-vasile/mimetype v1.4.13/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s= +github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= +github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= +github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= github.com/go-playground/validator/v10 v10.30.2 h1:JiFIMtSSHb2/XBUbWM4i/MpeQm9ZK2xqPNk8vgvu5JQ= github.com/go-playground/validator/v10 v10.30.2/go.mod h1:mAf2pIOVXjTEBrwUMGKkCWKKPs9NheYGabeB04txQSc= github.com/go-sql-driver/mysql v1.9.3 h1:U/N249h2WzJ3Ukj8SowVFjdtZKfu9vlLZxjPXV1aweo= github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= +github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= +github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= +github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= -github.com/stripe/stripe-go/v81 v81.4.0 h1:AuD9XzdAvl193qUCSaLocf8H+nRopOouXhxqJUzCLbw= -github.com/stripe/stripe-go/v81 v81.4.0/go.mod h1:C/F4jlmnGNacvYtBp/LUHCvVUJEZffFQCobkzwY1WOo= github.com/stripe/stripe-go/v85 v85.2.0 h1:LomL8ulv13+y+nIKtFP48Cn/pCIZmi4IBz5qjdDn+FY= github.com/stripe/stripe-go/v85 v85.2.0/go.mod h1:5P+HGFenpWgak27T5Is6JMsmDfUC1yJnjhhmquz7kXw= +github.com/xendit/xendit-go v1.0.25 h1:o93nh+imxUwEgezPXzz9A1pMEXBHcx7V9rUICZJXmNY= +github.com/xendit/xendit-go v1.0.25/go.mod h1:JPte2sEsATw1iUHkBiZpcRuySn0CmcomaeHjfDlwpYo= golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4= golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA= -golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo= golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8= golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA= golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U= golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk= gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AWRXxgwEyPp2z+p0+hgMuE= gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=