This commit is contained in:
2026-05-08 13:43:03 +02:00
parent 1849e324fc
commit 9b45fb5138
4 changed files with 17 additions and 14 deletions

3
.gitignore vendored
View File

@@ -5,6 +5,9 @@
.env.example
.env.prod
FULFILLMENT.md
.tmp-gocache/
.junie/
# Build artifacts

View File

@@ -155,7 +155,7 @@ func (h *OrderHandler) UpdateTracking(w http.ResponseWriter, r *http.Request) {
return
}
audit.OrderShipped(order.UserID, order.ID, req.Carrier, req.TrackingURL)
audit.OrderShipped(order.UserID, order.ID, req.Carrier, req.TrackingNumber)
utils.RespondSuccess(w, http.StatusOK, map[string]interface{}{
"order_id": order.ID,

View File

@@ -10,13 +10,13 @@ import (
type OrderStatus string
const (
OrderStatusPending OrderStatus = "pending"
OrderStatusPaid OrderStatus = "paid"
OrderStatusShipped OrderStatus = "shipped"
OrderStatusDelivered OrderStatus = "delivered"
OrderStatusCancelled OrderStatus = "cancelled"
OrderStatusRefunded OrderStatus = "refunded"
OrderStatusFailed OrderStatus = "failed"
OrderStatusPending OrderStatus = "pending"
OrderStatusPaid OrderStatus = "paid"
OrderStatusShipped OrderStatus = "shipped"
// OrderStatusDelivered OrderStatus = "delivered"
// OrderStatusCancelled OrderStatus = "cancelled"
OrderStatusRefunded OrderStatus = "refunded"
OrderStatusFailed OrderStatus = "failed"
)
// Order represents a completed purchase.
@@ -39,11 +39,11 @@ type Order struct {
ShippingPhone string `gorm:"size:20" json:"shipping_phone"` // Phone number the shipment is tied to
Carrier string `gorm:"size:100" json:"carrier"` // USPS, Posten (Norge!!), "FedEx"
TrackingNumber string `gorm:"size:255;index" json:"tracking_number"` // Tracking number of an order
TrackingUrl string `gorm:"size:255" json:"tracking_url"` // carrier specific tracking link
TrackingURL string `gorm:"size:255" json:"tracking_url"` // carrier specific tracking link
ShippedAt *time.Time `json:"shipped_at"` // time the order was shipped at. Null until dispatched
CreatedAt time.Time `json:"created_at"` // time the order was created at. null until dispatched
UpdatedAt time.Time `json:"updated_at"` // time the order was updated at. null until dispatched
DeletedAt gorm.DeletedAt `gorm:"index" json:"-"` // time the order was deleted at. null until dispatched
CreatedAt time.Time `json:"created_at"`
UpdatedAt time.Time `json:"updated_at"`
DeletedAt gorm.DeletedAt `gorm:"index" json:"-"` // GORM soft-delete sentinel
// Associations
User User `gorm:"foreignKey:UserID" json:"-"`

View File

@@ -148,8 +148,8 @@ func (m Model) buildOrderDetailView(order models.Order, _ int) string {
"Shipped", order.ShippedAt.Format("Jan 02 2006"))))
b.WriteString("\n")
}
if order.TrackingUrl != "" {
b.WriteString(dimStyle.Render(" " + order.TrackingUrl))
if order.TrackingURL != "" {
b.WriteString(dimStyle.Render(" " + order.TrackingURL))
b.WriteString("\n")
}
}