diff --git a/internal/handlers/public/cart.go b/internal/handlers/public/cart.go
index 07ce4e8..a355263 100644
--- a/internal/handlers/public/cart.go
+++ b/internal/handlers/public/cart.go
@@ -1,7 +1,10 @@
package handlers
import (
+ "encoding/json"
"fmt"
+ "log"
+ "time"
"github.com/gofiber/fiber/v2"
"github.com/stripe/stripe-go/v74"
@@ -10,6 +13,7 @@ import (
"github.com/shurco/litecart/internal/models"
"github.com/shurco/litecart/internal/queries"
"github.com/shurco/litecart/pkg/security"
+ "github.com/shurco/litecart/pkg/webhook"
"github.com/shurco/litecart/pkg/webutil"
)
@@ -41,6 +45,7 @@ func Checkout(c *fiber.Ctx) error {
lineItems := []*stripe.CheckoutSessionLineItemParams{}
for _, item := range products.Products {
+
images := []string{}
for _, image := range item.Images {
path := fmt.Sprintf("https://%s/uploads/%s_md.%s", domain, image.Name, image.Ext)
@@ -93,6 +98,38 @@ func Checkout(c *fiber.Ctx) error {
PaymentStatus: string(stripeSession.PaymentStatus),
})
+ if err = settingStripe.Payment.Validate(); err != nil {
+ log.Printf("update payment webhook url", err)
+ } else {
+ resData := map[string]any{
+ "event": "payment_initiation",
+ "timestamp": stripeSession.Created,
+ "data": map[string]any{
+ "payment_id": stripeSession.ID,
+ "total_amount": stripeSession.AmountTotal,
+ "currency": stripeSession.Currency,
+ "cart_items": items,
+ },
+ }
+
+ jsonData, err := json.Marshal(resData)
+ if err != nil {
+ log.Println("Error:", err)
+ }
+
+ go func() {
+ res, err := webhook.SendHook(settingStripe.Payment.WebhookUrl, jsonData)
+
+ if err != nil {
+ log.Println(err)
+ }
+ if res.StatusCode != 200 {
+ log.Print("An issue has been identified with the payment webhook URL. Please verify that it responds with a status code of 200 OK.")
+ }
+ }()
+
+ }
+
return webutil.Response(c, fiber.StatusOK, "Checkout url", stripeSession.URL)
}
@@ -101,6 +138,8 @@ func Checkout(c *fiber.Ctx) error {
func CheckoutSuccess(c *fiber.Ctx) error {
db := queries.DB()
+ settingStripe, err := db.SettingStripe()
+
cartID := c.Params("cart_id")
sessionID := c.Params("session_id")
@@ -122,6 +161,40 @@ func CheckoutSuccess(c *fiber.Ctx) error {
return webutil.StatusBadRequest(c, err)
}
+ if err = settingStripe.Payment.Validate(); err != nil {
+ log.Printf("update payment webhook url", err)
+ } else {
+ resData := map[string]any{
+ "event": "payment_success",
+ "timestamp": sessionStripe.Created,
+ "data": map[string]any{
+ "payment_system": "stripe",
+ "cart_id": cartID,
+ "payment_id": sessionStripe.PaymentIntent.ID,
+ "total_amount": sessionStripe.PaymentIntent.Amount,
+ "currency": sessionStripe.PaymentIntent.Currency,
+ "user_email": sessionStripe.Customer.Email,
+ },
+ }
+
+ jsonData, err := json.Marshal(resData)
+ if err != nil {
+ log.Println("Error:", err)
+ }
+
+ go func() {
+ res, err := webhook.SendHook(settingStripe.Payment.WebhookUrl, jsonData)
+
+ if err != nil {
+ log.Println(err)
+ }
+
+ if res.StatusCode != 200 {
+ log.Print("An issue has been identified with the payment webhook URL. Please verify that it responds with a status code of 200 OK.")
+ }
+ }()
+ }
+
return c.Render("success", nil, "layouts/main")
}
@@ -130,15 +203,55 @@ func CheckoutSuccess(c *fiber.Ctx) error {
func CheckoutCancel(c *fiber.Ctx) error {
cartID := c.Params("cart_id")
db := queries.DB()
- err := db.UpdateCart(&models.Cart{
+ settingStripe, err := db.SettingStripe()
+ cartStripe, err := db.Cart(cartID)
+
+ err = db.UpdateCart(&models.Cart{
Core: models.Core{
ID: cartID,
},
PaymentStatus: "cancel",
})
+
if err != nil {
return webutil.StatusBadRequest(c, err)
}
+ currentTime := time.Now().UTC()
+
+ if err = settingStripe.Payment.Validate(); err != nil {
+ log.Print("update payment webhook url", err)
+ } else {
+ resData := map[string]any{
+ "event": "payment_error",
+ "timestamp": currentTime.Unix(),
+ "data": map[string]any{
+ "payment_system": "stripe",
+ "cart_id": cartID,
+ "payment_id": cartStripe.PaymentID,
+ "total_amount": cartStripe.AmountTotal,
+ "currency": cartStripe.Currency,
+ "user_email": cartStripe.Email,
+ },
+ }
+
+ jsonData, err := json.Marshal(resData)
+ if err != nil {
+ log.Println("Error:", err)
+ }
+
+ go func() {
+ res, err := webhook.SendHook(settingStripe.Payment.WebhookUrl, jsonData)
+
+ if err != nil {
+ log.Println(err)
+ }
+
+ if res.StatusCode != 200 {
+ log.Print("An issue has been identified with the payment webhook URL. Please verify that it responds with a status code of 200 OK.")
+ }
+ }()
+ }
+
return c.Render("cancel", nil, "layouts/main")
}
diff --git a/internal/models/setting.go b/internal/models/setting.go
index d2f837f..4bfb2a0 100644
--- a/internal/models/setting.go
+++ b/internal/models/setting.go
@@ -10,6 +10,7 @@ type Setting struct {
Password Password `json:"password,omitempty"`
Stripe Stripe `json:"stripe,omitempty"`
Social Social `json:"social,omitempty"`
+ Payment Payment `json:"payment,omitempty"`
SMTP SMTP `json:"smtp,omitempty"`
}
@@ -81,6 +82,17 @@ func (v Stripe) Validate() error {
)
}
+
+type Payment struct {
+ WebhookUrl string `json:"webhook_url"`
+}
+
+// Validate is ...
+func (v Payment) Validate() error {
+ return validation.ValidateStruct(&v,
+ validation.Field(&v.WebhookUrl, is.URL))
+}
+
type Social struct {
Facebook string `json:"facebook,omitempty"`
Instagram string `json:"instagram,omitempty"`
diff --git a/internal/queries/cart.go b/internal/queries/cart.go
index d67a909..995610a 100644
--- a/internal/queries/cart.go
+++ b/internal/queries/cart.go
@@ -87,6 +87,56 @@ func (q *CartQueries) Carts() ([]*models.Cart, error) {
return carts, nil
}
+// Carts is ...
+func (q *CartQueries) Cart(cartId string) (*models.Cart, error) {
+
+ query := `
+ SELECT
+ id,
+ email,
+ name,
+ amount_total,
+ currency,
+ payment_id,
+ payment_status,
+ strftime('%s', created),
+ strftime('%s', updated)
+ FROM cart
+ WHERE id = ?
+ `
+
+ rows, err := q.DB.QueryContext(context.TODO(), query, cartId)
+ if err != nil {
+ return nil, err
+ }
+ defer rows.Close()
+
+ var email, name, paymentID sql.NullString
+ var updated sql.NullInt64
+ cart := &models.Cart{}
+
+ err = rows.Scan(
+ &cart.ID,
+ &email,
+ &name,
+ &cart.AmountTotal,
+ &cart.Currency,
+ &paymentID,
+ &cart.PaymentStatus,
+ &cart.Created,
+ &updated,
+ )
+ if err != nil {
+ return nil, err
+ }
+
+ if err := rows.Err(); err != nil {
+ return nil, err
+ }
+
+ return cart, nil
+}
+
// AddCart is ...
func (q *CartQueries) AddCart(cart *models.Cart) error {
byteCart, err := json.Marshal(cart.Cart)
diff --git a/internal/queries/setting.go b/internal/queries/setting.go
index 05d00eb..25bbf74 100644
--- a/internal/queries/setting.go
+++ b/internal/queries/setting.go
@@ -33,6 +33,7 @@ func (q *SettingQueries) Settings(private bool) (*models.Setting, error) {
keys = append(keys,
"jwt_secret", "jwt_secret_expire_hours", // 2
"stripe_secret_key", "stripe_webhook_secret_key", // 2
+ "payment_webhook_url", // 1
"smtp_host", "smtp_port", "smtp_username", "smtp_password", "smtp_encryption", // 5
)
}
@@ -53,6 +54,7 @@ func (q *SettingQueries) Settings(private bool) (*models.Setting, error) {
"jwt_secret_expire_hours": &settings.Main.JWT.ExpireHours,
"stripe_secret_key": &settings.Stripe.SecretKey,
"stripe_webhook_secret_key": &settings.Stripe.WebhookSecretKey,
+ "payment_webhook_url": &settings.Payment.WebhookUrl,
"social_facebook": &settings.Social.Facebook,
"social_instagram": &settings.Social.Instagram,
"social_twitter": &settings.Social.Twitter,
@@ -157,6 +159,10 @@ func (q *SettingQueries) UpdateSettings(settings *models.Setting, section string
"social_dribbble": settings.Social.Dribbble,
"social_github": settings.Social.Github,
}
+ case "payment":
+ sectionSettings = map[string]any{
+ "payment_webhook_url": settings.Payment.WebhookUrl,
+ }
case "smtp":
sectionSettings = map[string]any{
"smtp_host": settings.SMTP.Host,
@@ -306,8 +312,8 @@ func (q *SettingQueries) SettingJWT() (*jwtutil.Setting, error) {
func (q *SettingQueries) SettingStripe() (*models.Setting, error) {
settings := &models.Setting{}
- query := `SELECT key, value FROM setting WHERE key IN (?, ?, ?)`
- rows, err := q.DB.QueryContext(context.TODO(), query, "stripe_secret_key", "stripe_webhook_secret_key", "domain")
+ query := `SELECT key, value FROM setting WHERE key IN (?, ?, ?, ?)`
+ rows, err := q.DB.QueryContext(context.TODO(), query, "stripe_secret_key", "stripe_webhook_secret_key", "domain", "payment_webhook_url")
if err != nil {
return nil, err
}
@@ -327,6 +333,8 @@ func (q *SettingQueries) SettingStripe() (*models.Setting, error) {
settings.Stripe.WebhookSecretKey = value
case "domain":
settings.Main.Domain = fmt.Sprintf("https://%s", value)
+ case "payment_webhook_url":
+ settings.Payment.WebhookUrl = value
}
}
diff --git a/migrations/20231110193417_added_payment_field.sql b/migrations/20231110193417_added_payment_field.sql
new file mode 100644
index 0000000..ecd58c6
--- /dev/null
+++ b/migrations/20231110193417_added_payment_field.sql
@@ -0,0 +1,10 @@
+-- +goose Up
+-- +goose StatementBegin
+INSERT INTO setting (id, key, value) VALUES
+('7HkP2nYgR4sL8Qo', 'payment_webhook_url', '');
+-- +goose StatementEnd
+
+-- +goose Down
+-- +goose StatementBegin
+DELETE FROM setting WHERE id = '7HkP2nYgR4sL8Qo';
+-- +goose StatementEnd
diff --git a/pkg/webhook/webhook.go b/pkg/webhook/webhook.go
new file mode 100644
index 0000000..cdfb144
--- /dev/null
+++ b/pkg/webhook/webhook.go
@@ -0,0 +1,26 @@
+package webhook
+
+import (
+ "bytes"
+ "net/http"
+ "fmt"
+
+)
+
+func SendHook(url string, payload []byte) (*http.Response, error) {
+
+ req, err := http.NewRequest("POST", url, bytes.NewBuffer(payload))
+ if err != nil {
+ return nil, fmt.Errorf("error creating request: %v", err)
+ }
+
+ req.Header.Set("Content-Type", "application/json")
+
+ client := &http.Client{}
+ resp, err := client.Do(req)
+ if err != nil {
+ return nil, fmt.Errorf("error making request: %v", err)
+ }
+
+ return resp, nil
+}
diff --git a/web/admin/src/pages/Settings.vue b/web/admin/src/pages/Settings.vue
index 3d3eea1..f3411f7 100644
--- a/web/admin/src/pages/Settings.vue
+++ b/web/admin/src/pages/Settings.vue
@@ -83,6 +83,26 @@
+
+
Payment Event
+
+
+
This section is required to recieve payment events externally!
+
+
+
+
+
Socials