Keep all “new invoice actions” on the same /new URI
This commit is contained in:
parent
bc7ed0f06f
commit
0d4fb124b4
|
@ -262,15 +262,6 @@ func HandleAddInvoice(w http.ResponseWriter, r *http.Request, _ httprouter.Param
|
||||||
http.Error(w, err.Error(), http.StatusForbidden)
|
http.Error(w, err.Error(), http.StatusForbidden)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
switch r.Form.Get("action") {
|
|
||||||
case "update":
|
|
||||||
form.Update()
|
|
||||||
w.WriteHeader(http.StatusOK)
|
|
||||||
mustRenderNewInvoiceForm(w, r, form)
|
|
||||||
case "products":
|
|
||||||
w.WriteHeader(http.StatusOK)
|
|
||||||
mustRenderNewInvoiceProductsForm(w, r, form)
|
|
||||||
case "add":
|
|
||||||
if !form.Validate() {
|
if !form.Validate() {
|
||||||
w.WriteHeader(http.StatusUnprocessableEntity)
|
w.WriteHeader(http.StatusUnprocessableEntity)
|
||||||
mustRenderNewInvoiceForm(w, r, form)
|
mustRenderNewInvoiceForm(w, r, form)
|
||||||
|
@ -278,12 +269,9 @@ func HandleAddInvoice(w http.ResponseWriter, r *http.Request, _ httprouter.Param
|
||||||
}
|
}
|
||||||
slug := conn.MustGetText(r.Context(), "", "select add_invoice($1, $2, $3, $4, $5, $6)", company.Id, form.Number, form.Date, form.Customer, form.Notes, NewInvoiceProductArray(form.Products))
|
slug := conn.MustGetText(r.Context(), "", "select add_invoice($1, $2, $3, $4, $5, $6)", company.Id, form.Number, form.Date, form.Customer, form.Notes, NewInvoiceProductArray(form.Products))
|
||||||
http.Redirect(w, r, companyURI(company, "/invoices/"+slug), http.StatusSeeOther)
|
http.Redirect(w, r, companyURI(company, "/invoices/"+slug), http.StatusSeeOther)
|
||||||
default:
|
|
||||||
http.Error(w, gettext("Invalid action", locale), http.StatusBadRequest)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func HandleAddProductsToInvoice(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
|
func HandleNewInvoiceAction(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
|
||||||
locale := getLocale(r)
|
locale := getLocale(r)
|
||||||
conn := getConn(r)
|
conn := getConn(r)
|
||||||
company := mustGetCompany(r)
|
company := mustGetCompany(r)
|
||||||
|
@ -292,25 +280,25 @@ func HandleAddProductsToInvoice(w http.ResponseWriter, r *http.Request, _ httpro
|
||||||
http.Error(w, err.Error(), http.StatusBadRequest)
|
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
if err := verifyCsrfTokenValid(r); err != nil {
|
||||||
index := len(form.Products)
|
http.Error(w, err.Error(), http.StatusForbidden)
|
||||||
productsId := r.Form["id"]
|
return
|
||||||
rows := conn.MustQuery(r.Context(), "select product_id, name, description, to_price(price, decimal_digits), 1 as quantity, 0 as discount, array_remove(array_agg(tax_id), null) from product join company using (company_id) join currency using (currency_code) left join product_tax using (product_id) where product_id = any ($1) group by product_id, name, description, price, decimal_digits", productsId)
|
|
||||||
defer rows.Close()
|
|
||||||
for rows.Next() {
|
|
||||||
product := newInvoiceProductForm(index, company, locale, form.Tax.Options)
|
|
||||||
if err := rows.Scan(product.ProductId, product.Name, product.Description, product.Price, product.Quantity, product.Discount, product.Tax); err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
}
|
||||||
form.Products = append(form.Products, product)
|
switch r.Form.Get("action") {
|
||||||
index++
|
case "update":
|
||||||
}
|
form.Update()
|
||||||
if rows.Err() != nil {
|
|
||||||
panic(rows.Err())
|
|
||||||
}
|
|
||||||
|
|
||||||
w.WriteHeader(http.StatusOK)
|
w.WriteHeader(http.StatusOK)
|
||||||
mustRenderNewInvoiceForm(w, r, form)
|
mustRenderNewInvoiceForm(w, r, form)
|
||||||
|
case "select-products":
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
mustRenderNewInvoiceProductsForm(w, r, form)
|
||||||
|
case "add-products":
|
||||||
|
form.AddProducts(r.Context(), conn, r.Form["id"])
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
mustRenderNewInvoiceForm(w, r, form)
|
||||||
|
default:
|
||||||
|
http.Error(w, gettext("Invalid action", locale), http.StatusBadRequest)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
type invoiceForm struct {
|
type invoiceForm struct {
|
||||||
|
@ -412,6 +400,23 @@ func (form *invoiceForm) Update() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (form *invoiceForm) AddProducts(ctx context.Context, conn *Conn, productsId []string) {
|
||||||
|
index := len(form.Products)
|
||||||
|
rows := conn.MustQuery(ctx, "select product_id, name, description, to_price(price, decimal_digits), 1 as quantity, 0 as discount, array_remove(array_agg(tax_id), null) from product join company using (company_id) join currency using (currency_code) left join product_tax using (product_id) where product_id = any ($1) group by product_id, name, description, price, decimal_digits", productsId)
|
||||||
|
defer rows.Close()
|
||||||
|
for rows.Next() {
|
||||||
|
product := newInvoiceProductForm(index, form.company, form.locale, form.Tax.Options)
|
||||||
|
if err := rows.Scan(product.ProductId, product.Name, product.Description, product.Price, product.Quantity, product.Discount, product.Tax); err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
form.Products = append(form.Products, product)
|
||||||
|
index++
|
||||||
|
}
|
||||||
|
if rows.Err() != nil {
|
||||||
|
panic(rows.Err())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func mustGetTaxOptions(ctx context.Context, conn *Conn, company *Company) []*SelectOption {
|
func mustGetTaxOptions(ctx context.Context, conn *Conn, company *Company) []*SelectOption {
|
||||||
return MustGetOptions(ctx, conn, "select tax_id::text, name from tax where company_id = $1 order by name", company.Id)
|
return MustGetOptions(ctx, conn, "select tax_id::text, name from tax where company_id = $1 order by name", company.Id)
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,7 +25,7 @@ func NewRouter(db *Db) http.Handler {
|
||||||
companyRouter.GET("/invoices", IndexInvoices)
|
companyRouter.GET("/invoices", IndexInvoices)
|
||||||
companyRouter.POST("/invoices", HandleAddInvoice)
|
companyRouter.POST("/invoices", HandleAddInvoice)
|
||||||
companyRouter.GET("/invoices/:slug", ServeInvoice)
|
companyRouter.GET("/invoices/:slug", ServeInvoice)
|
||||||
companyRouter.POST("/invoices/new/products", HandleAddProductsToInvoice)
|
companyRouter.POST("/invoices/new", HandleNewInvoiceAction)
|
||||||
companyRouter.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
|
companyRouter.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
|
||||||
mustRenderAppTemplate(w, r, "dashboard.gohtml", nil)
|
mustRenderAppTemplate(w, r, "dashboard.gohtml", nil)
|
||||||
})
|
})
|
||||||
|
|
|
@ -55,9 +55,11 @@
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<button formnovalidate name="action" value="products"
|
<button formnovalidate formaction="{{ companyURI "/invoices/new" }}"
|
||||||
|
name="action" value="select-products"
|
||||||
type="submit">{{( pgettext "Add products" "action" )}}</button>
|
type="submit">{{( pgettext "Add products" "action" )}}</button>
|
||||||
<button formnovalidate name="action" value="update"
|
<button formnovalidate formaction="{{ companyURI "/invoices/new" }}"
|
||||||
|
name="action" value="update"
|
||||||
type="submit">{{( pgettext "Update" "action" )}}</button>
|
type="submit">{{( pgettext "Update" "action" )}}</button>
|
||||||
<button class="primary" name="action" value="add"
|
<button class="primary" name="action" value="add"
|
||||||
type="submit">{{( pgettext "New invoice" "action" )}}</button>
|
type="submit">{{( pgettext "New invoice" "action" )}}</button>
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
</nav>
|
</nav>
|
||||||
<section class="dialog-content">
|
<section class="dialog-content">
|
||||||
<h2>{{(pgettext "Add Products to Invoice" "title")}}</h2>
|
<h2>{{(pgettext "Add Products to Invoice" "title")}}</h2>
|
||||||
<form method="POST" action="{{ companyURI "/invoices/new/products" }}">
|
<form method="POST" action="{{ companyURI "/invoices/new" }}">
|
||||||
{{ csrfToken }}
|
{{ csrfToken }}
|
||||||
|
|
||||||
{{- with .Form }}
|
{{- with .Form }}
|
||||||
|
@ -61,7 +61,8 @@
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<button class="primary" type="submit">{{( pgettext "Add products" "action" )}}</button>
|
<button class="primary" type="submit"
|
||||||
|
name="action" value="add-products">{{( pgettext "Add products" "action" )}}</button>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
</form>
|
</form>
|
||||||
</section>
|
</section>
|
||||||
|
|
Loading…
Reference in New Issue