From 9b45fb513845100ce68a33a6a63183b9f16cf547 Mon Sep 17 00:00:00 2001 From: marcusDenslow Date: Fri, 8 May 2026 13:43:03 +0200 Subject: [PATCH] updating --- .gitignore | 3 +++ api/handlers/orders.go | 2 +- pkg/models/order.go | 22 +++++++++++----------- pkg/tui/account_orders.go | 4 ++-- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 59fad42..5658ea1 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,9 @@ .env.example .env.prod + +FULFILLMENT.md +.tmp-gocache/ .junie/ # Build artifacts diff --git a/api/handlers/orders.go b/api/handlers/orders.go index 68c8d87..f25f71e 100644 --- a/api/handlers/orders.go +++ b/api/handlers/orders.go @@ -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, diff --git a/pkg/models/order.go b/pkg/models/order.go index 70c6d61..8f3ffbf 100644 --- a/pkg/models/order.go +++ b/pkg/models/order.go @@ -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:"-"` diff --git a/pkg/tui/account_orders.go b/pkg/tui/account_orders.go index d4793d5..f68bce5 100644 --- a/pkg/tui/account_orders.go +++ b/pkg/tui/account_orders.go @@ -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") } }