tandem
/
numerus
2
0
Fork 0
Code Issues 39 Pull Requests Packages Projects 1 Releases 1 Wiki Activity

Reindex product indices when removing 

When updating the product list, i forgot to change the index in the
product field’s names and, therefore, i created invoices with only the
products until the first gap.
This commit is contained in:
jordi fita mas 2023-02-21 13:57:40 +01:00
parent c1e443e3bc
commit 32fdab4217
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/invoices.go
View File

@ -264,11 +264,12 @@ func (form *invoiceForm) Validate() bool {
func (form *invoiceForm) Update() { func (form *invoiceForm) Update() {
products := form.Products products := form.Products
form.Products = nil form.Products = nil
index := 0 for n, product := range products {
for _, product := range products {
if product.Quantity.Val != "0" { if product.Quantity.Val != "0" {
if n != len(form.Products) {
product.Reindex(len(form.Products))
}
form.Products = append(form.Products, product) form.Products = append(form.Products, product)
index++
} }
} }
} }
@ -290,29 +291,24 @@ type invoiceProductForm struct {
} }
func newInvoiceProductForm(index int, company *Company, locale *Locale, taxOptions []*SelectOption) *invoiceProductForm { func newInvoiceProductForm(index int, company *Company, locale *Locale, taxOptions []*SelectOption) *invoiceProductForm {
suffix := "." + strconv.Itoa(index) form := &invoiceProductForm{
return &invoiceProductForm{
locale: locale, locale: locale,
company: company, company: company,
ProductId: &InputField{ ProductId: &InputField{
Name: "product.id" + suffix,
Label: pgettext("input", "Id", locale), Label: pgettext("input", "Id", locale),
Type: "hidden", Type: "hidden",
Required: true, Required: true,
}, },
Name: &InputField{ Name: &InputField{
Name: "product.name" + suffix,
Label: pgettext("input", "Name", locale), Label: pgettext("input", "Name", locale),
Type: "text", Type: "text",
Required: true, Required: true,
}, },
Description: &InputField{ Description: &InputField{
Name: "product.description" + suffix,
Label: pgettext("input", "Description", locale), Label: pgettext("input", "Description", locale),
Type: "textarea", Type: "textarea",
}, },
Price: &InputField{ Price: &InputField{
Name: "product.price" + suffix,
Label: pgettext("input", "Price", locale), Label: pgettext("input", "Price", locale),
Type: "number", Type: "number",
Required: true, Required: true,
@ -322,7 +318,6 @@ func newInvoiceProductForm(index int, company *Company, locale *Locale, taxOptio
}, },
}, },
Quantity: &InputField{ Quantity: &InputField{
Name: "product.quantity" + suffix,
Label: pgettext("input", "Quantity", locale), Label: pgettext("input", "Quantity", locale),
Type: "number", Type: "number",
Required: true, Required: true,
@ -331,7 +326,6 @@ func newInvoiceProductForm(index int, company *Company, locale *Locale, taxOptio
}, },
}, },
Discount: &InputField{ Discount: &InputField{
Name: "product.discount" + suffix,
Label: pgettext("input", "Discount (%)", locale), Label: pgettext("input", "Discount (%)", locale),
Type: "number", Type: "number",
Required: true, Required: true,
@ -341,12 +335,24 @@ func newInvoiceProductForm(index int, company *Company, locale *Locale, taxOptio
}, },
}, },
Tax: &SelectField{ Tax: &SelectField{
Name: "product.tax" + suffix,
Label: pgettext("input", "Taxes", locale), Label: pgettext("input", "Taxes", locale),
Multiple: true, Multiple: true,
Options: taxOptions, Options: taxOptions,
}, },
} }
form.Reindex(index)
return form
}
func (form *invoiceProductForm) Reindex(index int) {
suffix := "." + strconv.Itoa(index)
form.ProductId.Name = "product.id" + suffix
form.Name.Name = "product.name" + suffix
form.Description.Name = "product.description" + suffix
form.Price.Name = "product.price" + suffix
form.Quantity.Name = "product.quantity" + suffix
form.Discount.Name = "product.discount" + suffix
form.Tax.Name = "product.tax" + suffix
} }
func (form *invoiceProductForm) Parse(r *http.Request) error { func (form *invoiceProductForm) Parse(r *http.Request) error {