Make stripe redirect to site with transaction_id + orders changes

db/orders.go

@@ -3,9 +3,10 @@ package db
 import (
 	"errors"
 	"fmt"
+	"time"
+
 	"github.com/Quaver/api2/enums"
 	"gorm.io/gorm"
-	"time"
 )
 
 type OrderStatus string
@@ -18,8 +19,8 @@ const (
 type Order struct {
 	Id             int                      `gorm:"column:id; PRIMARY_KEY" json:"id"`
 	UserId         int                      `gorm:"column:user_id" json:"user_id"`
-	OrderId        int                      `gorm:"column:order_id" json:"-"`
-	TransactionId  string                   `gorm:"column:transaction_id" json:"-"`
+	OrderId        int                      `gorm:"column:order_id" json:"order_id"`
+	TransactionId  string                   `gorm:"column:transaction_id" json:"transaction_id"`
 	IPAddress      string                   `gorm:"column:ip_address" json:"-"`
 	ItemId         OrderItemId              `gorm:"column:item_id" json:"item_id"`
 	Quantity       int                      `gorm:"column:quantity" json:"quantity"`
@@ -254,14 +255,17 @@ func (order *Order) FinalizeUserAccentColor() error {
 }
 
 // GetUserOrders Gets a user's orders
-func GetUserOrders(userId int) ([]*Order, error) {
+func GetUserOrders(userId int, limit int, page int) ([]*Order, error) {
 	var orders = make([]*Order, 0)
 
 	result := SQL.
 		Preload("Receiver").
 		Preload("Item").
 		Preload("Subscription").
 		Where("orders.user_id = ? AND orders.status = ?", userId, "Completed").
+		Order("orders.timestamp DESC").
+		Limit(limit).
+		Offset(page * limit).
 		Find(&orders)
 
 	if result.Error != nil {

handlers/orders.go

@@ -82,7 +82,13 @@ func GetUserOrders(c *gin.Context) *APIError {
 		return nil
 	}
 
-	orders, err := db.GetUserOrders(user.Id)
+	page, err := strconv.Atoi(c.Query("page"))
+
+	if err != nil {
+		page = 0
+	}
+
+	orders, err := db.GetUserOrders(user.Id, 10, page)
 
 	if err != nil {
 		return APIErrorServerError("Error retrieving orders from db", err)

handlers/orders_stripe.go

@@ -14,6 +14,7 @@ import (
 	"gorm.io/gorm"
 	"io"
 	"net/http"
+	"strings"
 	"time"
 )
 
@@ -62,7 +63,7 @@ func InitiateStripeDonatorCheckoutSession(c *gin.Context) *APIError {
 			},
 		},
 		Mode:         stripe.String(string(getStripeCheckoutMode(body.Recurring))),
-		SuccessURL:   stripe.String(config.Instance.Stripe.DonateRedirectUrl),
+		SuccessURL:   stripe.String(getStripeSuccessURL(config.Instance.Stripe.DonateRedirectUrl)),
 		AutomaticTax: &stripe.CheckoutSessionAutomaticTaxParams{Enabled: stripe.Bool(true)},
 	}
 
@@ -298,7 +299,7 @@ func createStripeCheckoutSession(c *gin.Context, orders []*db.Order) *APIError {
 	params := &stripe.CheckoutSessionParams{
 		LineItems:    lineItems,
 		Mode:         stripe.String(string(stripe.CheckoutSessionModePayment)),
-		SuccessURL:   stripe.String(config.Instance.Stripe.StorePaymentRedirectUrl),
+		SuccessURL:   stripe.String(getStripeSuccessURL(config.Instance.Stripe.StorePaymentRedirectUrl)),
 		AutomaticTax: &stripe.CheckoutSessionAutomaticTaxParams{Enabled: stripe.Bool(true)},
 	}
 
@@ -328,6 +329,16 @@ func createStripeCheckoutSession(c *gin.Context, orders []*db.Order) *APIError {
 	return nil
 }
 
+func getStripeSuccessURL(redirectURL string) string {
+	separator := "?"
+
+	if strings.Contains(redirectURL, "?") {
+		separator = "&"
+	}
+
+	return fmt.Sprintf("%s%sorder_id=-1&transaction_id={CHECKOUT_SESSION_ID}", redirectURL, separator)
+}
+
 // Gets the donator price id for Stripe
 func getStripeDonatorPriceId(months int, isRecurring bool) string {
 	if config.Instance.IsProduction {