diff --git a/demo/demo.sql b/demo/demo.sql index 7e0743d..bc20b63 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, 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', '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, 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_host (company_id, host) values (52, 'localhost:8080') diff --git a/deploy/company.sql b/deploy/company.sql index 0350221..92ebfe1 100644 --- a/deploy/company.sql +++ b/deploy/company.sql @@ -29,6 +29,7 @@ create table company ( province text not null, postal_code text not null, country_code country_code not null references country, + rtc_number text not null, currency_code currency_code not null references currency, default_lang_tag text not null references language, invoice_number_format text not null default '"FRA"YYYY0000', diff --git a/pkg/company/admin.go b/pkg/company/admin.go index d279aa7..d6e69c9 100644 --- a/pkg/company/admin.go +++ b/pkg/company/admin.go @@ -61,6 +61,7 @@ type taxDetailsForm struct { Province *form.Input PostalCode *form.Input Country *form.Select + RTCNumber *form.Input Currency *form.Select DefaultLanguage *form.Select InvoiceNumberFormat *form.Input @@ -103,6 +104,9 @@ func newTaxDetailsForm(ctx context.Context, conn *database.Conn, l *locale.Local Name: "country", Options: form.MustGetOptions(ctx, conn, "select country.country_code, coalesce(i18n.name, country.name) as l10n_name from country left join country_i18n as i18n on country.country_code = i18n.country_code and i18n.lang_tag = $1 order by l10n_name", l.Language), }, + RTCNumber: &form.Input{ + Name: "rtc_number", + }, Currency: &form.Select{ Name: "currency", Options: form.MustGetOptions(ctx, conn, "select currency_code, currency_symbol from currency order by currency_code"), @@ -132,6 +136,7 @@ func (f *taxDetailsForm) FillFromDatabase(ctx context.Context, company *auth.Com , city , province , postal_code + , rtc_number , array[country_code::text] , array[currency_code::text] , array[default_lang_tag] @@ -149,6 +154,7 @@ func (f *taxDetailsForm) FillFromDatabase(ctx context.Context, company *auth.Com &f.City.Val, &f.Province.Val, &f.PostalCode.Val, + &f.RTCNumber.Val, &f.Country.Selected, &f.Currency.Selected, &f.DefaultLanguage.Selected, @@ -172,6 +178,7 @@ func (f *taxDetailsForm) Parse(r *http.Request) error { f.Province.FillValue(r) f.PostalCode.FillValue(r) f.Country.FillValue(r) + f.RTCNumber.FillValue(r) f.Currency.FillValue(r) f.DefaultLanguage.FillValue(r) f.InvoiceNumberFormat.FillValue(r) @@ -214,6 +221,7 @@ func (f *taxDetailsForm) Valid(ctx context.Context, conn *database.Conn, l *loca return false, err } } + v.CheckRequired(f.RTCNumber, l.GettextNoop("RTC number can not be empty.")) 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.")) @@ -261,7 +269,8 @@ func editTaxDetails(w http.ResponseWriter, r *http.Request, user *auth.User, com , default_lang_tag = $13 , invoice_number_format = $14 , legal_disclaimer = $15 - where company_id = $16 + , rtc_number = $16 + where company_id = $17 `, f.BusinessName, f.VATIN, @@ -278,6 +287,7 @@ func editTaxDetails(w http.ResponseWriter, r *http.Request, user *auth.User, com f.DefaultLanguage, f.InvoiceNumberFormat, f.LegalDisclaimer, + f.RTCNumber, company.ID) httplib.Redirect(w, r, "/admin/company", http.StatusSeeOther) } diff --git a/pkg/template/page.go b/pkg/template/page.go index 161ddaf..a52f581 100644 --- a/pkg/template/page.go +++ b/pkg/template/page.go @@ -106,6 +106,7 @@ type address struct { City string Phone string Email string + RTCNumber string } func (addr *address) FillFromDatabase(ctx context.Context, conn *database.Conn, company *auth.Company) error { @@ -117,6 +118,7 @@ func (addr *address) FillFromDatabase(ctx context.Context, conn *database.Conn, , city , phone::text , email::text + , rtc_number from company where company_id = $1 `, company.ID) @@ -128,5 +130,6 @@ func (addr *address) FillFromDatabase(ctx context.Context, conn *database.Conn, &addr.City, &addr.Phone, &addr.Email, + &addr.RTCNumber, ) } diff --git a/po/ca.po b/po/ca.po index 379d5ec..e071d1d 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: 2023-10-13 21:27+0200\n" +"POT-Creation-Date: 2023-10-14 21:54+0200\n" "PO-Revision-Date: 2023-07-22 23:45+0200\n" "Last-Translator: jordi fita mas \n" "Language-Team: Catalan \n" @@ -203,7 +203,7 @@ msgid "Contact" msgstr "Contacte" #: web/templates/public/layout.gohtml:11 web/templates/public/layout.gohtml:24 -#: web/templates/public/layout.gohtml:94 +#: web/templates/public/layout.gohtml:95 msgid "Campsite Montagut" msgstr "Càmping Montagut" @@ -224,6 +224,10 @@ msgctxt "title" msgid "Sections" msgstr "Apartats" +#: web/templates/public/layout.gohtml:92 +msgid "RTC #%s" +msgstr "Núm. RTC %s" + #: web/templates/admin/carousel/form.gohtml:8 #: web/templates/admin/carousel/form.gohtml:25 msgctxt "title" @@ -885,7 +889,7 @@ msgid "Language" msgstr "Idioma" #: web/templates/admin/profile.gohtml:75 -#: web/templates/admin/taxDetails.gohtml:144 +#: web/templates/admin/taxDetails.gohtml:152 msgctxt "action" msgid "Save changes" msgstr "Desa els canvis" @@ -944,20 +948,25 @@ msgstr "País" #: 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:118 +#: web/templates/admin/taxDetails.gohtml:126 msgctxt "input" msgid "Default Language" msgstr "Idioma per defecte" -#: web/templates/admin/taxDetails.gohtml:128 +#: web/templates/admin/taxDetails.gohtml:136 msgctxt "input" msgid "Invoice Number Format" msgstr "Format del número de factura" -#: web/templates/admin/taxDetails.gohtml:136 +#: web/templates/admin/taxDetails.gohtml:144 msgctxt "input" msgid "Legal Disclaimer" msgstr "Nota legal" @@ -1072,11 +1081,11 @@ 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:203 +#: pkg/app/login.go:56 pkg/app/user.go:246 pkg/company/admin.go:210 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:204 +#: pkg/app/login.go:57 pkg/app/user.go:247 pkg/company/admin.go:211 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." @@ -1105,7 +1114,7 @@ msgstr "No podeu deixar el nom en blanc." msgid "Confirmation does not match password." msgstr "La confirmació no es correspon amb la contrasenya." -#: pkg/app/user.go:251 pkg/company/admin.go:218 +#: pkg/app/user.go:251 pkg/company/admin.go:226 msgid "Selected language is not valid." msgstr "L’idioma escollit no és vàlid." @@ -1301,63 +1310,67 @@ 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:186 +#: pkg/company/admin.go:193 msgid "Selected country is not valid." msgstr "El país escollit no és vàlid." -#: pkg/company/admin.go:190 +#: pkg/company/admin.go:197 msgid "Business name can not be empty." msgstr "No podeu deixar el nom d’empresa en blanc." -#: pkg/company/admin.go:191 +#: pkg/company/admin.go:198 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:193 +#: pkg/company/admin.go:200 msgid "VAT number can not be empty." msgstr "No podeu deixar el NIF en blanc." -#: pkg/company/admin.go:194 +#: pkg/company/admin.go:201 msgid "This VAT number is not valid." msgstr "Aquest NIF no és vàlid." -#: pkg/company/admin.go:198 +#: pkg/company/admin.go:205 msgid "Phone can not be empty." msgstr "No podeu deixar el telèfon en blanc." -#: pkg/company/admin.go:199 +#: pkg/company/admin.go:206 msgid "This phone number is not valid." msgstr "Aquest número de telèfon no és vàlid." -#: pkg/company/admin.go:207 +#: pkg/company/admin.go:214 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:209 +#: pkg/company/admin.go:216 msgid "Address can not be empty." msgstr "No podeu deixar l’adreça en blanc." -#: pkg/company/admin.go:210 +#: pkg/company/admin.go:217 msgid "City can not be empty." msgstr "No podeu deixar la població en blanc." -#: pkg/company/admin.go:211 +#: pkg/company/admin.go:218 msgid "Province can not be empty." msgstr "No podeu deixar la província en blanc." -#: pkg/company/admin.go:212 +#: pkg/company/admin.go:219 msgid "Postal code can not be empty." msgstr "No podeu deixar el codi postal en blanc." -#: pkg/company/admin.go:213 +#: pkg/company/admin.go:220 msgid "This postal code is not valid." msgstr "Aquest codi postal no és vàlid." -#: pkg/company/admin.go:217 +#: pkg/company/admin.go:224 +msgid "RTC number can not be empty." +msgstr "No podeu deixar el número d’RTC en blanc." + +#: pkg/company/admin.go:225 msgid "Selected currency is not valid." msgstr "La moneda escollida no és vàlida." -#: pkg/company/admin.go:219 +#: pkg/company/admin.go:227 msgid "Invoice number format can not be empty." msgstr "No podeu deixar el format del número de factura en blanc." diff --git a/po/es.po b/po/es.po index 7a910e5..ba8e5d0 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: 2023-10-13 21:27+0200\n" +"POT-Creation-Date: 2023-10-14 21:54+0200\n" "PO-Revision-Date: 2023-07-22 23:46+0200\n" "Last-Translator: jordi fita mas \n" "Language-Team: Spanish \n" @@ -203,7 +203,7 @@ msgid "Contact" msgstr "Contacto" #: web/templates/public/layout.gohtml:11 web/templates/public/layout.gohtml:24 -#: web/templates/public/layout.gohtml:94 +#: web/templates/public/layout.gohtml:95 msgid "Campsite Montagut" msgstr "Camping Montagut" @@ -224,6 +224,10 @@ msgctxt "title" msgid "Sections" msgstr "Apartados" +#: web/templates/public/layout.gohtml:92 +msgid "RTC #%s" +msgstr "Nº RTC %s" + #: web/templates/admin/carousel/form.gohtml:8 #: web/templates/admin/carousel/form.gohtml:25 msgctxt "title" @@ -885,7 +889,7 @@ msgid "Language" msgstr "Idioma" #: web/templates/admin/profile.gohtml:75 -#: web/templates/admin/taxDetails.gohtml:144 +#: web/templates/admin/taxDetails.gohtml:152 msgctxt "action" msgid "Save changes" msgstr "Guardar los cambios" @@ -944,20 +948,25 @@ msgstr "País" #: 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:118 +#: web/templates/admin/taxDetails.gohtml:126 msgctxt "input" msgid "Default Language" msgstr "Idioma por defecto" -#: web/templates/admin/taxDetails.gohtml:128 +#: web/templates/admin/taxDetails.gohtml:136 msgctxt "input" msgid "Invoice Number Format" msgstr "Formato de número de factura" -#: web/templates/admin/taxDetails.gohtml:136 +#: web/templates/admin/taxDetails.gohtml:144 msgctxt "input" msgid "Legal Disclaimer" msgstr "Nota legal" @@ -1072,11 +1081,11 @@ 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:203 +#: pkg/app/login.go:56 pkg/app/user.go:246 pkg/company/admin.go:210 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:204 +#: pkg/app/login.go:57 pkg/app/user.go:247 pkg/company/admin.go:211 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." @@ -1105,7 +1114,7 @@ msgstr "No podéis dejar el nombre en blanco." 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:218 +#: pkg/app/user.go:251 pkg/company/admin.go:226 msgid "Selected language is not valid." msgstr "El idioma escogido no es válido." @@ -1301,63 +1310,67 @@ 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:186 +#: pkg/company/admin.go:193 msgid "Selected country is not valid." msgstr "El país escogido no es válido." -#: pkg/company/admin.go:190 +#: pkg/company/admin.go:197 msgid "Business name can not be empty." msgstr "No podéis dejar el nombre de empresa en blanco." -#: pkg/company/admin.go:191 +#: pkg/company/admin.go:198 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:193 +#: pkg/company/admin.go:200 msgid "VAT number can not be empty." msgstr "No podéis dejar el NIF en blanco." -#: pkg/company/admin.go:194 +#: pkg/company/admin.go:201 msgid "This VAT number is not valid." msgstr "Este NIF no es válido." -#: pkg/company/admin.go:198 +#: pkg/company/admin.go:205 msgid "Phone can not be empty." msgstr "No podéis dejar el teléfono en blanco." -#: pkg/company/admin.go:199 +#: pkg/company/admin.go:206 msgid "This phone number is not valid." msgstr "Este teléfono no es válido." -#: pkg/company/admin.go:207 +#: pkg/company/admin.go:214 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:209 +#: pkg/company/admin.go:216 msgid "Address can not be empty." msgstr "No podéis dejar la dirección en blanco." -#: pkg/company/admin.go:210 +#: pkg/company/admin.go:217 msgid "City can not be empty." msgstr "No podéis dejar la población en blanco." -#: pkg/company/admin.go:211 +#: pkg/company/admin.go:218 msgid "Province can not be empty." msgstr "No podéis dejar la provincia en blanco." -#: pkg/company/admin.go:212 +#: pkg/company/admin.go:219 msgid "Postal code can not be empty." msgstr "No podéis dejar el código postal en blanco." -#: pkg/company/admin.go:213 +#: pkg/company/admin.go:220 msgid "This postal code is not valid." msgstr "Este código postal no es válido." -#: pkg/company/admin.go:217 +#: pkg/company/admin.go:224 +msgid "RTC number can not be empty." +msgstr "No podéis dejar el número RTC en blanco." + +#: pkg/company/admin.go:225 msgid "Selected currency is not valid." msgstr "La moneda escogida no es válida." -#: pkg/company/admin.go:219 +#: pkg/company/admin.go:227 msgid "Invoice number format can not be empty." msgstr "No podéis dejar el formato de número de factura en blanco." diff --git a/test/add_campsite.sql b/test/add_campsite.sql index 6190f7f..ee898bd 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, 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, 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 media_content (media_type, bytes) diff --git a/test/add_campsite_type.sql b/test/add_campsite_type.sql index ceff737..2961bbe 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, 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, 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 media_content (media_type, bytes) diff --git a/test/add_campsite_type_carousel_slide.sql b/test/add_campsite_type_carousel_slide.sql index 3286c11..0397da4 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, 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, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', '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 5e2388c..1c2a15f 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, 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, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', '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 991deae..fd92abe 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, 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, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', '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 c25bb67..59ac42e 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, 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, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/add_media.sql b/test/add_media.sql index c1764f6..67fcc6f 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, 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, 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') ; select lives_ok( diff --git a/test/add_season.sql b/test/add_season.sql index 45a318c..b65926f 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, 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, 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') ; select lives_ok( diff --git a/test/add_service.sql b/test/add_service.sql index 9e9b206..b972c73 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, 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, 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') ; select lives_ok( diff --git a/test/add_services_carousel_slide.sql b/test/add_services_carousel_slide.sql index 6a4c1fd..d4446c7 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, 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, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/build_cookie.sql b/test/build_cookie.sql index a4923f6..f554d17 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, 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, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') ; insert into company_user (company_id, user_id, role) diff --git a/test/campsite.sql b/test/campsite.sql index 66d2a57..75317bf 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, 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, 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_user (company_id, user_id, role) diff --git a/test/campsite_type.sql b/test/campsite_type.sql index 74a02f8..9917a02 100644 --- a/test/campsite_type.sql +++ b/test/campsite_type.sql @@ -104,9 +104,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, 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, 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_user (company_id, user_id, role) diff --git a/test/campsite_type_carousel.sql b/test/campsite_type_carousel.sql index c6b272e..cb695ee 100644 --- a/test/campsite_type_carousel.sql +++ b/test/campsite_type_carousel.sql @@ -54,9 +54,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, 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, 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_user (company_id, user_id, role) diff --git a/test/campsite_type_cost.sql b/test/campsite_type_cost.sql index 444e47e..4a3dd49 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, 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, 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_user (company_id, user_id, role) diff --git a/test/campsite_type_feature.sql b/test/campsite_type_feature.sql index e1e7a67..e560d0d 100644 --- a/test/campsite_type_feature.sql +++ b/test/campsite_type_feature.sql @@ -58,9 +58,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, 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, 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_user (company_id, user_id, role) diff --git a/test/campsite_type_option.sql b/test/campsite_type_option.sql index ad8e1c6..22cf0f9 100644 --- a/test/campsite_type_option.sql +++ b/test/campsite_type_option.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, 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, 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_user (company_id, user_id, role) diff --git a/test/campsite_type_option_cost.sql b/test/campsite_type_option_cost.sql index b49a924..0f40384 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, 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, 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_user (company_id, user_id, role) diff --git a/test/change_password.sql b/test/change_password.sql index 6fa2216..ed0eade 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, 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, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', '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 f53f622..dde012d 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, 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, 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_user (company_id, user_id, role) diff --git a/test/company.sql b/test/company.sql index d5d00f6..b50bcdf 100644 --- a/test/company.sql +++ b/test/company.sql @@ -5,7 +5,7 @@ reset client_min_messages; begin; -select plan(96); +select plan(100); set search_path to camper, public; @@ -86,6 +86,11 @@ select col_type_is('company', 'country_code', 'country_code'); select col_not_null('company', 'country_code'); select col_hasnt_default('company', 'country_code'); +select has_column('company', 'rtc_number'); +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', 'currency_code'); select col_is_fk('company', 'currency_code'); select fk_ok('company', 'currency_code', 'currency', 'currency_code'); @@ -131,9 +136,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, 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, 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_user (company_id, user_id, role) @@ -192,8 +197,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, 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, country_code, currency_code, default_lang_tag) + values (7, ' ', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', '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/company_geography.sql b/test/company_geography.sql index d107a94..251ccb2 100644 --- a/test/company_geography.sql +++ b/test/company_geography.sql @@ -43,10 +43,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, 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, 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_user (company_id, user_id, role) diff --git a/test/current_company_id.sql b/test/current_company_id.sql index a937287..806ba9d 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, 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, 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_user (company_id, user_id, role) diff --git a/test/current_user_cookie.sql b/test/current_user_cookie.sql index 972ed45..6426bd3 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, 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, 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_user (company_id, user_id, role) diff --git a/test/current_user_email.sql b/test/current_user_email.sql index 4aa058e..c1c3864 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, 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, 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_user (company_id, user_id, role) diff --git a/test/edit_campsite.sql b/test/edit_campsite.sql index 31b075f..c089f8a 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, 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, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', '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 6802bcd..8b4c0e9 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, 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, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', '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 b12d224..f252831 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, 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, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', '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 fcef933..54f3fd3 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, 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, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/edit_media.sql b/test/edit_media.sql index 13535fb..9cf6abc 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, 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, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/edit_season.sql b/test/edit_season.sql index 4a68109..99ea315 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, 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, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', '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 8d52d74..cb4cdf8 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, 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, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', '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 efcbed1..1c685bb 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, 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, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') ; select lives_ok( diff --git a/test/home_carousel.sql b/test/home_carousel.sql index cde60a5..25524d3 100644 --- a/test/home_carousel.sql +++ b/test/home_carousel.sql @@ -45,9 +45,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, 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, 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_user (company_id, user_id, role) diff --git a/test/media.sql b/test/media.sql index 3446449..08dad38 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, 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, 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_user (company_id, user_id, role) diff --git a/test/media_path.sql b/test/media_path.sql index 1c77c5d..22853ca 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, 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, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/remove_campsite_type_carousel_slide.sql b/test/remove_campsite_type_carousel_slide.sql index 4c969e6..94c8f77 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, 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, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', '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 03ab5fa..2ad5e72 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, 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, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/remove_service.sql b/test/remove_service.sql index 81b5384..d6dc171 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, 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, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', '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 5b27740..21f0c50 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, 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, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/season.sql b/test/season.sql index 1ddfd10..b483ca8 100644 --- a/test/season.sql +++ b/test/season.sql @@ -67,9 +67,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, 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, 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_user (company_id, user_id, role) diff --git a/test/season_calendar.sql b/test/season_calendar.sql index bdbec37..ee3861c 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, 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, 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_user (company_id, user_id, role) diff --git a/test/service.sql b/test/service.sql index ceaa00d..b9710df 100644 --- a/test/service.sql +++ b/test/service.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, 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, 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_user (company_id, user_id, role) diff --git a/test/services_carousel.sql b/test/services_carousel.sql index 2906a62..e18a198 100644 --- a/test/services_carousel.sql +++ b/test/services_carousel.sql @@ -44,9 +44,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, 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, 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_user (company_id, user_id, role) diff --git a/test/set_campsite_type_cost.sql b/test/set_campsite_type_cost.sql index d02065d..6bd9c81 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, 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, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', '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 ffedd98..b782f76 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, 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, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/set_cookie.sql b/test/set_cookie.sql index 3eb9faa..f7c2f53 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, 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, 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_user (company_id, user_id, role) diff --git a/test/set_season_range.sql b/test/set_season_range.sql index c4c62b1..36cec2f 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, 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, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') ; insert into season (season_id, company_id, name) diff --git a/test/translate_campsite_type.sql b/test/translate_campsite_type.sql index db18aef..64d036b 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, 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, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', '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 059d39b..46c8537 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, 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, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', '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 4044b9a..4e80ea4 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, 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, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', '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 c2cb8ba..90a25bd 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, 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, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', '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 432e50a..974482b 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, 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, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/translate_season.sql b/test/translate_season.sql index e912bb4..0b84efd 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, 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, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', '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 8abf2cb..02ae9c2 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, 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, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', '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 5a9efd4..67e2d2e 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, 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, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', '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 583571a..1332c03 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, 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, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 'ES', 'EUR', 'ca') ; insert into season (season_id, company_id, name) diff --git a/test/user_profile.sql b/test/user_profile.sql index 3c5cdd1..4d328f9 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, 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, 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_user (company_id, user_id, role) diff --git a/verify/company.sql b/verify/company.sql index eb146be..b4d4671 100644 --- a/verify/company.sql +++ b/verify/company.sql @@ -15,6 +15,7 @@ select company_id , province , postal_code , country_code + , rtc_number , currency_code , default_lang_tag , invoice_number_format diff --git a/web/templates/admin/taxDetails.gohtml b/web/templates/admin/taxDetails.gohtml index 2405687..cd9587f 100644 --- a/web/templates/admin/taxDetails.gohtml +++ b/web/templates/admin/taxDetails.gohtml @@ -103,6 +103,14 @@ {{ template "error-message" . }} {{- end }} + {{ with .RTCNumber -}} + + {{ template "error-message" . }} + {{- end }} {{ with .Currency -}}