diff --git a/demo/demo.sql b/demo/demo.sql index a997162..6964f7f 100644 --- a/demo/demo.sql +++ b/demo/demo.sql @@ -10,8 +10,8 @@ values ('demo@camper', 'Demo User', 'demo', 'ca') ; alter table company alter column company_id restart with 52; -insert into company (slug, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, country_code, rtc_number, currency_code, default_lang_tag, legal_disclaimer) -values ('09184122-b276-4be2-9553-e4bbcbafe40d', 'El pont de Llierca, S.L.', 'ESB17377656', 'Càmping Montagut', parse_packed_phone_number('661 673 057', 'ES'), 'info@campingmontagut.com', 'https://campingmontagut.com/', 'Ctra. de Sadernes, Km 2', 'Montagut i Oix', 'Girona', '17855', 'ES', 'KG-000133', 'EUR', 'ca', 'El pont de Llierca, S.L. és responsable del tractament de les seves dades d’acord amb el RGPD i la LOPDGDD, i les tracta per a mantenir una relació mercantil/comercial amb vostè. Les conservarà mentre es mantingui aquesta relació i no es comunicaran a tercers. Pot exercir els drets d’accés, rectificació, portabilitat, supressió, limitació i oposició a El pont de Llierca, S.L., amb domicili Ctra. de Sadernes, Km 2, 17855 Montagut i Oix o enviant un correu electrònic a info@campingmontagut.com. Per a qualsevol reclamació pot acudir a agpd.es. Per a més informació pot consultar la nostra política de privacitat a campingmontagut.com.'); +insert into company (slug, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, country_code, rtc_number, tourist_tax, currency_code, default_lang_tag, legal_disclaimer) +values ('09184122-b276-4be2-9553-e4bbcbafe40d', 'El pont de Llierca, S.L.', 'ESB17377656', 'Càmping Montagut', parse_packed_phone_number('661 673 057', 'ES'), 'info@campingmontagut.com', 'https://campingmontagut.com/', 'Ctra. de Sadernes, Km 2', 'Montagut i Oix', 'Girona', '17855', 'ES', 'KG-000133', 60, 'EUR', 'ca', 'El pont de Llierca, S.L. és responsable del tractament de les seves dades d’acord amb el RGPD i la LOPDGDD, i les tracta per a mantenir una relació mercantil/comercial amb vostè. Les conservarà mentre es mantingui aquesta relació i no es comunicaran a tercers. Pot exercir els drets d’accés, rectificació, portabilitat, supressió, limitació i oposició a El pont de Llierca, S.L., amb domicili Ctra. de Sadernes, Km 2, 17855 Montagut i Oix o enviant un correu electrònic a info@campingmontagut.com. Per a qualsevol reclamació pot acudir a agpd.es. Per a més informació pot consultar la nostra política de privacitat a campingmontagut.com.'); insert into company_host (company_id, host) values (52, 'localhost:8080') diff --git a/deploy/company__tourist_tax.sql b/deploy/company__tourist_tax.sql new file mode 100644 index 0000000..a462f46 --- /dev/null +++ b/deploy/company__tourist_tax.sql @@ -0,0 +1,14 @@ +-- Deploy camper:company__tourist_tax to pg +-- requires: company + +begin; + +alter table camper.company +add column tourist_tax integer not null default 60; +; + +alter table camper.company +alter column tourist_tax drop default +; + +commit; diff --git a/pkg/company/admin.go b/pkg/company/admin.go index d6e69c9..6365ffe 100644 --- a/pkg/company/admin.go +++ b/pkg/company/admin.go @@ -62,6 +62,7 @@ type taxDetailsForm struct { PostalCode *form.Input Country *form.Select RTCNumber *form.Input + TouristTax *form.Input Currency *form.Select DefaultLanguage *form.Select InvoiceNumberFormat *form.Input @@ -107,6 +108,9 @@ func newTaxDetailsForm(ctx context.Context, conn *database.Conn, l *locale.Local RTCNumber: &form.Input{ Name: "rtc_number", }, + TouristTax: &form.Input{ + Name: "tourist_tax", + }, Currency: &form.Select{ Name: "currency", Options: form.MustGetOptions(ctx, conn, "select currency_code, currency_symbol from currency order by currency_code"), @@ -137,6 +141,7 @@ func (f *taxDetailsForm) FillFromDatabase(ctx context.Context, company *auth.Com , province , postal_code , rtc_number + , to_price(tourist_tax) , array[country_code::text] , array[currency_code::text] , array[default_lang_tag] @@ -155,6 +160,7 @@ func (f *taxDetailsForm) FillFromDatabase(ctx context.Context, company *auth.Com &f.Province.Val, &f.PostalCode.Val, &f.RTCNumber.Val, + &f.TouristTax.Val, &f.Country.Selected, &f.Currency.Selected, &f.DefaultLanguage.Selected, @@ -179,6 +185,7 @@ func (f *taxDetailsForm) Parse(r *http.Request) error { f.PostalCode.FillValue(r) f.Country.FillValue(r) f.RTCNumber.FillValue(r) + f.TouristTax.FillValue(r) f.Currency.FillValue(r) f.DefaultLanguage.FillValue(r) f.InvoiceNumberFormat.FillValue(r) @@ -222,6 +229,11 @@ func (f *taxDetailsForm) Valid(ctx context.Context, conn *database.Conn, l *loca } } v.CheckRequired(f.RTCNumber, l.GettextNoop("RTC number can not be empty.")) + if v.CheckRequired(f.TouristTax, l.GettextNoop("Tourist tax can not be empty.")) { + if v.CheckValidDecimal(f.TouristTax, l.GettextNoop("Tourist tax must be a decimal number.")) { + v.CheckMinDecimal(f.TouristTax, 0.0, l.GettextNoop("Tourist tax must be zero or greater.")) + } + } v.CheckSelectedOptions(f.Currency, l.GettextNoop("Selected currency is not valid.")) v.CheckSelectedOptions(f.DefaultLanguage, l.GettextNoop("Selected language is not valid.")) v.CheckRequired(f.InvoiceNumberFormat, l.GettextNoop("Invoice number format can not be empty.")) @@ -270,7 +282,8 @@ func editTaxDetails(w http.ResponseWriter, r *http.Request, user *auth.User, com , invoice_number_format = $14 , legal_disclaimer = $15 , rtc_number = $16 - where company_id = $17 + , tourist_tax = parse_price($17) + where company_id = $18 `, f.BusinessName, f.VATIN, @@ -288,6 +301,7 @@ func editTaxDetails(w http.ResponseWriter, r *http.Request, user *auth.User, com f.InvoiceNumberFormat, f.LegalDisclaimer, f.RTCNumber, + f.TouristTax, company.ID) httplib.Redirect(w, r, "/admin/company", http.StatusSeeOther) } diff --git a/po/ca.po b/po/ca.po index 550d696..cca291a 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: camper\n" "Report-Msgid-Bugs-To: jordi@tandem.blog\n" -"POT-Creation-Date: 2024-01-13 01:12+0100\n" +"POT-Creation-Date: 2024-01-14 02:01+0100\n" "PO-Revision-Date: 2023-07-22 23:45+0200\n" "Last-Translator: jordi fita mas \n" "Language-Team: Catalan \n" @@ -119,7 +119,7 @@ msgid "Check-out Date" msgstr "Data de sortida" #: web/templates/public/campsite/type.gohtml:54 -#: web/templates/public/booking.gohtml:155 +#: web/templates/public/booking.gohtml:156 msgctxt "action" msgid "Book" msgstr "Reserva" @@ -137,34 +137,35 @@ msgctxt "title" msgid "Prices" msgstr "Preus" -#: web/templates/public/campsite/type.gohtml:83 -msgid "%s €/night" -msgstr "%s €/nit" - #: web/templates/public/campsite/type.gohtml:85 +#: web/templates/public/campsite/type.gohtml:91 msgid "%s: %s €/night" msgstr "%s: %s €/nit" -#: web/templates/public/campsite/type.gohtml:88 +#: web/templates/public/campsite/type.gohtml:87 +msgid "%s €/night" +msgstr "%s €/nit" + +#: web/templates/public/campsite/type.gohtml:94 msgid "*Minimum %d nights per stay" msgstr "*Mínim %d nits per estada" -#: web/templates/public/campsite/type.gohtml:99 +#: web/templates/public/campsite/type.gohtml:105 msgctxt "title" msgid "Features" msgstr "Característiques" -#: web/templates/public/campsite/type.gohtml:110 +#: web/templates/public/campsite/type.gohtml:116 msgctxt "title" msgid "Info" msgstr "Informació" -#: web/templates/public/campsite/type.gohtml:114 +#: web/templates/public/campsite/type.gohtml:120 msgctxt "title" msgid "Facilities" msgstr "Equipaments" -#: web/templates/public/campsite/type.gohtml:118 +#: web/templates/public/campsite/type.gohtml:124 msgctxt "title" msgid "Description" msgstr "Descripció" @@ -525,7 +526,7 @@ msgstr "Incrustació del mapa" #: web/templates/admin/location.gohtml:60 web/templates/admin/payment.gohtml:62 #: web/templates/admin/profile.gohtml:75 -#: web/templates/admin/taxDetails.gohtml:152 +#: web/templates/admin/taxDetails.gohtml:167 msgctxt "action" msgid "Save changes" msgstr "Desa els canvis" @@ -1060,25 +1061,40 @@ msgstr "Codi postal" #: web/templates/admin/taxDetails.gohtml:108 msgctxt "input" -msgid "RTC number" -msgstr "Número RTC" - -#: web/templates/admin/taxDetails.gohtml:116 -msgctxt "input" msgid "Currency" msgstr "Moneda" -#: web/templates/admin/taxDetails.gohtml:126 +#: web/templates/admin/taxDetails.gohtml:118 msgctxt "input" msgid "Default Language" msgstr "Idioma per defecte" -#: web/templates/admin/taxDetails.gohtml:136 +#: web/templates/admin/taxDetails.gohtml:127 +msgctxt "title" +msgid "Tourism" +msgstr "Turisme" + +#: web/templates/admin/taxDetails.gohtml:130 +msgctxt "input" +msgid "RTC number" +msgstr "Número RTC" + +#: web/templates/admin/taxDetails.gohtml:138 +msgctxt "input" +msgid "Tourist Tax" +msgstr "Impost turístic" + +#: web/templates/admin/taxDetails.gohtml:147 +msgctxt "title" +msgid "Invoicing" +msgstr "Facturació" + +#: web/templates/admin/taxDetails.gohtml:150 msgctxt "input" msgid "Invoice Number Format" msgstr "Format del número de factura" -#: web/templates/admin/taxDetails.gohtml:144 +#: web/templates/admin/taxDetails.gohtml:158 msgctxt "input" msgid "Legal Disclaimer" msgstr "Nota legal" @@ -1204,12 +1220,12 @@ msgstr "No podeu deixar la imatge de la diapositiva en blanc." msgid "Slide image must be an image media type." msgstr "La imatge de la diapositiva ha de ser un mèdia de tipus imatge." -#: pkg/app/login.go:56 pkg/app/user.go:246 pkg/company/admin.go:210 +#: pkg/app/login.go:56 pkg/app/user.go:246 pkg/company/admin.go:217 #: pkg/booking/public.go:269 msgid "Email can not be empty." msgstr "No podeu deixar el correu-e en blanc." -#: pkg/app/login.go:57 pkg/app/user.go:247 pkg/company/admin.go:211 +#: pkg/app/login.go:57 pkg/app/user.go:247 pkg/company/admin.go:218 #: pkg/booking/public.go:270 msgid "This email is not valid. It should be like name@domain.com." msgstr "Aquest correu-e no és vàlid. Hauria de ser similar a nom@domini.com." @@ -1231,7 +1247,7 @@ msgstr "Automàtic" msgid "Confirmation does not match password." msgstr "La confirmació no es correspon amb la contrasenya." -#: pkg/app/user.go:251 pkg/company/admin.go:226 +#: pkg/app/user.go:251 pkg/company/admin.go:238 msgid "Selected language is not valid." msgstr "L’idioma escollit no és vàlid." @@ -1422,67 +1438,79 @@ msgstr "No podeu deixar la data de fi en blanc." msgid "End date must be a valid date." msgstr "La data de fi ha de ser una data vàlida." -#: pkg/company/admin.go:193 pkg/booking/public.go:256 +#: pkg/company/admin.go:200 pkg/booking/public.go:256 msgid "Selected country is not valid." msgstr "El país escollit no és vàlid." -#: pkg/company/admin.go:197 +#: pkg/company/admin.go:204 msgid "Business name can not be empty." msgstr "No podeu deixar el nom d’empresa en blanc." -#: pkg/company/admin.go:198 +#: pkg/company/admin.go:205 msgid "Business name must have at least two letters." msgstr "El nom d’empresa ha de tenir com a mínim dues lletres." -#: pkg/company/admin.go:200 +#: pkg/company/admin.go:207 msgid "VAT number can not be empty." msgstr "No podeu deixar el NIF en blanc." -#: pkg/company/admin.go:201 +#: pkg/company/admin.go:208 msgid "This VAT number is not valid." msgstr "Aquest NIF no és vàlid." -#: pkg/company/admin.go:205 pkg/booking/public.go:272 +#: pkg/company/admin.go:212 pkg/booking/public.go:272 msgid "Phone can not be empty." msgstr "No podeu deixar el telèfon en blanc." -#: pkg/company/admin.go:206 pkg/booking/public.go:273 +#: pkg/company/admin.go:213 pkg/booking/public.go:273 msgid "This phone number is not valid." msgstr "Aquest número de telèfon no és vàlid." -#: pkg/company/admin.go:214 +#: pkg/company/admin.go:221 msgid "This web address is not valid. It should be like https://domain.com/." msgstr "Aquesta adreça web no és vàlida. Hauria de ser similar a https://domini.com/." -#: pkg/company/admin.go:216 +#: pkg/company/admin.go:223 msgid "Address can not be empty." msgstr "No podeu deixar l’adreça en blanc." -#: pkg/company/admin.go:217 +#: pkg/company/admin.go:224 msgid "City can not be empty." msgstr "No podeu deixar la població en blanc." -#: pkg/company/admin.go:218 +#: pkg/company/admin.go:225 msgid "Province can not be empty." msgstr "No podeu deixar la província en blanc." -#: pkg/company/admin.go:219 +#: pkg/company/admin.go:226 msgid "Postal code can not be empty." msgstr "No podeu deixar el codi postal en blanc." -#: pkg/company/admin.go:220 pkg/booking/public.go:265 +#: pkg/company/admin.go:227 pkg/booking/public.go:265 msgid "This postal code is not valid." msgstr "Aquest codi postal no és vàlid." -#: pkg/company/admin.go:224 +#: pkg/company/admin.go:231 msgid "RTC number can not be empty." msgstr "No podeu deixar el número d’RTC en blanc." -#: pkg/company/admin.go:225 +#: pkg/company/admin.go:232 +msgid "Tourist tax can not be empty." +msgstr "No podeu deixar l’impost turístic en blanc." + +#: pkg/company/admin.go:233 +msgid "Tourist tax must be a decimal number." +msgstr "L’impost turístic ha de ser un número decimal." + +#: pkg/company/admin.go:234 +msgid "Tourist tax must be zero or greater." +msgstr "L’impost turístic ha de ser com a mínim zero." + +#: pkg/company/admin.go:237 msgid "Selected currency is not valid." msgstr "La moneda escollida no és vàlida." -#: pkg/company/admin.go:227 +#: pkg/company/admin.go:239 msgid "Invoice number format can not be empty." msgstr "No podeu deixar el format del número de factura en blanc." @@ -1708,10 +1736,6 @@ msgstr "El valor de %s ha de ser com a màxim %d." #~ msgid "Number of dogs must be zero or greater." #~ msgstr "El número de gossos ha de ser com a mínim zero." -#~ msgctxt "title" -#~ msgid "Pricing" -#~ msgstr "Preus" - #~ msgctxt "input" #~ msgid "Pricing" #~ msgstr "Preus" diff --git a/po/es.po b/po/es.po index b89af25..6d2f848 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: camper\n" "Report-Msgid-Bugs-To: jordi@tandem.blog\n" -"POT-Creation-Date: 2024-01-13 01:12+0100\n" +"POT-Creation-Date: 2024-01-14 02:01+0100\n" "PO-Revision-Date: 2023-07-22 23:46+0200\n" "Last-Translator: jordi fita mas \n" "Language-Team: Spanish \n" @@ -119,7 +119,7 @@ msgid "Check-out Date" msgstr "Fecha de salida" #: web/templates/public/campsite/type.gohtml:54 -#: web/templates/public/booking.gohtml:155 +#: web/templates/public/booking.gohtml:156 msgctxt "action" msgid "Book" msgstr "Reservar" @@ -137,34 +137,35 @@ msgctxt "title" msgid "Prices" msgstr "Precios" -#: web/templates/public/campsite/type.gohtml:83 -msgid "%s €/night" -msgstr "%s €/noche" - #: web/templates/public/campsite/type.gohtml:85 +#: web/templates/public/campsite/type.gohtml:91 msgid "%s: %s €/night" msgstr "%s: %s €/noche" -#: web/templates/public/campsite/type.gohtml:88 +#: web/templates/public/campsite/type.gohtml:87 +msgid "%s €/night" +msgstr "%s €/noche" + +#: web/templates/public/campsite/type.gohtml:94 msgid "*Minimum %d nights per stay" msgstr "*Mínimo %d noches por estancia" -#: web/templates/public/campsite/type.gohtml:99 +#: web/templates/public/campsite/type.gohtml:105 msgctxt "title" msgid "Features" msgstr "Características" -#: web/templates/public/campsite/type.gohtml:110 +#: web/templates/public/campsite/type.gohtml:116 msgctxt "title" msgid "Info" msgstr "Información" -#: web/templates/public/campsite/type.gohtml:114 +#: web/templates/public/campsite/type.gohtml:120 msgctxt "title" msgid "Facilities" msgstr "Equipamento" -#: web/templates/public/campsite/type.gohtml:118 +#: web/templates/public/campsite/type.gohtml:124 msgctxt "title" msgid "Description" msgstr "Descripción" @@ -525,7 +526,7 @@ msgstr "Incrustación del mapa" #: web/templates/admin/location.gohtml:60 web/templates/admin/payment.gohtml:62 #: web/templates/admin/profile.gohtml:75 -#: web/templates/admin/taxDetails.gohtml:152 +#: web/templates/admin/taxDetails.gohtml:167 msgctxt "action" msgid "Save changes" msgstr "Guardar los cambios" @@ -1060,25 +1061,40 @@ msgstr "Código postal" #: web/templates/admin/taxDetails.gohtml:108 msgctxt "input" -msgid "RTC number" -msgstr "Número RTC" - -#: web/templates/admin/taxDetails.gohtml:116 -msgctxt "input" msgid "Currency" msgstr "Moneda" -#: web/templates/admin/taxDetails.gohtml:126 +#: web/templates/admin/taxDetails.gohtml:118 msgctxt "input" msgid "Default Language" msgstr "Idioma por defecto" -#: web/templates/admin/taxDetails.gohtml:136 +#: web/templates/admin/taxDetails.gohtml:127 +msgctxt "title" +msgid "Tourism" +msgstr "Turismo" + +#: web/templates/admin/taxDetails.gohtml:130 +msgctxt "input" +msgid "RTC number" +msgstr "Número RTC" + +#: web/templates/admin/taxDetails.gohtml:138 +msgctxt "input" +msgid "Tourist Tax" +msgstr "Impuesto turístico" + +#: web/templates/admin/taxDetails.gohtml:147 +msgctxt "title" +msgid "Invoicing" +msgstr "Facturación" + +#: web/templates/admin/taxDetails.gohtml:150 msgctxt "input" msgid "Invoice Number Format" msgstr "Formato de número de factura" -#: web/templates/admin/taxDetails.gohtml:144 +#: web/templates/admin/taxDetails.gohtml:158 msgctxt "input" msgid "Legal Disclaimer" msgstr "Nota legal" @@ -1204,12 +1220,12 @@ msgstr "No podéis dejar la imagen de la diapositiva en blanco." msgid "Slide image must be an image media type." msgstr "La imagen de la diapositiva tiene que ser un medio de tipo imagen." -#: pkg/app/login.go:56 pkg/app/user.go:246 pkg/company/admin.go:210 +#: pkg/app/login.go:56 pkg/app/user.go:246 pkg/company/admin.go:217 #: pkg/booking/public.go:269 msgid "Email can not be empty." msgstr "No podéis dejar el correo-e en blanco." -#: pkg/app/login.go:57 pkg/app/user.go:247 pkg/company/admin.go:211 +#: pkg/app/login.go:57 pkg/app/user.go:247 pkg/company/admin.go:218 #: pkg/booking/public.go:270 msgid "This email is not valid. It should be like name@domain.com." msgstr "Este correo-e no es válido. Tiene que ser parecido a nombre@dominio.com." @@ -1231,7 +1247,7 @@ msgstr "Automático" msgid "Confirmation does not match password." msgstr "La confirmación no se corresponde con la contraseña." -#: pkg/app/user.go:251 pkg/company/admin.go:226 +#: pkg/app/user.go:251 pkg/company/admin.go:238 msgid "Selected language is not valid." msgstr "El idioma escogido no es válido." @@ -1273,7 +1289,7 @@ msgstr "No podéis dejar el precio por noche en blanco." #: pkg/campsite/types/option.go:362 pkg/campsite/types/admin.go:468 msgid "Price per night must be a decimal number." -msgstr "El precio por noche tien que ser un número decimal." +msgstr "El precio por noche tiene que ser un número decimal." #: pkg/campsite/types/option.go:363 pkg/campsite/types/admin.go:469 msgid "Price per night must be zero or greater." @@ -1422,67 +1438,79 @@ msgstr "No podéis dejar la fecha final en blanco." msgid "End date must be a valid date." msgstr "La fecha final tiene que ser una fecha válida." -#: pkg/company/admin.go:193 pkg/booking/public.go:256 +#: pkg/company/admin.go:200 pkg/booking/public.go:256 msgid "Selected country is not valid." msgstr "El país escogido no es válido." -#: pkg/company/admin.go:197 +#: pkg/company/admin.go:204 msgid "Business name can not be empty." msgstr "No podéis dejar el nombre de empresa en blanco." -#: pkg/company/admin.go:198 +#: pkg/company/admin.go:205 msgid "Business name must have at least two letters." msgstr "El nombre de la empresa tiene que tener como mínimo dos letras." -#: pkg/company/admin.go:200 +#: pkg/company/admin.go:207 msgid "VAT number can not be empty." msgstr "No podéis dejar el NIF en blanco." -#: pkg/company/admin.go:201 +#: pkg/company/admin.go:208 msgid "This VAT number is not valid." msgstr "Este NIF no es válido." -#: pkg/company/admin.go:205 pkg/booking/public.go:272 +#: pkg/company/admin.go:212 pkg/booking/public.go:272 msgid "Phone can not be empty." msgstr "No podéis dejar el teléfono en blanco." -#: pkg/company/admin.go:206 pkg/booking/public.go:273 +#: pkg/company/admin.go:213 pkg/booking/public.go:273 msgid "This phone number is not valid." msgstr "Este teléfono no es válido." -#: pkg/company/admin.go:214 +#: pkg/company/admin.go:221 msgid "This web address is not valid. It should be like https://domain.com/." msgstr "Esta dirección web no es válida. Tiene que ser parecido a https://dominio.com/." -#: pkg/company/admin.go:216 +#: pkg/company/admin.go:223 msgid "Address can not be empty." msgstr "No podéis dejar la dirección en blanco." -#: pkg/company/admin.go:217 +#: pkg/company/admin.go:224 msgid "City can not be empty." msgstr "No podéis dejar la población en blanco." -#: pkg/company/admin.go:218 +#: pkg/company/admin.go:225 msgid "Province can not be empty." msgstr "No podéis dejar la provincia en blanco." -#: pkg/company/admin.go:219 +#: pkg/company/admin.go:226 msgid "Postal code can not be empty." msgstr "No podéis dejar el código postal en blanco." -#: pkg/company/admin.go:220 pkg/booking/public.go:265 +#: pkg/company/admin.go:227 pkg/booking/public.go:265 msgid "This postal code is not valid." msgstr "Este código postal no es válido." -#: pkg/company/admin.go:224 +#: pkg/company/admin.go:231 msgid "RTC number can not be empty." msgstr "No podéis dejar el número RTC en blanco." -#: pkg/company/admin.go:225 +#: pkg/company/admin.go:232 +msgid "Tourist tax can not be empty." +msgstr "No podéis dejar el impuesto turístico en blanco." + +#: pkg/company/admin.go:233 +msgid "Tourist tax must be a decimal number." +msgstr "El impuesto turístico tiene que ser un número decimal." + +#: pkg/company/admin.go:234 +msgid "Tourist tax must be zero or greater." +msgstr "El impuesto turístico tiene que ser como mínimo cero." + +#: pkg/company/admin.go:237 msgid "Selected currency is not valid." msgstr "La moneda escogida no es válida." -#: pkg/company/admin.go:227 +#: pkg/company/admin.go:239 msgid "Invoice number format can not be empty." msgstr "No podéis dejar el formato de número de factura en blanco." @@ -1708,10 +1736,6 @@ msgstr "%s tiene que ser como máximo %d" #~ msgid "Number of dogs must be zero or greater." #~ msgstr "El número de perros tiene que ser como mínimo cero." -#~ msgctxt "title" -#~ msgid "Pricing" -#~ msgstr "Precios" - #~ msgctxt "input" #~ msgid "Pricing" #~ msgstr "Precios" diff --git a/po/fr.po b/po/fr.po index 97825c4..08275e9 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: camper\n" "Report-Msgid-Bugs-To: jordi@tandem.blog\n" -"POT-Creation-Date: 2024-01-13 01:12+0100\n" +"POT-Creation-Date: 2024-01-14 02:01+0100\n" "PO-Revision-Date: 2023-12-20 10:13+0100\n" "Last-Translator: Oriol Carbonell \n" "Language-Team: French \n" @@ -120,7 +120,7 @@ msgid "Check-out Date" msgstr "Date de départ" #: web/templates/public/campsite/type.gohtml:54 -#: web/templates/public/booking.gohtml:155 +#: web/templates/public/booking.gohtml:156 msgctxt "action" msgid "Book" msgstr "Réserver" @@ -138,34 +138,35 @@ msgctxt "title" msgid "Prices" msgstr "Prix" -#: web/templates/public/campsite/type.gohtml:83 -msgid "%s €/night" -msgstr "%s €/nuit" - #: web/templates/public/campsite/type.gohtml:85 +#: web/templates/public/campsite/type.gohtml:91 msgid "%s: %s €/night" msgstr "%s : %s €/nuit" -#: web/templates/public/campsite/type.gohtml:88 +#: web/templates/public/campsite/type.gohtml:87 +msgid "%s €/night" +msgstr "%s €/nuit" + +#: web/templates/public/campsite/type.gohtml:94 msgid "*Minimum %d nights per stay" msgstr "*Minimum %d nuits par séjour" -#: web/templates/public/campsite/type.gohtml:99 +#: web/templates/public/campsite/type.gohtml:105 msgctxt "title" msgid "Features" msgstr "Caractéristiques" -#: web/templates/public/campsite/type.gohtml:110 +#: web/templates/public/campsite/type.gohtml:116 msgctxt "title" msgid "Info" msgstr "Info" -#: web/templates/public/campsite/type.gohtml:114 +#: web/templates/public/campsite/type.gohtml:120 msgctxt "title" msgid "Facilities" msgstr "Installations" -#: web/templates/public/campsite/type.gohtml:118 +#: web/templates/public/campsite/type.gohtml:124 msgctxt "title" msgid "Description" msgstr "Description" @@ -526,7 +527,7 @@ msgstr "Carte intégrée" #: web/templates/admin/location.gohtml:60 web/templates/admin/payment.gohtml:62 #: web/templates/admin/profile.gohtml:75 -#: web/templates/admin/taxDetails.gohtml:152 +#: web/templates/admin/taxDetails.gohtml:167 msgctxt "action" msgid "Save changes" msgstr "Enregistrer les changements" @@ -1061,25 +1062,40 @@ msgstr "Code Postal" #: web/templates/admin/taxDetails.gohtml:108 msgctxt "input" -msgid "RTC number" -msgstr "Numéro RTC" - -#: web/templates/admin/taxDetails.gohtml:116 -msgctxt "input" msgid "Currency" msgstr "Devise" -#: web/templates/admin/taxDetails.gohtml:126 +#: web/templates/admin/taxDetails.gohtml:118 msgctxt "input" msgid "Default Language" msgstr "Langue par défaut" -#: web/templates/admin/taxDetails.gohtml:136 +#: web/templates/admin/taxDetails.gohtml:127 +msgctxt "title" +msgid "Tourism" +msgstr "Tourisme" + +#: web/templates/admin/taxDetails.gohtml:130 +msgctxt "input" +msgid "RTC number" +msgstr "Numéro RTC" + +#: web/templates/admin/taxDetails.gohtml:138 +msgctxt "input" +msgid "Tourist Tax" +msgstr "Taxe touristique" + +#: web/templates/admin/taxDetails.gohtml:147 +msgctxt "title" +msgid "Invoicing" +msgstr "Facturation" + +#: web/templates/admin/taxDetails.gohtml:150 msgctxt "input" msgid "Invoice Number Format" msgstr "Format de numéro de facture" -#: web/templates/admin/taxDetails.gohtml:144 +#: web/templates/admin/taxDetails.gohtml:158 msgctxt "input" msgid "Legal Disclaimer" msgstr "Avertissement juridique" @@ -1205,12 +1221,12 @@ msgstr "L’image de la diapositive ne peut pas être vide." msgid "Slide image must be an image media type." msgstr "L’image de la diapositive doit être de type média d’image." -#: pkg/app/login.go:56 pkg/app/user.go:246 pkg/company/admin.go:210 +#: pkg/app/login.go:56 pkg/app/user.go:246 pkg/company/admin.go:217 #: pkg/booking/public.go:269 msgid "Email can not be empty." msgstr "L’e-mail ne peut pas être vide." -#: pkg/app/login.go:57 pkg/app/user.go:247 pkg/company/admin.go:211 +#: pkg/app/login.go:57 pkg/app/user.go:247 pkg/company/admin.go:218 #: pkg/booking/public.go:270 msgid "This email is not valid. It should be like name@domain.com." msgstr "Cette adresse e-mail n’est pas valide. Il devrait en être name@domain.com." @@ -1232,7 +1248,7 @@ msgstr "Automatique" msgid "Confirmation does not match password." msgstr "La confirmation ne correspond pas au mot de passe." -#: pkg/app/user.go:251 pkg/company/admin.go:226 +#: pkg/app/user.go:251 pkg/company/admin.go:238 msgid "Selected language is not valid." msgstr "La langue sélectionnée n’est pas valide." @@ -1423,67 +1439,79 @@ msgstr "La date de fin ne peut pas être vide." msgid "End date must be a valid date." msgstr "La date de fin doit être une date valide." -#: pkg/company/admin.go:193 pkg/booking/public.go:256 +#: pkg/company/admin.go:200 pkg/booking/public.go:256 msgid "Selected country is not valid." msgstr "Le pays sélectionné n’est pas valide." -#: pkg/company/admin.go:197 +#: pkg/company/admin.go:204 msgid "Business name can not be empty." msgstr "Le nom de l’entreprise ne peut pas être vide." -#: pkg/company/admin.go:198 +#: pkg/company/admin.go:205 msgid "Business name must have at least two letters." msgstr "Le nom de l’entreprise doit comporter au moins deux lettres." -#: pkg/company/admin.go:200 +#: pkg/company/admin.go:207 msgid "VAT number can not be empty." msgstr "Le numéro de TVA ne peut pas être vide." -#: pkg/company/admin.go:201 +#: pkg/company/admin.go:208 msgid "This VAT number is not valid." msgstr "Ce numéro de TVA n’est pas valide." -#: pkg/company/admin.go:205 pkg/booking/public.go:272 +#: pkg/company/admin.go:212 pkg/booking/public.go:272 msgid "Phone can not be empty." msgstr "Le téléphone ne peut pas être vide." -#: pkg/company/admin.go:206 pkg/booking/public.go:273 +#: pkg/company/admin.go:213 pkg/booking/public.go:273 msgid "This phone number is not valid." msgstr "Ce numéro de téléphone n’est pas valide." -#: pkg/company/admin.go:214 +#: pkg/company/admin.go:221 msgid "This web address is not valid. It should be like https://domain.com/." msgstr "Cette adresse web n’est pas valide. Il devrait en être https://domain.com/." -#: pkg/company/admin.go:216 +#: pkg/company/admin.go:223 msgid "Address can not be empty." msgstr "L’adresse ne peut pas être vide." -#: pkg/company/admin.go:217 +#: pkg/company/admin.go:224 msgid "City can not be empty." msgstr "La ville ne peut pas être vide." -#: pkg/company/admin.go:218 +#: pkg/company/admin.go:225 msgid "Province can not be empty." msgstr "La province ne peut pas être vide." -#: pkg/company/admin.go:219 +#: pkg/company/admin.go:226 msgid "Postal code can not be empty." msgstr "Le code postal ne peut pas être vide." -#: pkg/company/admin.go:220 pkg/booking/public.go:265 +#: pkg/company/admin.go:227 pkg/booking/public.go:265 msgid "This postal code is not valid." msgstr "Ce code postal n’est pas valide." -#: pkg/company/admin.go:224 +#: pkg/company/admin.go:231 msgid "RTC number can not be empty." msgstr "Le numéro RTC ne peut pas être vide." -#: pkg/company/admin.go:225 +#: pkg/company/admin.go:232 +msgid "Tourist tax can not be empty." +msgstr "La taxe touristique ne peut pas être vide." + +#: pkg/company/admin.go:233 +msgid "Tourist tax must be a decimal number." +msgstr "La taxe touristique doit être un nombre décimal." + +#: pkg/company/admin.go:234 +msgid "Tourist tax must be zero or greater." +msgstr "La taxe touristique doit être égal ou supérieur à zéro." + +#: pkg/company/admin.go:237 msgid "Selected currency is not valid." msgstr "La devise sélectionnée n’est pas valide." -#: pkg/company/admin.go:227 +#: pkg/company/admin.go:239 msgid "Invoice number format can not be empty." msgstr "Le format du numéro de facture ne peut pas être vide." diff --git a/revert/company__tourist_tax.sql b/revert/company__tourist_tax.sql new file mode 100644 index 0000000..14a5507 --- /dev/null +++ b/revert/company__tourist_tax.sql @@ -0,0 +1,9 @@ +-- Revert camper:company__tourist_tax from pg + +begin; + +alter table camper.company +drop column if exists tourist_tax +; + +commit; diff --git a/sqitch.plan b/sqitch.plan index 43e51ab..7f9127b 100644 --- a/sqitch.plan +++ b/sqitch.plan @@ -135,3 +135,4 @@ translate_legal_text [roles schema_camper legal_text_i18n] 2023-12-22T00:10:05Z add_services_carousel_slide [add_services_carousel_slide@v0] 2024-01-12T18:17:33Z jordi fita mas # Change add_services_carousel_slide’s return type from void to integer service__position [service] 2024-01-12T23:47:29Z jordi fita mas # Add position column to service order_services [schema_camper roles service service__position] 2024-01-12T23:52:24Z jordi fita mas # Add function to order services +company__tourist_tax [company] 2024-01-14T00:06:26Z jordi fita mas # Add tourist_tax to company diff --git a/test/add_campsite.sql b/test/add_campsite.sql index ee898bd..e996f1f 100644 --- a/test/add_campsite.sql +++ b/test/add_campsite.sql @@ -29,9 +29,9 @@ truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') - , (2, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 'FR', 'USD', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , (2, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/add_campsite_type.sql b/test/add_campsite_type.sql index 2961bbe..94db3a6 100644 --- a/test/add_campsite_type.sql +++ b/test/add_campsite_type.sql @@ -29,9 +29,9 @@ truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') - , (2, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 'FR', 'USD', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , (2, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/add_campsite_type_carousel_slide.sql b/test/add_campsite_type_carousel_slide.sql index 0397da4..86633ac 100644 --- a/test/add_campsite_type_carousel_slide.sql +++ b/test/add_campsite_type_carousel_slide.sql @@ -30,8 +30,8 @@ truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/add_campsite_type_feature.sql b/test/add_campsite_type_feature.sql index 1c2a15f..4efffe0 100644 --- a/test/add_campsite_type_feature.sql +++ b/test/add_campsite_type_feature.sql @@ -30,8 +30,8 @@ truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/add_campsite_type_option.sql b/test/add_campsite_type_option.sql index fd92abe..93829f3 100644 --- a/test/add_campsite_type_option.sql +++ b/test/add_campsite_type_option.sql @@ -30,8 +30,8 @@ truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/add_home_carousel_slide.sql b/test/add_home_carousel_slide.sql index 59ac42e..d8cdac3 100644 --- a/test/add_home_carousel_slide.sql +++ b/test/add_home_carousel_slide.sql @@ -27,8 +27,8 @@ truncate media_content cascade; truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/add_media.sql b/test/add_media.sql index 67fcc6f..8a6a43c 100644 --- a/test/add_media.sql +++ b/test/add_media.sql @@ -26,9 +26,9 @@ truncate media_content cascade; truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') - , (2, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 'FR', 'USD', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , (2, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'ca') ; select lives_ok( diff --git a/test/add_season.sql b/test/add_season.sql index b65926f..7b25982 100644 --- a/test/add_season.sql +++ b/test/add_season.sql @@ -25,9 +25,9 @@ truncate season cascade; truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') - , (2, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 'FR', 'USD', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , (2, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'ca') ; select lives_ok( diff --git a/test/add_service.sql b/test/add_service.sql index b972c73..4484b3e 100644 --- a/test/add_service.sql +++ b/test/add_service.sql @@ -25,9 +25,9 @@ truncate service cascade; truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') - , (2, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 'FR', 'USD', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , (2, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'ca') ; select lives_ok( diff --git a/test/add_services_carousel_slide.sql b/test/add_services_carousel_slide.sql index 2324b6e..8536e68 100644 --- a/test/add_services_carousel_slide.sql +++ b/test/add_services_carousel_slide.sql @@ -28,8 +28,8 @@ truncate media_content cascade; truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/build_cookie.sql b/test/build_cookie.sql index f554d17..c75a005 100644 --- a/test/build_cookie.sql +++ b/test/build_cookie.sql @@ -31,8 +31,8 @@ values (1, 'demo@tandem.blog', 'Demo', 'test', '44facbb30d8a419dfd4bfbc44a4b5539 , (9, 'admin@tandem.blog', 'Demo', 'test', '12af4c88b528c2ad4222e3740496ecbc58e76e26f087657524', current_timestamp + interval '1 month') ; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into company_user (company_id, user_id, role) diff --git a/test/campsite.sql b/test/campsite.sql index 75317bf..1507e0a 100644 --- a/test/campsite.sql +++ b/test/campsite.sql @@ -66,9 +66,9 @@ values (1, 'demo@tandem.blog', 'Demo', 'test', '44facbb30d8a419dfd4bfbc44a4b5539 , (5, 'admin@tandem.blog', 'Demo', 'test', '12af4c88b528c2ad4222e3740496ecbc58e76e26f087657524', current_timestamp + interval '1 month') ; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') - , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 'FR', 'USD', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'ca') ; insert into company_user (company_id, user_id, role) diff --git a/test/campsite_type.sql b/test/campsite_type.sql index 6dd9575..aa48991 100644 --- a/test/campsite_type.sql +++ b/test/campsite_type.sql @@ -110,9 +110,9 @@ values (1, 'demo@tandem.blog', 'Demo', 'test', '44facbb30d8a419dfd4bfbc44a4b5539 , (5, 'admin@tandem.blog', 'Demo', 'test', '12af4c88b528c2ad4222e3740496ecbc58e76e26f087657524', current_timestamp + interval '1 month') ; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') - , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 'FR', 'USD', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'ca') ; insert into company_user (company_id, user_id, role) diff --git a/test/campsite_type_carousel.sql b/test/campsite_type_carousel.sql index 1b9f24b..787c649 100644 --- a/test/campsite_type_carousel.sql +++ b/test/campsite_type_carousel.sql @@ -60,9 +60,9 @@ values (1, 'demo@tandem.blog', 'Demo', 'test', '44facbb30d8a419dfd4bfbc44a4b5539 , (5, 'admin@tandem.blog', 'Demo', 'test', '12af4c88b528c2ad4222e3740496ecbc58e76e26f087657524', current_timestamp + interval '1 month') ; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') - , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 'FR', 'USD', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'ca') ; insert into company_user (company_id, user_id, role) diff --git a/test/campsite_type_cost.sql b/test/campsite_type_cost.sql index 4a3dd49..bbe91d8 100644 --- a/test/campsite_type_cost.sql +++ b/test/campsite_type_cost.sql @@ -59,9 +59,9 @@ values (1, 'demo@tandem.blog', 'Demo', 'test', '44facbb30d8a419dfd4bfbc44a4b5539 , (5, 'admin@tandem.blog', 'Demo', 'test', '12af4c88b528c2ad4222e3740496ecbc58e76e26f087657524', current_timestamp + interval '1 month') ; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') - , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 'FR', 'USD', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'ca') ; insert into company_user (company_id, user_id, role) diff --git a/test/campsite_type_feature.sql b/test/campsite_type_feature.sql index a9735c3..10db86f 100644 --- a/test/campsite_type_feature.sql +++ b/test/campsite_type_feature.sql @@ -64,9 +64,9 @@ values (1, 'demo@tandem.blog', 'Demo', 'test', '44facbb30d8a419dfd4bfbc44a4b5539 , (5, 'admin@tandem.blog', 'Demo', 'test', '12af4c88b528c2ad4222e3740496ecbc58e76e26f087657524', current_timestamp + interval '1 month') ; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') - , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 'FR', 'USD', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'ca') ; insert into company_user (company_id, user_id, role) diff --git a/test/campsite_type_option.sql b/test/campsite_type_option.sql index 57ba290..6ac2f9a 100644 --- a/test/campsite_type_option.sql +++ b/test/campsite_type_option.sql @@ -62,9 +62,9 @@ values (1, 'demo@tandem.blog', 'Demo', 'test', '44facbb30d8a419dfd4bfbc44a4b5539 , (5, 'admin@tandem.blog', 'Demo', 'test', '12af4c88b528c2ad4222e3740496ecbc58e76e26f087657524', current_timestamp + interval '1 month') ; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') - , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 'FR', 'USD', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'ca') ; insert into company_user (company_id, user_id, role) diff --git a/test/campsite_type_option_cost.sql b/test/campsite_type_option_cost.sql index 0f40384..6719ece 100644 --- a/test/campsite_type_option_cost.sql +++ b/test/campsite_type_option_cost.sql @@ -55,9 +55,9 @@ values (1, 'demo@tandem.blog', 'Demo', 'test', '44facbb30d8a419dfd4bfbc44a4b5539 , (5, 'admin@tandem.blog', 'Demo', 'test', '12af4c88b528c2ad4222e3740496ecbc58e76e26f087657524', current_timestamp + interval '1 month') ; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') - , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 'FR', 'USD', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'ca') ; insert into company_user (company_id, user_id, role) diff --git a/test/change_password.sql b/test/change_password.sql index ed0eade..172f4e5 100644 --- a/test/change_password.sql +++ b/test/change_password.sql @@ -31,8 +31,8 @@ values (1, 'demo@tandem.blog', 'Demo', 'test', '44facbb30d8a419dfd4bfbc44a4b5539 , (9, 'admin@tandem.blog', 'Demo', 'test', '12af4c88b528c2ad4222e3740496ecbc58e76e26f087657524', current_timestamp + interval '1 month') ; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into company_user (company_id, user_id, role) diff --git a/test/check_cookie.sql b/test/check_cookie.sql index dde012d..05ffc7d 100644 --- a/test/check_cookie.sql +++ b/test/check_cookie.sql @@ -31,9 +31,9 @@ values (1, 'demo@tandem.blog', 'Demo', 'test', '44facbb30d8a419dfd4bfbc44a4b5539 , (9, 'admin@tandem.blog', 'Demo', 'test', '12af4c88b528c2ad4222e3740496ecbc58e76e26f087657524', current_timestamp + interval '1 month') ; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') - , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 'FR', 'USD', 'es') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'es') ; insert into company_user (company_id, user_id, role) diff --git a/test/company.sql b/test/company.sql index b50bcdf..c7c789d 100644 --- a/test/company.sql +++ b/test/company.sql @@ -5,7 +5,7 @@ reset client_min_messages; begin; -select plan(100); +select plan(104); set search_path to camper, public; @@ -91,6 +91,11 @@ select col_type_is('company', 'rtc_number', 'text'); select col_not_null('company', 'rtc_number'); select col_hasnt_default('company', 'rtc_number'); +select has_column('company', 'tourist_tax'); +select col_type_is('company', 'tourist_tax', 'integer'); +select col_not_null('company', 'tourist_tax'); +select col_hasnt_default('company', 'tourist_tax'); + select has_column('company', 'currency_code'); select col_is_fk('company', 'currency_code'); select fk_ok('company', 'currency_code', 'currency', 'currency_code'); @@ -136,9 +141,9 @@ values (1, 'demo@tandem.blog', 'Demo', 'test', '44facbb30d8a419dfd4bfbc44a4b5539 , (5, 'admin@tandem.blog', 'Demo', 'test', '12af4c88b528c2ad4222e3740496ecbc58e76e26f087657524', current_timestamp + interval '1 month') ; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') - , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 'FR', 'USD', 'es') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'es') ; insert into company_user (company_id, user_id, role) @@ -197,8 +202,8 @@ select results_eq( reset role; select throws_ok( $$ - insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) - values (7, ' ', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') + insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) + values (7, ' ', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') $$, '23514', 'new row for relation "company" violates check constraint "business_name_not_empty"', 'Should not allow companies with blank business name' diff --git a/test/current_company_id.sql b/test/current_company_id.sql index 806ba9d..d4a4621 100644 --- a/test/current_company_id.sql +++ b/test/current_company_id.sql @@ -31,9 +31,9 @@ values (1, 'demo@tandem.blog', 'Demo', 'test', '44facbb30d8a419dfd4bfbc44a4b5539 , (5, 'admin@tandem.blog', 'Demo', 'test', '12af4c88b528c2ad4222e3740496ecbc58e76e26f087657524', current_timestamp + interval '1 month') ; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') - , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 'FR', 'USD', 'es') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'es') ; insert into company_user (company_id, user_id, role) diff --git a/test/current_user_cookie.sql b/test/current_user_cookie.sql index 6426bd3..1384bb9 100644 --- a/test/current_user_cookie.sql +++ b/test/current_user_cookie.sql @@ -31,9 +31,9 @@ values (1, 'demo@tandem.blog', 'Demo', 'test', '44facbb30d8a419dfd4bfbc44a4b5539 , (5, 'admin@tandem.blog', 'Demo', 'test', '12af4c88b528c2ad4222e3740496ecbc58e76e26f087657524', current_timestamp + interval '1 month') ; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') - , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 'FR', 'USD', 'es') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'es') ; insert into company_user (company_id, user_id, role) diff --git a/test/current_user_email.sql b/test/current_user_email.sql index c1c3864..0ab6142 100644 --- a/test/current_user_email.sql +++ b/test/current_user_email.sql @@ -31,9 +31,9 @@ values (1, 'demo@tandem.blog', 'Demo', 'test', '44facbb30d8a419dfd4bfbc44a4b5539 , (5, 'admin@tandem.blog', 'Demo', 'test', '12af4c88b528c2ad4222e3740496ecbc58e76e26f087657524', current_timestamp + interval '1 month') ; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') - , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 'FR', 'USD', 'es') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'es') ; insert into company_user (company_id, user_id, role) diff --git a/test/edit_campsite.sql b/test/edit_campsite.sql index c089f8a..b8191c6 100644 --- a/test/edit_campsite.sql +++ b/test/edit_campsite.sql @@ -28,8 +28,8 @@ truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/edit_campsite_type.sql b/test/edit_campsite_type.sql index 8b4c0e9..f4daac8 100644 --- a/test/edit_campsite_type.sql +++ b/test/edit_campsite_type.sql @@ -27,8 +27,8 @@ truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/edit_campsite_type_feature.sql b/test/edit_campsite_type_feature.sql index f252831..457442c 100644 --- a/test/edit_campsite_type_feature.sql +++ b/test/edit_campsite_type_feature.sql @@ -30,8 +30,8 @@ truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/edit_campsite_type_option.sql b/test/edit_campsite_type_option.sql index 54f3fd3..d410438 100644 --- a/test/edit_campsite_type_option.sql +++ b/test/edit_campsite_type_option.sql @@ -30,8 +30,8 @@ truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/edit_media.sql b/test/edit_media.sql index 9cf6abc..e76b12f 100644 --- a/test/edit_media.sql +++ b/test/edit_media.sql @@ -26,8 +26,8 @@ truncate media_content cascade; truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/edit_season.sql b/test/edit_season.sql index 99ea315..daa77da 100644 --- a/test/edit_season.sql +++ b/test/edit_season.sql @@ -25,8 +25,8 @@ truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into season (company_id, slug, name, color, active) diff --git a/test/edit_service.sql b/test/edit_service.sql index cb4cdf8..8688ab5 100644 --- a/test/edit_service.sql +++ b/test/edit_service.sql @@ -25,8 +25,8 @@ truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into service (service_id, company_id, icon_name, name, description) diff --git a/test/ensure_role_exists.sql b/test/ensure_role_exists.sql index 1c685bb..a6dccef 100644 --- a/test/ensure_role_exists.sql +++ b/test/ensure_role_exists.sql @@ -32,8 +32,8 @@ values (1, 'demo@tandem.blog', 'Demo', 'test') , (9, 'admin@tandem.blog', 'Demo', 'test') ; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; select lives_ok( diff --git a/test/home_carousel.sql b/test/home_carousel.sql index fccd78f..a29f76e 100644 --- a/test/home_carousel.sql +++ b/test/home_carousel.sql @@ -51,9 +51,9 @@ values (1, 'demo@tandem.blog', 'Demo', 'test', '44facbb30d8a419dfd4bfbc44a4b5539 , (5, 'admin@tandem.blog', 'Demo', 'test', '12af4c88b528c2ad4222e3740496ecbc58e76e26f087657524', current_timestamp + interval '1 month') ; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') - , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 'FR', 'USD', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'ca') ; insert into company_user (company_id, user_id, role) diff --git a/test/legal_text.sql b/test/legal_text.sql index 5ab598d..162f490 100644 --- a/test/legal_text.sql +++ b/test/legal_text.sql @@ -53,9 +53,9 @@ values (1, 'demo@tandem.blog', 'Demo', 'test', '44facbb30d8a419dfd4bfbc44a4b5539 , (5, 'admin@tandem.blog', 'Demo', 'test', '12af4c88b528c2ad4222e3740496ecbc58e76e26f087657524', current_timestamp + interval '1 month') ; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') - , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 'FR', 'USD', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'ca') ; insert into company_user (company_id, user_id, role) diff --git a/test/location.sql b/test/location.sql index 931d6a1..048b379 100644 --- a/test/location.sql +++ b/test/location.sql @@ -53,10 +53,10 @@ values (1, 'demo@tandem.blog', 'Demo', 'test', '44facbb30d8a419dfd4bfbc44a4b5539 , (5, 'admin@tandem.blog', 'Demo', 'test', '12af4c88b528c2ad4222e3740496ecbc58e76e26f087657524', current_timestamp + interval '1 month') ; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') - , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 'FR', 'USD', 'ca') - , (8, 'Company 8', 'XX345', '', '777-777-777', 'c@c', '', '', '', '', '', '', 'DE', 'USD', 'en') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'ca') + , (8, 'Company 8', 'XX345', '', '777-777-777', 'c@c', '', '', '', '', '', '', 60, 'DE', 'USD', 'en') ; insert into company_user (company_id, user_id, role) diff --git a/test/media.sql b/test/media.sql index 08dad38..a13918d 100644 --- a/test/media.sql +++ b/test/media.sql @@ -56,9 +56,9 @@ values (1, 'demo@tandem.blog', 'Demo', 'test', '44facbb30d8a419dfd4bfbc44a4b5539 , (5, 'admin@tandem.blog', 'Demo', 'test', '12af4c88b528c2ad4222e3740496ecbc58e76e26f087657524', current_timestamp + interval '1 month') ; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') - , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 'FR', 'USD', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'ca') ; insert into company_user (company_id, user_id, role) diff --git a/test/media_path.sql b/test/media_path.sql index 22853ca..68068bf 100644 --- a/test/media_path.sql +++ b/test/media_path.sql @@ -25,8 +25,8 @@ truncate media_content cascade; truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/order_campsite_type_carousel.sql b/test/order_campsite_type_carousel.sql index de654b0..e81d6b8 100644 --- a/test/order_campsite_type_carousel.sql +++ b/test/order_campsite_type_carousel.sql @@ -30,8 +30,8 @@ truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/order_campsite_type_features.sql b/test/order_campsite_type_features.sql index 352dfce..8b48a77 100644 --- a/test/order_campsite_type_features.sql +++ b/test/order_campsite_type_features.sql @@ -36,8 +36,8 @@ values (1, 'demo@tandem.blog', 'Demo', 'test', '44facbb30d8a419dfd4bfbc44a4b5539 , (5, 'admin@tandem.blog', 'Demo', 'test', '12af4c88b528c2ad4222e3740496ecbc58e76e26f087657524', current_timestamp + interval '1 month') ; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into company_user (company_id, user_id, role) diff --git a/test/order_campsite_type_options.sql b/test/order_campsite_type_options.sql index 8663923..c1d7fa8 100644 --- a/test/order_campsite_type_options.sql +++ b/test/order_campsite_type_options.sql @@ -30,8 +30,8 @@ truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/order_campsite_types.sql b/test/order_campsite_types.sql index a438323..3c2411a 100644 --- a/test/order_campsite_types.sql +++ b/test/order_campsite_types.sql @@ -28,8 +28,8 @@ truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/order_home_carousel.sql b/test/order_home_carousel.sql index abcf6a2..7d8498d 100644 --- a/test/order_home_carousel.sql +++ b/test/order_home_carousel.sql @@ -28,8 +28,8 @@ truncate media_content cascade; truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/order_seasons.sql b/test/order_seasons.sql index 90e5991..c69ceb1 100644 --- a/test/order_seasons.sql +++ b/test/order_seasons.sql @@ -26,8 +26,8 @@ truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into season (company_id, slug, name, color, active) diff --git a/test/order_services.sql b/test/order_services.sql index db93177..ae687e5 100644 --- a/test/order_services.sql +++ b/test/order_services.sql @@ -24,9 +24,8 @@ truncate service cascade; truncate company cascade; reset client_min_messages; - -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into service (service_id, company_id, icon_name, name, description) diff --git a/test/order_services_carousel.sql b/test/order_services_carousel.sql index 5d9ac49..5ad3de0 100644 --- a/test/order_services_carousel.sql +++ b/test/order_services_carousel.sql @@ -28,8 +28,8 @@ truncate media_content cascade; truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/redsys.sql b/test/redsys.sql index b983205..df77295 100644 --- a/test/redsys.sql +++ b/test/redsys.sql @@ -88,11 +88,11 @@ values (1, 'demo@tandem.blog', 'Demo', 'test', '44facbb30d8a419dfd4bfbc44a4b5539 , (5, 'admin@tandem.blog', 'Demo', 'test', '12af4c88b528c2ad4222e3740496ecbc58e76e26f087657524', current_timestamp + interval '1 month') ; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values ( 2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') - , ( 4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 'FR', 'USD', 'ca') - , ( 6, 'Company 6', 'XX345', '', '777-777-777', 'c@c', '', '', '', '', '', '', 'GB', 'EUR', 'en') - , ( 8, 'Company 8', 'XX456', '', '888-888-888', 'd@d', '', '', '', '', '', '', 'DE', 'USD', 'es') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values ( 2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , ( 4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'ca') + , ( 6, 'Company 6', 'XX345', '', '777-777-777', 'c@c', '', '', '', '', '', '', 60, 'GB', 'EUR', 'en') + , ( 8, 'Company 8', 'XX456', '', '888-888-888', 'd@d', '', '', '', '', '', '', 60, 'DE', 'USD', 'es') ; insert into company_user (company_id, user_id, role) diff --git a/test/redsys_encrypt.sql b/test/redsys_encrypt.sql index a2f3b87..f224bf5 100644 --- a/test/redsys_encrypt.sql +++ b/test/redsys_encrypt.sql @@ -23,9 +23,9 @@ set client_min_messages to warning; truncate redsys cascade; truncate company cascade; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') - , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 'FR', 'USD', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'ca') ; insert into redsys (company_id, merchant_code, terminal_number, environment, integration, encrypt_key) diff --git a/test/redsys_sign_request.sql b/test/redsys_sign_request.sql index 269f8c0..c171b32 100644 --- a/test/redsys_sign_request.sql +++ b/test/redsys_sign_request.sql @@ -23,9 +23,9 @@ set client_min_messages to warning; truncate redsys cascade; truncate company cascade; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') - , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 'FR', 'USD', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'ca') ; insert into redsys (company_id, merchant_code, terminal_number, environment, integration, encrypt_key) diff --git a/test/remove_campsite_type_carousel_slide.sql b/test/remove_campsite_type_carousel_slide.sql index 94c8f77..95168a7 100644 --- a/test/remove_campsite_type_carousel_slide.sql +++ b/test/remove_campsite_type_carousel_slide.sql @@ -28,8 +28,8 @@ truncate media_content cascade; truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/remove_home_carousel_slide.sql b/test/remove_home_carousel_slide.sql index 2ad5e72..7fb51b9 100644 --- a/test/remove_home_carousel_slide.sql +++ b/test/remove_home_carousel_slide.sql @@ -27,8 +27,8 @@ truncate media_content cascade; truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/remove_service.sql b/test/remove_service.sql index d6dc171..58ee409 100644 --- a/test/remove_service.sql +++ b/test/remove_service.sql @@ -25,8 +25,8 @@ truncate service cascade; truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into service (service_id, company_id, icon_name, name, description) diff --git a/test/remove_services_carousel_slide.sql b/test/remove_services_carousel_slide.sql index 21f0c50..b682ae6 100644 --- a/test/remove_services_carousel_slide.sql +++ b/test/remove_services_carousel_slide.sql @@ -28,8 +28,8 @@ truncate media_content cascade; truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/season.sql b/test/season.sql index 57041ac..7bf4c52 100644 --- a/test/season.sql +++ b/test/season.sql @@ -73,9 +73,9 @@ values (1, 'demo@tandem.blog', 'Demo', 'test', '44facbb30d8a419dfd4bfbc44a4b5539 , (5, 'admin@tandem.blog', 'Demo', 'test', '12af4c88b528c2ad4222e3740496ecbc58e76e26f087657524', current_timestamp + interval '1 month') ; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') - , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 'FR', 'USD', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'ca') ; insert into company_user (company_id, user_id, role) diff --git a/test/season_calendar.sql b/test/season_calendar.sql index ee3861c..6d732a7 100644 --- a/test/season_calendar.sql +++ b/test/season_calendar.sql @@ -43,9 +43,9 @@ values (1, 'demo@tandem.blog', 'Demo', 'test', '44facbb30d8a419dfd4bfbc44a4b5539 , (5, 'admin@tandem.blog', 'Demo', 'test', '12af4c88b528c2ad4222e3740496ecbc58e76e26f087657524', current_timestamp + interval '1 month') ; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') - , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 'FR', 'USD', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'ca') ; insert into company_user (company_id, user_id, role) diff --git a/test/service.sql b/test/service.sql index bc159dd..a164d0e 100644 --- a/test/service.sql +++ b/test/service.sql @@ -66,9 +66,9 @@ values (1, 'demo@tandem.blog', 'Demo', 'test', '44facbb30d8a419dfd4bfbc44a4b5539 , (5, 'admin@tandem.blog', 'Demo', 'test', '12af4c88b528c2ad4222e3740496ecbc58e76e26f087657524', current_timestamp + interval '1 month') ; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') - , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 'FR', 'USD', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'ca') ; insert into company_user (company_id, user_id, role) diff --git a/test/services_carousel.sql b/test/services_carousel.sql index 6216ba5..3293f64 100644 --- a/test/services_carousel.sql +++ b/test/services_carousel.sql @@ -51,9 +51,9 @@ values (1, 'demo@tandem.blog', 'Demo', 'test', '44facbb30d8a419dfd4bfbc44a4b5539 , (5, 'admin@tandem.blog', 'Demo', 'test', '12af4c88b528c2ad4222e3740496ecbc58e76e26f087657524', current_timestamp + interval '1 month') ; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') - , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 'FR', 'USD', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'ca') ; insert into company_user (company_id, user_id, role) diff --git a/test/set_campsite_type_cost.sql b/test/set_campsite_type_cost.sql index 6bd9c81..1aa5598 100644 --- a/test/set_campsite_type_cost.sql +++ b/test/set_campsite_type_cost.sql @@ -29,8 +29,8 @@ truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/set_campsite_type_option_cost.sql b/test/set_campsite_type_option_cost.sql index b782f76..f0d48f6 100644 --- a/test/set_campsite_type_option_cost.sql +++ b/test/set_campsite_type_option_cost.sql @@ -31,8 +31,8 @@ truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/set_cookie.sql b/test/set_cookie.sql index f7c2f53..df484ee 100644 --- a/test/set_cookie.sql +++ b/test/set_cookie.sql @@ -31,9 +31,9 @@ values (1, 'demo@tandem.blog', 'Demo', 'test', '44facbb30d8a419dfd4bfbc44a4b5539 , (5, 'admin@tandem.blog', 'Demo', 'test', '12af4c88b528c2ad4222e3740496ecbc58e76e26f087657524', current_timestamp + interval '1 month') ; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') - , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 'FR', 'USD', 'es') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'es') ; insert into company_user (company_id, user_id, role) diff --git a/test/set_season_range.sql b/test/set_season_range.sql index 36cec2f..e1a8110 100644 --- a/test/set_season_range.sql +++ b/test/set_season_range.sql @@ -27,8 +27,8 @@ truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into season (season_id, company_id, name) diff --git a/test/setup_location.sql b/test/setup_location.sql index 12abb6f..6edbefd 100644 --- a/test/setup_location.sql +++ b/test/setup_location.sql @@ -24,9 +24,9 @@ truncate location cascade; truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') - , (2, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 'FR', 'USD', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , (2, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'ca') ; prepare location_data as diff --git a/test/setup_redsys.sql b/test/setup_redsys.sql index 8e70468..c8581d6 100644 --- a/test/setup_redsys.sql +++ b/test/setup_redsys.sql @@ -25,9 +25,9 @@ truncate redsys cascade; truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') - , (2, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 'FR', 'USD', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , (2, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'ca') ; prepare redsys_data as diff --git a/test/translate_campsite_type.sql b/test/translate_campsite_type.sql index 64d036b..219db8f 100644 --- a/test/translate_campsite_type.sql +++ b/test/translate_campsite_type.sql @@ -27,8 +27,8 @@ truncate media_content cascade; truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/translate_campsite_type_carousel_slide.sql b/test/translate_campsite_type_carousel_slide.sql index 46c8537..a6204eb 100644 --- a/test/translate_campsite_type_carousel_slide.sql +++ b/test/translate_campsite_type_carousel_slide.sql @@ -28,8 +28,8 @@ truncate media_content cascade; truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/translate_campsite_type_feature.sql b/test/translate_campsite_type_feature.sql index 4e80ea4..6359b1c 100644 --- a/test/translate_campsite_type_feature.sql +++ b/test/translate_campsite_type_feature.sql @@ -29,8 +29,8 @@ truncate media_content cascade; truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/translate_campsite_type_option.sql b/test/translate_campsite_type_option.sql index 90a25bd..5ff1358 100644 --- a/test/translate_campsite_type_option.sql +++ b/test/translate_campsite_type_option.sql @@ -29,8 +29,8 @@ truncate media_content cascade; truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/translate_home_carousel_slide.sql b/test/translate_home_carousel_slide.sql index 974482b..eb7d282 100644 --- a/test/translate_home_carousel_slide.sql +++ b/test/translate_home_carousel_slide.sql @@ -28,8 +28,8 @@ truncate media_content cascade; truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/translate_legal_text.sql b/test/translate_legal_text.sql index 3e8dabe..66017eb 100644 --- a/test/translate_legal_text.sql +++ b/test/translate_legal_text.sql @@ -25,9 +25,9 @@ truncate legal_text cascade; truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') - , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 'FR', 'USD', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'ca') ; insert into legal_text (company_id, slug, name, content) diff --git a/test/translate_location.sql b/test/translate_location.sql index 49f5511..0e7b7ee 100644 --- a/test/translate_location.sql +++ b/test/translate_location.sql @@ -26,9 +26,9 @@ truncate location cascade; truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') - , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 'FR', 'USD', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'ca') ; insert into location (company_id, directions, map_embed, opening_dates) diff --git a/test/translate_season.sql b/test/translate_season.sql index 0b84efd..4e25d06 100644 --- a/test/translate_season.sql +++ b/test/translate_season.sql @@ -25,8 +25,8 @@ truncate season cascade; truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into season (season_id, company_id, slug, name, color, active) diff --git a/test/translate_service.sql b/test/translate_service.sql index 02ae9c2..2474503 100644 --- a/test/translate_service.sql +++ b/test/translate_service.sql @@ -25,8 +25,8 @@ truncate service cascade; truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into service (service_id, company_id, icon_name, name, description) diff --git a/test/translate_services_carousel_slide.sql b/test/translate_services_carousel_slide.sql index 67e2d2e..032bfa2 100644 --- a/test/translate_services_carousel_slide.sql +++ b/test/translate_services_carousel_slide.sql @@ -28,8 +28,8 @@ truncate media_content cascade; truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/unset_season_range.sql b/test/unset_season_range.sql index 1332c03..42f8c10 100644 --- a/test/unset_season_range.sql +++ b/test/unset_season_range.sql @@ -27,8 +27,8 @@ truncate company cascade; reset client_min_messages; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') ; insert into season (season_id, company_id, name) diff --git a/test/user_profile.sql b/test/user_profile.sql index 4d328f9..d2f4523 100644 --- a/test/user_profile.sql +++ b/test/user_profile.sql @@ -71,9 +71,9 @@ values (1, 'demo@tandem.blog', 'Demo', 'test', '44facbb30d8a419dfd4bfbc44a4b5539 , (7, 'another@tandem.blog', 'Another Admin', 'test', default, default, default) ; -insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') - , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 'FR', 'USD', 'es') +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'es') ; insert into company_user (company_id, user_id, role) diff --git a/verify/company__tourist_tax.sql b/verify/company__tourist_tax.sql new file mode 100644 index 0000000..b55e067 --- /dev/null +++ b/verify/company__tourist_tax.sql @@ -0,0 +1,10 @@ +-- Verify camper:company__tourist_tax on pg + +begin; + +select tourist_tax +from camper.company +where false +; + +rollback; diff --git a/web/templates/admin/taxDetails.gohtml b/web/templates/admin/taxDetails.gohtml index 39c0c57..17cb55c 100644 --- a/web/templates/admin/taxDetails.gohtml +++ b/web/templates/admin/taxDetails.gohtml @@ -103,14 +103,6 @@ {{ template "error-message" . }} {{- end }} - {{ with .RTCNumber -}} - - {{ template "error-message" . }} - {{- end }} {{ with .Currency -}} {{ template "error-message" . }} {{- end }} - {{ with .InvoiceNumberFormat -}} - - {{ template "error-message" . }} - {{- end }} - {{ with .LegalDisclaimer -}} - - {{ template "error-message" . }} - {{- end }} + + {{ template "error-message" . }} + {{- end }} +