From 948991514384536c972fe71172884dd4c2b74ea2 Mon Sep 17 00:00:00 2001 From: Ruidy Date: Sun, 19 Jan 2025 15:32:17 +0100 Subject: [PATCH] stash: payments per line item --- internal/server/handle_bookings.go | 1 + internal/server/handle_payments.go | 6 +- internal/server/routes.go | 2 +- internal/view/item_viewmodel.go | 1 + internal/view/line_item.templ | 2 +- internal/view/line_item_templ.go | 127 +++++++++++++++------------ internal/view/payment_modal.templ | 17 ---- internal/view/payment_modal_templ.go | 40 --------- 8 files changed, 76 insertions(+), 120 deletions(-) delete mode 100644 internal/view/payment_modal.templ delete mode 100644 internal/view/payment_modal_templ.go diff --git a/internal/server/handle_bookings.go b/internal/server/handle_bookings.go index 7598eda..22fa346 100644 --- a/internal/server/handle_bookings.go +++ b/internal/server/handle_bookings.go @@ -147,6 +147,7 @@ func handleBookingPage(bs *booking.Service, hc *config.Host) echo.HandlerFunc { SubTotal: strconv.FormatFloat(i.Price*float64(i.Quantity), 'f', 2, 64), PaymentStatus: i.PaymentStatus, ItemUrl: fmt.Sprintf("%s/%d", constant.RouteItem, i.Id), + PaymentUrl: fmt.Sprintf("%s/%d", constant.RoutePayment, b.Id), Payments: []view.Payment{ { Amount: "12.00", diff --git a/internal/server/handle_payments.go b/internal/server/handle_payments.go index 4c3d1a2..0d6e0ca 100644 --- a/internal/server/handle_payments.go +++ b/internal/server/handle_payments.go @@ -2,16 +2,14 @@ package server import ( "log" - "net/http" "strconv" "github.com/labstack/echo/v4" "github.com/rjNemo/rentease/internal/service/booking" - "github.com/rjNemo/rentease/internal/view" ) -func handleCreatePaymentModal(bs *booking.Service) echo.HandlerFunc { +func handleCreatePayment(bs *booking.Service) echo.HandlerFunc { return func(c echo.Context) error { idStr := c.Param("id") id, err := strconv.Atoi(idStr) @@ -22,6 +20,6 @@ func handleCreatePaymentModal(bs *booking.Service) echo.HandlerFunc { b := bs.One(id) log.Println(b) - return renderTempl(c, http.StatusOK, view.PaymentModal(b.Id)) + return nil } } diff --git a/internal/server/routes.go b/internal/server/routes.go index e03fced..45a96c3 100644 --- a/internal/server/routes.go +++ b/internal/server/routes.go @@ -40,5 +40,5 @@ func (s Server) MountHandlers() { private.GET("/reports/do", handleReportCompute(s.bs, s.hc)) private.GET("/reports/pdf", handlePdfCreateReport(s.bs)) - private.GET("/payments/modal/:id", handleCreatePaymentModal(s.bs)) + private.POST("/payments/:id", handleCreatePayment(s.bs)) } diff --git a/internal/view/item_viewmodel.go b/internal/view/item_viewmodel.go index 92e72d7..2baf2bd 100644 --- a/internal/view/item_viewmodel.go +++ b/internal/view/item_viewmodel.go @@ -8,6 +8,7 @@ type ItemViewModel struct { Price string SubTotal string PaymentStatus string + PaymentUrl string ItemUrl string Payments []Payment } diff --git a/internal/view/line_item.templ b/internal/view/line_item.templ index 05abc7f..a8b65cd 100644 --- a/internal/view/line_item.templ +++ b/internal/view/line_item.templ @@ -14,7 +14,7 @@ templ LineItem(item *ItemViewModel) {
-
+

Add Payment

diff --git a/internal/view/line_item_templ.go b/internal/view/line_item_templ.go index cc06391..96f2b35 100644 --- a/internal/view/line_item_templ.go +++ b/internal/view/line_item_templ.go @@ -112,57 +112,70 @@ func LineItem(item *ItemViewModel) templ.Component { return templ_7745c5c3_Err } if item.PaymentStatus != "Completed" { - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "

Add Payment

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "

Add Payment

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } if len(item.Payments) > 0 { for _, payment := range item.Payments { - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "- ") - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } - var templ_7745c5c3_Var8 string - templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(payment.Amount) - if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/view/line_item.templ`, Line: 52, Col: 26} - } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8)) - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "- ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } var templ_7745c5c3_Var9 string - templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(payment.PaymentMethod) + templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(payment.Amount) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/view/line_item.templ`, Line: 53, Col: 31} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/view/line_item.templ`, Line: 52, Col: 26} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -188,103 +201,103 @@ func LineItemForm(item *ItemViewModel) templ.Component { }() } ctx = templ.InitializeContext(ctx) - templ_7745c5c3_Var11 := templ.GetChildren(ctx) - if templ_7745c5c3_Var11 == nil { - templ_7745c5c3_Var11 = templ.NopComponent + templ_7745c5c3_Var12 := templ.GetChildren(ctx) + if templ_7745c5c3_Var12 == nil { + templ_7745c5c3_Var12 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "\" name=\"paymentMethod\" form=\"edit-item\">
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "\" name=\"PaymentStatus\" form=\"edit-item\">") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var19 string + templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(item.SubTotal) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/view/line_item.templ`, Line: 72, Col: 22} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/internal/view/payment_modal.templ b/internal/view/payment_modal.templ deleted file mode 100644 index bfe51a0..0000000 --- a/internal/view/payment_modal.templ +++ /dev/null @@ -1,17 +0,0 @@ -package view - -templ PaymentModal(bid int) { -
-
-
-
Modal title
-
-
-

Modal body text goes here.

-
-
- -
-
-
-} diff --git a/internal/view/payment_modal_templ.go b/internal/view/payment_modal_templ.go deleted file mode 100644 index 2a65bc2..0000000 --- a/internal/view/payment_modal_templ.go +++ /dev/null @@ -1,40 +0,0 @@ -// Code generated by templ - DO NOT EDIT. - -// templ: version: v0.3.819 -package view - -//lint:file-ignore SA4006 This context is only used if a nested component is present. - -import "github.com/a-h/templ" -import templruntime "github.com/a-h/templ/runtime" - -func PaymentModal(bid int) templ.Component { - return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { - templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context - if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil { - return templ_7745c5c3_CtxErr - } - templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) - if !templ_7745c5c3_IsBuffer { - defer func() { - templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) - if templ_7745c5c3_Err == nil { - templ_7745c5c3_Err = templ_7745c5c3_BufErr - } - }() - } - ctx = templ.InitializeContext(ctx) - templ_7745c5c3_Var1 := templ.GetChildren(ctx) - if templ_7745c5c3_Var1 == nil { - templ_7745c5c3_Var1 = templ.NopComponent - } - ctx = templ.ClearChildren(ctx) - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "
Modal title

Modal body text goes here.

") - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } - return nil - }) -} - -var _ = templruntime.GeneratedTemplate