mirror of
https://github.com/rjNemo/rentease.git
synced 2026-06-06 02:36:49 +00:00
Ruidy
cf1620592a
### TL;DR Enhanced invoice generation with improved formatting and Euro symbol display ### What changed? - Added Euro symbol (€) to monetary values in the invoice template - Implemented new invoice data structure with dedicated types for lines and payments - Created ToInvoice method to properly format booking data for invoice generation - Added HTML template parsing and rendering functionality - Improved date formatting for consistency - Added new API endpoint for booking creation ### How to test? 1. Create a new booking through the API 2. Navigate to the PDF generation endpoint 3. Verify that monetary values display with Euro symbol 4. Check that dates are properly formatted 5. Confirm that payment history and totals are correctly calculated 6. Validate that the generated HTML maintains proper formatting ### Why make this change? To improve invoice readability and consistency by standardizing monetary value display and providing better data structure for invoice generation. This change also makes the system more maintainable by separating concerns between data transformation and presentation.
105 lines
2.6 KiB
Go
105 lines
2.6 KiB
Go
package booking
|
|
|
|
import (
|
|
"log"
|
|
"time"
|
|
|
|
"github.com/rjNemo/rentease/internal/config"
|
|
)
|
|
|
|
type Store interface {
|
|
All() []*Line
|
|
Search(value string) []*Line
|
|
List(from, to time.Time) ([]*Line, error)
|
|
CardTotal(from, to time.Time) (float64, error)
|
|
Get(id int) *Booking
|
|
Create(b *Booking) error
|
|
Update(b *Booking) error
|
|
Cancel(id int) error
|
|
|
|
// Item methods
|
|
CreateItem(i *Item) error
|
|
PayItem(id int) (*Item, error)
|
|
GetItem(id int) (*Item, error)
|
|
UpdateItem(id int, item string, paymentMethod string, paymentStatus string, qty int, price float64) (*Item, error)
|
|
|
|
// Payment methods
|
|
CreatePayment(p *Payment) (*Payment, error)
|
|
GetPayment(id int) (*Payment, error)
|
|
UpdatePayment(id int, amount float64, paymentMethod string) (*Payment, error)
|
|
}
|
|
|
|
type PdfClient interface {
|
|
BuildInvoice(invoice Invoice) (string, error)
|
|
BuildReport(context map[string]any, period string, month, year int) error
|
|
}
|
|
|
|
type CalendarClient interface {
|
|
Create(calendarId, name, description string, from, to time.Time) error
|
|
}
|
|
|
|
type parserClient interface {
|
|
Parse(rawContent string) (*Booking, error)
|
|
}
|
|
|
|
type Service struct {
|
|
store Store
|
|
parser parserClient
|
|
calendar CalendarClient
|
|
pdf PdfClient
|
|
}
|
|
|
|
func NewService(store Store, parser parserClient, calendar CalendarClient, pdf PdfClient) (*Service, error) {
|
|
return &Service{
|
|
store: store,
|
|
parser: parser,
|
|
calendar: calendar,
|
|
pdf: pdf,
|
|
}, nil
|
|
}
|
|
|
|
func (bs Service) All() []*Line {
|
|
return bs.store.All()
|
|
}
|
|
|
|
func (bs Service) Search(value string) []*Line {
|
|
return bs.store.Search(value)
|
|
}
|
|
|
|
// TODO: return the error
|
|
func (bs Service) Create(From time.Time, To time.Time, Name, PhoneNumber, Email, Platform string,
|
|
CustomerNumber int, PlatformFees float64, externalId *string,
|
|
) *Booking {
|
|
b := NewBooking(From, To, Name, PhoneNumber, Email, Platform, CustomerNumber, PlatformFees, externalId)
|
|
err := bs.store.Create(b)
|
|
if err != nil {
|
|
log.Println(err)
|
|
}
|
|
return b
|
|
}
|
|
|
|
func (bs Service) One(id int) *Booking {
|
|
return bs.store.Get(id)
|
|
}
|
|
|
|
// Update updates an existing booking with new data
|
|
func (bs Service) Update(id int, From time.Time, To time.Time, Name string, PhoneNumber string, Email string, Platform string,
|
|
CustomerNumber int, PlatformFees float64, externalId *string,
|
|
) *Booking {
|
|
b := NewBooking(From, To, Name, PhoneNumber, Email, Platform, CustomerNumber, PlatformFees, externalId).WithId(id)
|
|
if err := bs.store.Update(b); err != nil {
|
|
log.Println(err)
|
|
}
|
|
return b
|
|
}
|
|
|
|
func (bs Service) Cancel(id int) {
|
|
err := bs.store.Cancel(id)
|
|
if err != nil {
|
|
log.Println(err)
|
|
}
|
|
}
|
|
|
|
func (bs Service) BuildInvoice(b *Booking, hc *config.Host) (string, error) {
|
|
return bs.pdf.BuildInvoice(b.ToInvoice(hc))
|
|
}
|