diff --git a/deploy/company__tourist_tax_max_days.sql b/deploy/company__tourist_tax_max_days.sql new file mode 100644 index 0000000..2a868fb --- /dev/null +++ b/deploy/company__tourist_tax_max_days.sql @@ -0,0 +1,14 @@ +-- Deploy camper:company__tourist_tax_max_days to pg +-- requires: company + +begin; + +alter table camper.company +add column tourist_tax_max_days camper.positive_integer not null default 7 +; + +alter table camper.company +alter column tourist_tax_max_days drop default +; + +commit; diff --git a/deploy/draft_payment.sql b/deploy/draft_payment.sql index d360fbc..894cd94 100644 --- a/deploy/draft_payment.sql +++ b/deploy/draft_payment.sql @@ -10,13 +10,12 @@ -- requires: campsite_type_option -- requires: payment -- requires: payment_option +-- requires: company__tourist_tax_max_days begin; set search_path to camper, public; -create type option_units as (option_id integer, units integer); - create or replace function draft_payment(payment_slug uuid, arrival_date date, departure_date date, campsite_type_slug uuid, num_adults integer, num_teenagers integer, num_children integer, num_dogs integer, zone_preferences text, options option_units[]) returns payment as $$ declare @@ -60,12 +59,12 @@ begin , sum(cost_per_child * num_children)::integer , num_dogs , sum(case when num_dogs > 0 then coalesce(pet.cost_per_night, 0) else 0 end)::integer - , sum(tourist_tax * num_adults)::integer + , sum(case when day_num <= tourist_tax_max_days then tourist_tax * num_adults else 0 end)::integer , 0 , currency_code , case when arrival_date - current_date >= 7 then 0.3 else 1.0 end , coalesce(zone_preferences, '') - from generate_series(arrival_date, departure_date - 1, interval '1 day') as date(day) + from generate_series(arrival_date, departure_date - 1, interval '1 day') with ordinality as date(day, day_num) left join season_calendar on season_range @> date.day::date left join season using (season_id) left join campsite_type using (company_id) diff --git a/deploy/draft_payment@v4.sql b/deploy/draft_payment@v4.sql new file mode 100644 index 0000000..d360fbc --- /dev/null +++ b/deploy/draft_payment@v4.sql @@ -0,0 +1,170 @@ +-- Deploy camper:draft_payment to pg +-- requires: roles +-- requires: schema_camper +-- requires: season_calendar +-- requires: season +-- requires: campsite_type +-- requires: campsite_type_pet_cost +-- requires: campsite_type_cost +-- requires: campsite_type_option_cost +-- requires: campsite_type_option +-- requires: payment +-- requires: payment_option + +begin; + +set search_path to camper, public; + +create type option_units as (option_id integer, units integer); + +create or replace function draft_payment(payment_slug uuid, arrival_date date, departure_date date, campsite_type_slug uuid, num_adults integer, num_teenagers integer, num_children integer, num_dogs integer, zone_preferences text, options option_units[]) returns payment as +$$ +declare + p payment; +begin + if exists(select 1 from payment where slug = payment_slug and payment_status <> 'draft') then + payment_slug = null; + end if; + insert into payment ( + slug + , company_id + , campsite_type_id + , arrival_date + , departure_date + , subtotal_nights + , number_adults + , subtotal_adults + , number_teenagers + , subtotal_teenagers + , number_children + , subtotal_children + , number_dogs + , subtotal_dogs + , subtotal_tourist_tax + , total + , currency_code + , down_payment_percent + , zone_preferences + ) + select coalesce(payment_slug, gen_random_uuid()) + , company_id + , campsite_type_id + , arrival_date + , departure_date + , sum(cost.cost_per_night * ceiling((num_adults::numeric + num_teenagers::numeric + num_children::numeric) / max_campers::numeric)::integer)::integer + , num_adults + , sum(cost_per_adult * num_adults)::integer + , num_teenagers + , sum(cost_per_teenager * num_teenagers)::integer + , num_children + , sum(cost_per_child * num_children)::integer + , num_dogs + , sum(case when num_dogs > 0 then coalesce(pet.cost_per_night, 0) else 0 end)::integer + , sum(tourist_tax * num_adults)::integer + , 0 + , currency_code + , case when arrival_date - current_date >= 7 then 0.3 else 1.0 end + , coalesce(zone_preferences, '') + from generate_series(arrival_date, departure_date - 1, interval '1 day') as date(day) + left join season_calendar on season_range @> date.day::date + left join season using (season_id) + left join campsite_type using (company_id) + left join campsite_type_pet_cost as pet using (campsite_type_id) + left join campsite_type_cost as cost using (campsite_type_id, season_id) + left join company using (company_id) + where campsite_type.slug = campsite_type_slug + group by company_id + , campsite_type_id + , currency_code + on conflict (slug) do update + set company_id = excluded.company_id + , campsite_type_id = excluded.campsite_type_id + , arrival_date = excluded.arrival_date + , departure_date = excluded.departure_date + , subtotal_nights = excluded.subtotal_nights + , number_adults = excluded.number_adults + , subtotal_adults = excluded.subtotal_adults + , number_teenagers = excluded.number_teenagers + , subtotal_teenagers = excluded.subtotal_teenagers + , number_children = excluded.number_children + , subtotal_children = excluded.subtotal_children + , number_dogs = excluded.number_dogs + , subtotal_dogs = excluded.subtotal_dogs + , subtotal_tourist_tax = excluded.subtotal_tourist_tax + , total = excluded.total + , currency_code = excluded.currency_code + , down_payment_percent = excluded.down_payment_percent + , zone_preferences = excluded.zone_preferences + , updated_at = current_timestamp + returning * + into p + ; + + if array_length(coalesce(options, array[]::option_units[]), 1) > 0 then + delete + from payment_option + where payment_id = p.payment_id + and campsite_type_option_id not in ( + select campsite_type_option_id + from unnest(options) as option(campsite_type_option_id, units) + ); + + insert into payment_option ( + payment_id + , campsite_type_option_id + , units + , subtotal + ) + select p.payment_id + , campsite_type_option_id + , units + , case when per_night then sum(cost * units)::integer else max(cost * units)::integer end + from generate_series(arrival_date, departure_date - 1, interval '1 day') as date(day) + join season_calendar on season_range @> date.day::date + join campsite_type_option_cost using (season_id) + join campsite_type_option using (campsite_type_option_id) + join unnest(options) as option(campsite_type_option_id, units) using (campsite_type_option_id) + group by campsite_type_option_id + , units + , per_night + on conflict (payment_id, campsite_type_option_id) do update + set units = excluded.units + , subtotal = excluded.subtotal + ; + + with option as ( + select sum(subtotal)::integer as subtotal + from payment_option + where payment_id = p.payment_id + ) + update payment + set total = subtotal_nights + subtotal_adults + subtotal_teenagers + subtotal_children + subtotal_dogs + subtotal_tourist_tax + coalesce(option.subtotal, 0) + from option + where payment_id = p.payment_id + returning total into p.total + ; + else + delete + from payment_option + where payment_id = p.payment_id; + + update payment + set total = subtotal_nights + subtotal_adults + subtotal_teenagers + subtotal_children + subtotal_dogs + subtotal_tourist_tax + where payment_id = p.payment_id + returning total into p.total + ; + end if; + + + return p; +end; +$$ + language plpgsql +; + +revoke execute on function draft_payment(uuid, date, date, uuid, integer, integer, integer, integer, text, option_units[]) from public; +grant execute on function draft_payment(uuid, date, date, uuid, integer, integer, integer, integer, text, option_units[]) to guest; +grant execute on function draft_payment(uuid, date, date, uuid, integer, integer, integer, integer, text, option_units[]) to employee; +grant execute on function draft_payment(uuid, date, date, uuid, integer, integer, integer, integer, text, option_units[]) to admin; + +commit; diff --git a/pkg/campsite/types/public.go b/pkg/campsite/types/public.go index 02852bd..2073e89 100644 --- a/pkg/campsite/types/public.go +++ b/pkg/campsite/types/public.go @@ -85,6 +85,7 @@ type publicPage struct { Prices []*typePrice DogsPrice string TouristTax string + TouristTaxDays int Features []*typeFeature Calendar *season.Calendar Spiel gotemplate.HTML @@ -162,7 +163,7 @@ func newPublicPage(ctx context.Context, company *auth.Company, conn *database.Co ); err != nil { return nil, err } - if err = conn.QueryRow(ctx, "select to_price(tourist_tax, $1) from company where company_id = $2", company.DecimalDigits, company.ID).Scan(&page.TouristTax); err != nil { + if err = conn.QueryRow(ctx, "select to_price(tourist_tax, $1), tourist_tax_max_days from company where company_id = $2", company.DecimalDigits, company.ID).Scan(&page.TouristTax, &page.TouristTaxDays); err != nil { return nil, err } page.BookingDates, err = booking.NewDateFields(ctx, conn, slug) diff --git a/pkg/company/admin.go b/pkg/company/admin.go index 081c137..9b7c1f3 100644 --- a/pkg/company/admin.go +++ b/pkg/company/admin.go @@ -63,6 +63,7 @@ type taxDetailsForm struct { Country *form.Select RTCNumber *form.Input TouristTax *form.Input + TouristTaxMaxDays *form.Input Currency *form.Select DefaultLanguage *form.Select InvoiceNumberFormat *form.Input @@ -111,6 +112,9 @@ func newTaxDetailsForm(ctx context.Context, conn *database.Conn, l *locale.Local TouristTax: &form.Input{ Name: "tourist_tax", }, + TouristTaxMaxDays: &form.Input{ + Name: "tourist_tax_max_days", + }, Currency: &form.Select{ Name: "currency", Options: form.MustGetOptions(ctx, conn, "select currency_code, currency_symbol from currency order by currency_code"), @@ -142,6 +146,7 @@ func (f *taxDetailsForm) FillFromDatabase(ctx context.Context, company *auth.Com , postal_code , rtc_number , to_price(tourist_tax) + , tourist_tax_max_days::text , array[country_code::text] , array[currency_code::text] , array[default_lang_tag] @@ -161,6 +166,7 @@ func (f *taxDetailsForm) FillFromDatabase(ctx context.Context, company *auth.Com &f.PostalCode.Val, &f.RTCNumber.Val, &f.TouristTax.Val, + &f.TouristTaxMaxDays.Val, &f.Country.Selected, &f.Currency.Selected, &f.DefaultLanguage.Selected, @@ -186,6 +192,7 @@ func (f *taxDetailsForm) Parse(r *http.Request) error { f.Country.FillValue(r) f.RTCNumber.FillValue(r) f.TouristTax.FillValue(r) + f.TouristTaxMaxDays.FillValue(r) f.Currency.FillValue(r) f.DefaultLanguage.FillValue(r) f.InvoiceNumberFormat.FillValue(r) @@ -234,6 +241,11 @@ func (f *taxDetailsForm) Valid(ctx context.Context, conn *database.Conn, l *loca v.CheckMinDecimal(f.TouristTax, 0.0, l.GettextNoop("Tourist tax must be zero or greater.")) } } + if v.CheckRequired(f.TouristTaxMaxDays, l.GettextNoop("Tourist tax days can not be empty.")) { + if v.CheckValidInteger(f.TouristTaxMaxDays, l.GettextNoop("Tourist tax days must be an integer number.")) { + v.CheckMinInteger(f.TouristTaxMaxDays, 1, l.GettextNoop("Tourist tax days must be one 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.")) @@ -282,8 +294,9 @@ func editTaxDetails(w http.ResponseWriter, r *http.Request, user *auth.User, com , invoice_number_format = $14 , legal_disclaimer = $15 , rtc_number = $16 - , tourist_tax = parse_price($17, $18) - where company_id = $19 + , tourist_tax = parse_price($17, $19) + , tourist_tax_max_days = $18 + where company_id = $20 `, f.BusinessName, f.VATIN, @@ -302,6 +315,7 @@ func editTaxDetails(w http.ResponseWriter, r *http.Request, user *auth.User, com f.LegalDisclaimer, f.RTCNumber, f.TouristTax, + f.TouristTaxMaxDays, company.DecimalDigits, company.ID) httplib.Redirect(w, r, "/admin/company", http.StatusSeeOther) diff --git a/po/ca.po b/po/ca.po index d552bdd..296c821 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-02-26 19:11+0100\n" +"POT-Creation-Date: 2024-02-27 19:39+0100\n" "PO-Revision-Date: 2024-02-06 10:04+0100\n" "Last-Translator: jordi fita mas \n" "Language-Team: Catalan \n" @@ -295,8 +295,8 @@ msgid "10 % VAT included." msgstr "IVA del 10 % inclòs." #: web/templates/public/campsite/type.gohtml:102 -msgid "Tourist tax: %s/night per person aged 17 or older." -msgstr "Impost turístic: %s/nit per persona major de 16 anys." +msgid "Tourist tax: %s/night per person aged 17 or older. Maximum %d nights." +msgstr "Impost turístic: %s/nit per persona major de 16 anys. Màxim %d nits." #: web/templates/public/campsite/type.gohtml:104 msgid "Dogs: %s/night, tied, accompanied, and minimal barking." @@ -861,7 +861,7 @@ msgstr "Integració" #: web/templates/admin/payment/settings.gohtml:66 #: web/templates/admin/location.gohtml:53 web/templates/admin/profile.gohtml:78 -#: web/templates/admin/taxDetails.gohtml:170 +#: web/templates/admin/taxDetails.gohtml:179 msgctxt "action" msgid "Save changes" msgstr "Desa els canvis" @@ -1856,16 +1856,21 @@ msgid "Tourist Tax" msgstr "Impost turístic" #: web/templates/admin/taxDetails.gohtml:150 +msgctxt "input" +msgid "Tourist Tax Days" +msgstr "Dies de l’impost turístic" + +#: web/templates/admin/taxDetails.gohtml:159 msgctxt "title" msgid "Invoicing" msgstr "Facturació" -#: web/templates/admin/taxDetails.gohtml:153 +#: web/templates/admin/taxDetails.gohtml:162 msgctxt "input" msgid "Invoice Number Format" msgstr "Format del número de factura" -#: web/templates/admin/taxDetails.gohtml:161 +#: web/templates/admin/taxDetails.gohtml:170 msgctxt "input" msgid "Legal Disclaimer" msgstr "Nota legal" @@ -2271,12 +2276,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:217 +#: pkg/app/login.go:56 pkg/app/user.go:246 pkg/company/admin.go:224 #: pkg/booking/public.go:536 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:218 +#: pkg/app/login.go:57 pkg/app/user.go:247 pkg/company/admin.go:225 #: pkg/booking/public.go:537 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." @@ -2298,7 +2303,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:238 +#: pkg/app/user.go:251 pkg/company/admin.go:250 msgid "Selected language is not valid." msgstr "L’idioma escollit no és vàlid." @@ -2473,17 +2478,17 @@ msgstr "El preu per nen ha de ser un número decimal." msgid "Price per child must be zero or greater." msgstr "El preu per nen ha de ser com a mínim zero." -#: pkg/campsite/types/public.go:247 +#: pkg/campsite/types/public.go:248 msgctxt "header" msgid "Adults" msgstr "Adults" -#: pkg/campsite/types/public.go:254 +#: pkg/campsite/types/public.go:255 msgctxt "header" msgid "Teenagers (aged 11 to 16)" msgstr "Adolescents (entre 11 i 16 anys)" -#: pkg/campsite/types/public.go:261 +#: pkg/campsite/types/public.go:262 msgctxt "header" msgid "Children (aged 2 to 10)" msgstr "Mainada (entre 2 i 10 anys)" @@ -2641,79 +2646,91 @@ msgstr "No podeu deixar el text de l’enllaç en blanc." msgid "The ad URL can not be empty" msgstr "No podeu deixar l’adreça de l’enllaç en blanc." -#: pkg/surroundings/admin.go:467 pkg/company/admin.go:221 +#: pkg/surroundings/admin.go:467 pkg/company/admin.go:228 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:200 pkg/booking/public.go:521 +#: pkg/company/admin.go:207 pkg/booking/public.go:521 msgid "Selected country is not valid." msgstr "El país escollit no és vàlid." -#: pkg/company/admin.go:204 +#: pkg/company/admin.go:211 msgid "Business name can not be empty." msgstr "No podeu deixar el nom d’empresa en blanc." -#: pkg/company/admin.go:205 +#: pkg/company/admin.go:212 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:207 +#: pkg/company/admin.go:214 msgid "VAT number can not be empty." msgstr "No podeu deixar el NIF en blanc." -#: pkg/company/admin.go:208 +#: pkg/company/admin.go:215 msgid "This VAT number is not valid." msgstr "Aquest NIF no és vàlid." -#: pkg/company/admin.go:212 pkg/booking/public.go:539 +#: pkg/company/admin.go:219 pkg/booking/public.go:539 msgid "Phone can not be empty." msgstr "No podeu deixar el telèfon en blanc." -#: pkg/company/admin.go:213 pkg/booking/public.go:540 +#: pkg/company/admin.go:220 pkg/booking/public.go:540 msgid "This phone number is not valid." msgstr "Aquest número de telèfon no és vàlid." -#: pkg/company/admin.go:223 pkg/booking/public.go:529 +#: pkg/company/admin.go:230 pkg/booking/public.go:529 msgid "Address can not be empty." msgstr "No podeu deixar l’adreça en blanc." -#: pkg/company/admin.go:224 +#: pkg/company/admin.go:231 msgid "City can not be empty." msgstr "No podeu deixar la població en blanc." -#: pkg/company/admin.go:225 +#: pkg/company/admin.go:232 msgid "Province can not be empty." msgstr "No podeu deixar la província en blanc." -#: pkg/company/admin.go:226 pkg/booking/public.go:531 +#: pkg/company/admin.go:233 pkg/booking/public.go:531 msgid "Postcode can not be empty." msgstr "No podeu deixar el codi postal en blanc." -#: pkg/company/admin.go:227 pkg/booking/public.go:532 +#: pkg/company/admin.go:234 pkg/booking/public.go:532 msgid "This postcode is not valid." msgstr "Aquest codi postal no és vàlid." -#: pkg/company/admin.go:231 +#: pkg/company/admin.go:238 msgid "RTC number can not be empty." msgstr "No podeu deixar el número d’RTC en blanc." -#: pkg/company/admin.go:232 +#: pkg/company/admin.go:239 msgid "Tourist tax can not be empty." msgstr "No podeu deixar l’impost turístic en blanc." -#: pkg/company/admin.go:233 +#: pkg/company/admin.go:240 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 +#: pkg/company/admin.go:241 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 +#: pkg/company/admin.go:244 +msgid "Tourist tax days can not be empty." +msgstr "No podeu deixar els dies de l’impost turístic en blanc." + +#: pkg/company/admin.go:245 +msgid "Tourist tax days must be an integer number." +msgstr "Els dies de l’impost turístic ha de ser un número enter." + +#: pkg/company/admin.go:246 +msgid "Tourist tax days must be one or greater." +msgstr "Els dies de l’impost turístic ha de ser com a mínim u." + +#: pkg/company/admin.go:249 msgid "Selected currency is not valid." msgstr "La moneda escollida no és vàlida." -#: pkg/company/admin.go:239 +#: pkg/company/admin.go:251 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 753f9ca..914eedc 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-02-26 19:11+0100\n" +"POT-Creation-Date: 2024-02-27 19:39+0100\n" "PO-Revision-Date: 2024-02-06 10:04+0100\n" "Last-Translator: jordi fita mas \n" "Language-Team: Spanish \n" @@ -295,8 +295,8 @@ msgid "10 % VAT included." msgstr "IVA del 10 % incluido." #: web/templates/public/campsite/type.gohtml:102 -msgid "Tourist tax: %s/night per person aged 17 or older." -msgstr "Impuesto turístico: %s/noche por persona mayor de 16 años." +msgid "Tourist tax: %s/night per person aged 17 or older. Maximum %d nights." +msgstr "Impuesto turístico: %s/noche por persona mayor de 16 años. Máximo %d noches." #: web/templates/public/campsite/type.gohtml:104 msgid "Dogs: %s/night, tied, accompanied, and minimal barking." @@ -861,7 +861,7 @@ msgstr "Integración" #: web/templates/admin/payment/settings.gohtml:66 #: web/templates/admin/location.gohtml:53 web/templates/admin/profile.gohtml:78 -#: web/templates/admin/taxDetails.gohtml:170 +#: web/templates/admin/taxDetails.gohtml:179 msgctxt "action" msgid "Save changes" msgstr "Guardar los cambios" @@ -1856,16 +1856,21 @@ msgid "Tourist Tax" msgstr "Impuesto turístico" #: web/templates/admin/taxDetails.gohtml:150 +msgctxt "input" +msgid "Tourist Tax Days" +msgstr "Días del impuesto turístico" + +#: web/templates/admin/taxDetails.gohtml:159 msgctxt "title" msgid "Invoicing" msgstr "Facturación" -#: web/templates/admin/taxDetails.gohtml:153 +#: web/templates/admin/taxDetails.gohtml:162 msgctxt "input" msgid "Invoice Number Format" msgstr "Formato de número de factura" -#: web/templates/admin/taxDetails.gohtml:161 +#: web/templates/admin/taxDetails.gohtml:170 msgctxt "input" msgid "Legal Disclaimer" msgstr "Nota legal" @@ -2271,12 +2276,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:217 +#: pkg/app/login.go:56 pkg/app/user.go:246 pkg/company/admin.go:224 #: pkg/booking/public.go:536 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:218 +#: pkg/app/login.go:57 pkg/app/user.go:247 pkg/company/admin.go:225 #: pkg/booking/public.go:537 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." @@ -2298,7 +2303,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:238 +#: pkg/app/user.go:251 pkg/company/admin.go:250 msgid "Selected language is not valid." msgstr "El idioma escogido no es válido." @@ -2473,17 +2478,17 @@ msgstr "El precio por niño tiene que ser un número decimal." msgid "Price per child must be zero or greater." msgstr "El precio por niño tiene que ser como mínimo cero." -#: pkg/campsite/types/public.go:247 +#: pkg/campsite/types/public.go:248 msgctxt "header" msgid "Adults" msgstr "Adultos" -#: pkg/campsite/types/public.go:254 +#: pkg/campsite/types/public.go:255 msgctxt "header" msgid "Teenagers (aged 11 to 16)" msgstr "Adolescentes (de 11 a 16 años)" -#: pkg/campsite/types/public.go:261 +#: pkg/campsite/types/public.go:262 msgctxt "header" msgid "Children (aged 2 to 10)" msgstr "Niños (de 2 a 10 años)" @@ -2641,79 +2646,91 @@ msgstr "No podéis dejar el texto del enlace en blanco." msgid "The ad URL can not be empty" msgstr "No podéis dejar la dirección del enlace en blanco." -#: pkg/surroundings/admin.go:467 pkg/company/admin.go:221 +#: pkg/surroundings/admin.go:467 pkg/company/admin.go:228 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:200 pkg/booking/public.go:521 +#: pkg/company/admin.go:207 pkg/booking/public.go:521 msgid "Selected country is not valid." msgstr "El país escogido no es válido." -#: pkg/company/admin.go:204 +#: pkg/company/admin.go:211 msgid "Business name can not be empty." msgstr "No podéis dejar el nombre de empresa en blanco." -#: pkg/company/admin.go:205 +#: pkg/company/admin.go:212 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:207 +#: pkg/company/admin.go:214 msgid "VAT number can not be empty." msgstr "No podéis dejar el NIF en blanco." -#: pkg/company/admin.go:208 +#: pkg/company/admin.go:215 msgid "This VAT number is not valid." msgstr "Este NIF no es válido." -#: pkg/company/admin.go:212 pkg/booking/public.go:539 +#: pkg/company/admin.go:219 pkg/booking/public.go:539 msgid "Phone can not be empty." msgstr "No podéis dejar el teléfono en blanco." -#: pkg/company/admin.go:213 pkg/booking/public.go:540 +#: pkg/company/admin.go:220 pkg/booking/public.go:540 msgid "This phone number is not valid." msgstr "Este teléfono no es válido." -#: pkg/company/admin.go:223 pkg/booking/public.go:529 +#: pkg/company/admin.go:230 pkg/booking/public.go:529 msgid "Address can not be empty." msgstr "No podéis dejar la dirección en blanco." -#: pkg/company/admin.go:224 +#: pkg/company/admin.go:231 msgid "City can not be empty." msgstr "No podéis dejar la población en blanco." -#: pkg/company/admin.go:225 +#: pkg/company/admin.go:232 msgid "Province can not be empty." msgstr "No podéis dejar la provincia en blanco." -#: pkg/company/admin.go:226 pkg/booking/public.go:531 +#: pkg/company/admin.go:233 pkg/booking/public.go:531 msgid "Postcode can not be empty." msgstr "No podéis dejar el código postal en blanco." -#: pkg/company/admin.go:227 pkg/booking/public.go:532 +#: pkg/company/admin.go:234 pkg/booking/public.go:532 msgid "This postcode is not valid." msgstr "Este código postal no es válido." -#: pkg/company/admin.go:231 +#: pkg/company/admin.go:238 msgid "RTC number can not be empty." msgstr "No podéis dejar el número RTC en blanco." -#: pkg/company/admin.go:232 +#: pkg/company/admin.go:239 msgid "Tourist tax can not be empty." msgstr "No podéis dejar el impuesto turístico en blanco." -#: pkg/company/admin.go:233 +#: pkg/company/admin.go:240 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 +#: pkg/company/admin.go:241 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 +#: pkg/company/admin.go:244 +msgid "Tourist tax days can not be empty." +msgstr "No podéis dejar el números de días del impuesto turístico en blanco." + +#: pkg/company/admin.go:245 +msgid "Tourist tax days must be an integer number." +msgstr "El números de días de impuesto turístico tiene que ser un número entero." + +#: pkg/company/admin.go:246 +msgid "Tourist tax days must be one or greater." +msgstr "El número de días del impuesto turístico tiene que ser como mínimo uno." + +#: pkg/company/admin.go:249 msgid "Selected currency is not valid." msgstr "La moneda escogida no es válida." -#: pkg/company/admin.go:239 +#: pkg/company/admin.go:251 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/po/fr.po b/po/fr.po index 10f0c25..ab21006 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-02-26 19:11+0100\n" +"POT-Creation-Date: 2024-02-27 19:39+0100\n" "PO-Revision-Date: 2024-02-06 10:05+0100\n" "Last-Translator: Oriol Carbonell \n" "Language-Team: French \n" @@ -295,8 +295,8 @@ msgid "10 % VAT included." msgstr "10 % TVA incluse." #: web/templates/public/campsite/type.gohtml:102 -msgid "Tourist tax: %s/night per person aged 17 or older." -msgstr "Taxe touristique: %s/nuit par personne de plus de 16 ans." +msgid "Tourist tax: %s/night per person aged 17 or older. Maximum %d nights." +msgstr "Taxe touristique: %s/nuit par personne de plus de 16 ans. Maximum %d nuits." #: web/templates/public/campsite/type.gohtml:104 msgid "Dogs: %s/night, tied, accompanied, and minimal barking." @@ -861,7 +861,7 @@ msgstr "Intégration" #: web/templates/admin/payment/settings.gohtml:66 #: web/templates/admin/location.gohtml:53 web/templates/admin/profile.gohtml:78 -#: web/templates/admin/taxDetails.gohtml:170 +#: web/templates/admin/taxDetails.gohtml:179 msgctxt "action" msgid "Save changes" msgstr "Enregistrer les changements" @@ -1856,16 +1856,21 @@ msgid "Tourist Tax" msgstr "Taxe touristique" #: web/templates/admin/taxDetails.gohtml:150 +msgctxt "input" +msgid "Tourist Tax Days" +msgstr "Journées de la taxe touristique" + +#: web/templates/admin/taxDetails.gohtml:159 msgctxt "title" msgid "Invoicing" msgstr "Facturation" -#: web/templates/admin/taxDetails.gohtml:153 +#: web/templates/admin/taxDetails.gohtml:162 msgctxt "input" msgid "Invoice Number Format" msgstr "Format de numéro de facture" -#: web/templates/admin/taxDetails.gohtml:161 +#: web/templates/admin/taxDetails.gohtml:170 msgctxt "input" msgid "Legal Disclaimer" msgstr "Avertissement juridique" @@ -2271,12 +2276,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:217 +#: pkg/app/login.go:56 pkg/app/user.go:246 pkg/company/admin.go:224 #: pkg/booking/public.go:536 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:218 +#: pkg/app/login.go:57 pkg/app/user.go:247 pkg/company/admin.go:225 #: pkg/booking/public.go:537 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." @@ -2298,7 +2303,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:238 +#: pkg/app/user.go:251 pkg/company/admin.go:250 msgid "Selected language is not valid." msgstr "La langue sélectionnée n’est pas valide." @@ -2473,17 +2478,17 @@ msgstr "Le prix par enfant doit être un nombre décimal." msgid "Price per child must be zero or greater." msgstr "Le prix par enfant doit être égal ou supérieur." -#: pkg/campsite/types/public.go:247 +#: pkg/campsite/types/public.go:248 msgctxt "header" msgid "Adults" msgstr "Adultes" -#: pkg/campsite/types/public.go:254 +#: pkg/campsite/types/public.go:255 msgctxt "header" msgid "Teenagers (aged 11 to 16)" msgstr "Adolescents (de 11 à 16 anys)" -#: pkg/campsite/types/public.go:261 +#: pkg/campsite/types/public.go:262 msgctxt "header" msgid "Children (aged 2 to 10)" msgstr "Enfants (de 2 à 10 anys)" @@ -2641,79 +2646,91 @@ msgstr "Le texte du lien ne peut pas être vide." msgid "The ad URL can not be empty" msgstr "L’addresse du lien ne peut pas être vide." -#: pkg/surroundings/admin.go:467 pkg/company/admin.go:221 +#: pkg/surroundings/admin.go:467 pkg/company/admin.go:228 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:200 pkg/booking/public.go:521 +#: pkg/company/admin.go:207 pkg/booking/public.go:521 msgid "Selected country is not valid." msgstr "Le pays sélectionné n’est pas valide." -#: pkg/company/admin.go:204 +#: pkg/company/admin.go:211 msgid "Business name can not be empty." msgstr "Le nom de l’entreprise ne peut pas être vide." -#: pkg/company/admin.go:205 +#: pkg/company/admin.go:212 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:207 +#: pkg/company/admin.go:214 msgid "VAT number can not be empty." msgstr "Le numéro de TVA ne peut pas être vide." -#: pkg/company/admin.go:208 +#: pkg/company/admin.go:215 msgid "This VAT number is not valid." msgstr "Ce numéro de TVA n’est pas valide." -#: pkg/company/admin.go:212 pkg/booking/public.go:539 +#: pkg/company/admin.go:219 pkg/booking/public.go:539 msgid "Phone can not be empty." msgstr "Le téléphone ne peut pas être vide." -#: pkg/company/admin.go:213 pkg/booking/public.go:540 +#: pkg/company/admin.go:220 pkg/booking/public.go:540 msgid "This phone number is not valid." msgstr "Ce numéro de téléphone n’est pas valide." -#: pkg/company/admin.go:223 pkg/booking/public.go:529 +#: pkg/company/admin.go:230 pkg/booking/public.go:529 msgid "Address can not be empty." msgstr "L’adresse ne peut pas être vide." -#: pkg/company/admin.go:224 +#: pkg/company/admin.go:231 msgid "City can not be empty." msgstr "La ville ne peut pas être vide." -#: pkg/company/admin.go:225 +#: pkg/company/admin.go:232 msgid "Province can not be empty." msgstr "La province ne peut pas être vide." -#: pkg/company/admin.go:226 pkg/booking/public.go:531 +#: pkg/company/admin.go:233 pkg/booking/public.go:531 msgid "Postcode can not be empty." msgstr "Le code postal ne peut pas être vide." -#: pkg/company/admin.go:227 pkg/booking/public.go:532 +#: pkg/company/admin.go:234 pkg/booking/public.go:532 msgid "This postcode is not valid." msgstr "Ce code postal n’est pas valide." -#: pkg/company/admin.go:231 +#: pkg/company/admin.go:238 msgid "RTC number can not be empty." msgstr "Le numéro RTC ne peut pas être vide." -#: pkg/company/admin.go:232 +#: pkg/company/admin.go:239 msgid "Tourist tax can not be empty." msgstr "La taxe touristique ne peut pas être vide." -#: pkg/company/admin.go:233 +#: pkg/company/admin.go:240 msgid "Tourist tax must be a decimal number." msgstr "La taxe touristique doit être un nombre décimal." -#: pkg/company/admin.go:234 +#: pkg/company/admin.go:241 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 +#: pkg/company/admin.go:244 +msgid "Tourist tax days can not be empty." +msgstr "Les journées de la taxe touristique ne peut pas être vide." + +#: pkg/company/admin.go:245 +msgid "Tourist tax days must be an integer number." +msgstr "Les journées de la taxe touristique doit être un nombre entier." + +#: pkg/company/admin.go:246 +msgid "Tourist tax days must be one or greater." +msgstr "Les journées de la taxe touristique doit être supérieur à zéro." + +#: pkg/company/admin.go:249 msgid "Selected currency is not valid." msgstr "La devise sélectionnée n’est pas valide." -#: pkg/company/admin.go:239 +#: pkg/company/admin.go:251 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_max_days.sql b/revert/company__tourist_tax_max_days.sql new file mode 100644 index 0000000..81a7e30 --- /dev/null +++ b/revert/company__tourist_tax_max_days.sql @@ -0,0 +1,9 @@ +-- Revert camper:company__tourist_tax_max_days from pg + +begin; + +alter table camper.company +drop column if exists tourist_tax_max_days +; + +commit; diff --git a/revert/draft_payment.sql b/revert/draft_payment.sql index 8a39434..d71c222 100644 --- a/revert/draft_payment.sql +++ b/revert/draft_payment.sql @@ -1,9 +1,168 @@ --- Revert camper:draft_payment from pg +-- Deploy camper:draft_payment to pg +-- requires: roles +-- requires: schema_camper +-- requires: season_calendar +-- requires: season +-- requires: campsite_type +-- requires: campsite_type_pet_cost +-- requires: campsite_type_cost +-- requires: campsite_type_option_cost +-- requires: campsite_type_option +-- requires: payment +-- requires: payment_option begin; -drop function if exists camper.draft_payment(uuid, date, date, uuid, integer, integer, integer, integer, text, camper.option_units[]); +set search_path to camper, public; -drop type if exists camper.option_units; +create or replace function draft_payment(payment_slug uuid, arrival_date date, departure_date date, campsite_type_slug uuid, num_adults integer, num_teenagers integer, num_children integer, num_dogs integer, zone_preferences text, options option_units[]) returns payment as +$$ +declare + p payment; +begin + if exists(select 1 from payment where slug = payment_slug and payment_status <> 'draft') then + payment_slug = null; + end if; + insert into payment ( + slug + , company_id + , campsite_type_id + , arrival_date + , departure_date + , subtotal_nights + , number_adults + , subtotal_adults + , number_teenagers + , subtotal_teenagers + , number_children + , subtotal_children + , number_dogs + , subtotal_dogs + , subtotal_tourist_tax + , total + , currency_code + , down_payment_percent + , zone_preferences + ) + select coalesce(payment_slug, gen_random_uuid()) + , company_id + , campsite_type_id + , arrival_date + , departure_date + , sum(cost.cost_per_night * ceiling((num_adults::numeric + num_teenagers::numeric + num_children::numeric) / max_campers::numeric)::integer)::integer + , num_adults + , sum(cost_per_adult * num_adults)::integer + , num_teenagers + , sum(cost_per_teenager * num_teenagers)::integer + , num_children + , sum(cost_per_child * num_children)::integer + , num_dogs + , sum(case when num_dogs > 0 then coalesce(pet.cost_per_night, 0) else 0 end)::integer + , sum(tourist_tax * num_adults)::integer + , 0 + , currency_code + , case when arrival_date - current_date >= 7 then 0.3 else 1.0 end + , coalesce(zone_preferences, '') + from generate_series(arrival_date, departure_date - 1, interval '1 day') as date(day) + left join season_calendar on season_range @> date.day::date + left join season using (season_id) + left join campsite_type using (company_id) + left join campsite_type_pet_cost as pet using (campsite_type_id) + left join campsite_type_cost as cost using (campsite_type_id, season_id) + left join company using (company_id) + where campsite_type.slug = campsite_type_slug + group by company_id + , campsite_type_id + , currency_code + on conflict (slug) do update + set company_id = excluded.company_id + , campsite_type_id = excluded.campsite_type_id + , arrival_date = excluded.arrival_date + , departure_date = excluded.departure_date + , subtotal_nights = excluded.subtotal_nights + , number_adults = excluded.number_adults + , subtotal_adults = excluded.subtotal_adults + , number_teenagers = excluded.number_teenagers + , subtotal_teenagers = excluded.subtotal_teenagers + , number_children = excluded.number_children + , subtotal_children = excluded.subtotal_children + , number_dogs = excluded.number_dogs + , subtotal_dogs = excluded.subtotal_dogs + , subtotal_tourist_tax = excluded.subtotal_tourist_tax + , total = excluded.total + , currency_code = excluded.currency_code + , down_payment_percent = excluded.down_payment_percent + , zone_preferences = excluded.zone_preferences + , updated_at = current_timestamp + returning * + into p + ; + + if array_length(coalesce(options, array[]::option_units[]), 1) > 0 then + delete + from payment_option + where payment_id = p.payment_id + and campsite_type_option_id not in ( + select campsite_type_option_id + from unnest(options) as option(campsite_type_option_id, units) + ); + + insert into payment_option ( + payment_id + , campsite_type_option_id + , units + , subtotal + ) + select p.payment_id + , campsite_type_option_id + , units + , case when per_night then sum(cost * units)::integer else max(cost * units)::integer end + from generate_series(arrival_date, departure_date - 1, interval '1 day') as date(day) + join season_calendar on season_range @> date.day::date + join campsite_type_option_cost using (season_id) + join campsite_type_option using (campsite_type_option_id) + join unnest(options) as option(campsite_type_option_id, units) using (campsite_type_option_id) + group by campsite_type_option_id + , units + , per_night + on conflict (payment_id, campsite_type_option_id) do update + set units = excluded.units + , subtotal = excluded.subtotal + ; + + with option as ( + select sum(subtotal)::integer as subtotal + from payment_option + where payment_id = p.payment_id + ) + update payment + set total = subtotal_nights + subtotal_adults + subtotal_teenagers + subtotal_children + subtotal_dogs + subtotal_tourist_tax + coalesce(option.subtotal, 0) + from option + where payment_id = p.payment_id + returning total into p.total + ; + else + delete + from payment_option + where payment_id = p.payment_id; + + update payment + set total = subtotal_nights + subtotal_adults + subtotal_teenagers + subtotal_children + subtotal_dogs + subtotal_tourist_tax + where payment_id = p.payment_id + returning total into p.total + ; + end if; + + + return p; +end; +$$ + language plpgsql +; + +revoke execute on function draft_payment(uuid, date, date, uuid, integer, integer, integer, integer, text, option_units[]) from public; +grant execute on function draft_payment(uuid, date, date, uuid, integer, integer, integer, integer, text, option_units[]) to guest; +grant execute on function draft_payment(uuid, date, date, uuid, integer, integer, integer, integer, text, option_units[]) to employee; +grant execute on function draft_payment(uuid, date, date, uuid, integer, integer, integer, integer, text, option_units[]) to admin; commit; diff --git a/revert/draft_payment@v4.sql b/revert/draft_payment@v4.sql new file mode 100644 index 0000000..8a39434 --- /dev/null +++ b/revert/draft_payment@v4.sql @@ -0,0 +1,9 @@ +-- Revert camper:draft_payment from pg + +begin; + +drop function if exists camper.draft_payment(uuid, date, date, uuid, integer, integer, integer, integer, text, camper.option_units[]); + +drop type if exists camper.option_units; + +commit; diff --git a/sqitch.plan b/sqitch.plan index 7198f13..cd09dd8 100644 --- a/sqitch.plan +++ b/sqitch.plan @@ -259,3 +259,5 @@ process_payment_response [roles schema_camper redsys_response payment payment_re down_payment [roles schema_camper payment] 2024-02-13T21:53:44Z jordi fita mas # Add function to compute payment down payment from its percentage payment_reference [roles schema_camper payment] 2024-02-14T01:45:37Z jordi fita mas # Add function to generate a payment reference @v4 2024-02-27T17:30:17Z jordi fita mas # Tag v4 +company__tourist_tax_max_days [company] 2024-02-27T18:03:51Z jordi fita mas # Add tourist_tax_max_days to company +draft_payment [draft_payment@v4 company__tourist_tax_max_days] 2024-02-27T17:49:05Z jordi fita mas # Limit the number of nights that have tourist tax in draft_payment diff --git a/test/add_amenity.sql b/test/add_amenity.sql index 0ce21d5..9fad4e3 100644 --- a/test/add_amenity.sql +++ b/test/add_amenity.sql @@ -26,9 +26,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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (2, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'ca') ; select lives_ok( diff --git a/test/add_amenity_carousel_slide.sql b/test/add_amenity_carousel_slide.sql index e43f489..d12c053 100644 --- a/test/add_amenity_carousel_slide.sql +++ b/test/add_amenity_carousel_slide.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, 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 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, '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, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/add_amenity_feature.sql b/test/add_amenity_feature.sql index f40554e..a0352ba 100644 --- a/test/add_amenity_feature.sql +++ b/test/add_amenity_feature.sql @@ -27,9 +27,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, 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 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, '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, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/add_campsite.sql b/test/add_campsite.sql index 191ab8b..db1e998 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (2, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/add_campsite_carousel_slide.sql b/test/add_campsite_carousel_slide.sql index a775de4..fd3affd 100644 --- a/test/add_campsite_carousel_slide.sql +++ b/test/add_campsite_carousel_slide.sql @@ -30,9 +30,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, 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 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, '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, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/add_campsite_feature.sql b/test/add_campsite_feature.sql index 103f57c..2134e0b 100644 --- a/test/add_campsite_feature.sql +++ b/test/add_campsite_feature.sql @@ -30,9 +30,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, 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 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, '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, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/add_campsite_type.sql b/test/add_campsite_type.sql index b392ae2..1a82078 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (2, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, '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 afbc77d..d8b779c 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, '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 b367ca1..a0428f1 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, '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 50e7428..f092bbb 100644 --- a/test/add_campsite_type_option.sql +++ b/test/add_campsite_type_option.sql @@ -29,9 +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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/add_cover_carousel_slide.sql b/test/add_cover_carousel_slide.sql index 1e0f204..ed36c7f 100644 --- a/test/add_cover_carousel_slide.sql +++ b/test/add_cover_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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, '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 d8cdac3..58b0938 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/add_media.sql b/test/add_media.sql index 8a6a43c..9d78426 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (2, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'ca') ; select lives_ok( diff --git a/test/add_season.sql b/test/add_season.sql index 7b25982..831911d 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (2, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'ca') ; select lives_ok( diff --git a/test/add_service.sql b/test/add_service.sql index 4484b3e..e684a88 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (2, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'ca') ; select lives_ok( diff --git a/test/add_services_carousel_slide.sql b/test/add_services_carousel_slide.sql index 8536e68..588b614 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/add_surroundings_highlight.sql b/test/add_surroundings_highlight.sql index 76995af..1f8662d 100644 --- a/test/add_surroundings_highlight.sql +++ b/test/add_surroundings_highlight.sql @@ -27,9 +27,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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (2, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/amenity.sql b/test/amenity.sql index 81af06b..3708432 100644 --- a/test/amenity.sql +++ b/test/amenity.sql @@ -71,9 +71,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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'ca') ; insert into company_user (company_id, user_id, role) diff --git a/test/amenity_carousel.sql b/test/amenity_carousel.sql index 1c2d1d5..1e4fa02 100644 --- a/test/amenity_carousel.sql +++ b/test/amenity_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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'ca') ; insert into company_user (company_id, user_id, role) diff --git a/test/amenity_feature.sql b/test/amenity_feature.sql index d99df37..713a39b 100644 --- a/test/amenity_feature.sql +++ b/test/amenity_feature.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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'ca') ; insert into company_user (company_id, user_id, role) diff --git a/test/booking.sql b/test/booking.sql index 19622f5..bbe8b19 100644 --- a/test/booking.sql +++ b/test/booking.sql @@ -100,9 +100,9 @@ values (1, 'employee2@tandem.blog', 'Demo', 'test', '44facbb30d8a419dfd4bfbc44a4 , (5, 'employee4@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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'ca') ; insert into company_user (company_id, user_id, role) diff --git a/test/build_cookie.sql b/test/build_cookie.sql index c75a005..e82395c 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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into company_user (company_id, user_id, role) diff --git a/test/campsite.sql b/test/campsite.sql index 21a3f80..50b6252 100644 --- a/test/campsite.sql +++ b/test/campsite.sql @@ -78,9 +78,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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'ca') ; insert into company_user (company_id, user_id, role) diff --git a/test/campsite_carousel.sql b/test/campsite_carousel.sql index 8f6612d..0706581 100644 --- a/test/campsite_carousel.sql +++ b/test/campsite_carousel.sql @@ -61,9 +61,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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'ca') ; insert into company_user (company_id, user_id, role) diff --git a/test/campsite_feature.sql b/test/campsite_feature.sql index 747bfdc..709b15e 100644 --- a/test/campsite_feature.sql +++ b/test/campsite_feature.sql @@ -65,9 +65,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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, '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 96a1c65..83ad93c 100644 --- a/test/campsite_type.sql +++ b/test/campsite_type.sql @@ -140,9 +140,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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, '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 b6d4fdb..eb34599 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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, '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 7d58411..8cf0fbb 100644 --- a/test/campsite_type_cost.sql +++ b/test/campsite_type_cost.sql @@ -69,9 +69,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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, '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 70557ae..e3c7c36 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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, '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 49b38df..3f3db3d 100644 --- a/test/campsite_type_option.sql +++ b/test/campsite_type_option.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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, '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 2fe3c09..91bcf91 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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'ca') ; insert into company_user (company_id, user_id, role) diff --git a/test/campsite_type_pet_cost.sql b/test/campsite_type_pet_cost.sql index 5f0ff99..c2874c6 100644 --- a/test/campsite_type_pet_cost.sql +++ b/test/campsite_type_pet_cost.sql @@ -46,9 +46,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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, '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 172f4e5..3ef0872 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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, '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 05ffc7d..3e6028a 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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'es') ; insert into company_user (company_id, user_id, role) diff --git a/test/company.sql b/test/company.sql index c7c789d..1f0cb5e 100644 --- a/test/company.sql +++ b/test/company.sql @@ -5,7 +5,7 @@ reset client_min_messages; begin; -select plan(104); +select plan(108); set search_path to camper, public; @@ -96,6 +96,11 @@ 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', 'tourist_tax_max_days'); +select col_type_is('company', 'tourist_tax_max_days', 'positive_integer'); +select col_not_null('company', 'tourist_tax_max_days'); +select col_hasnt_default('company', 'tourist_tax_max_days'); + select has_column('company', 'currency_code'); select col_is_fk('company', 'currency_code'); select fk_ok('company', 'currency_code', 'currency', 'currency_code'); @@ -141,9 +146,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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'es') ; insert into company_user (company_id, user_id, role) @@ -202,8 +207,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, tourist_tax, country_code, currency_code, default_lang_tag) - values (7, ' ', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, '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, tourist_tax_max_days, country_code, currency_code, default_lang_tag) + values (7, ' ', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, '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_login_attempt.sql b/test/company_login_attempt.sql index d0042ad..2be636f 100644 --- a/test/company_login_attempt.sql +++ b/test/company_login_attempt.sql @@ -45,9 +45,9 @@ values (1, 'demo@tandem.blog', 'Demo', 'test', '44facbb30d8a419dfd4bfbc44a4b5539 , (7, 'another@tandem.blog', 'Another Employee', 'test', default, default, default) ; -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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'es') ; insert into company_user (company_id, user_id, role) diff --git a/test/company_user_profile.sql b/test/company_user_profile.sql index 9741f5a..db498bf 100644 --- a/test/company_user_profile.sql +++ b/test/company_user_profile.sql @@ -64,9 +64,9 @@ values (1, 'demo@tandem.blog', 'Demo', 'test', '44facbb30d8a419dfd4bfbc44a4b5539 , (7, 'another@tandem.blog', 'Another Employee', 'test', default, default, default) ; -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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'es') ; insert into company_user (company_id, user_id, role) diff --git a/test/cover_carousel.sql b/test/cover_carousel.sql index 748dd99..878e869 100644 --- a/test/cover_carousel.sql +++ b/test/cover_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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'ca') ; insert into company_user (company_id, user_id, role) diff --git a/test/current_company_id.sql b/test/current_company_id.sql index d4a4621..97d3850 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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, '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 1384bb9..c16b83a 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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, '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 0ab6142..907f306 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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'es') ; insert into company_user (company_id, user_id, role) diff --git a/test/down_payment.sql b/test/down_payment.sql index 34a42ab..9a52aa7 100644 --- a/test/down_payment.sql +++ b/test/down_payment.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, tourist_tax, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 350, '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, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 350, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/draft_payment.sql b/test/draft_payment.sql index 96fb66a..985d4ea 100644 --- a/test/draft_payment.sql +++ b/test/draft_payment.sql @@ -5,7 +5,7 @@ reset client_min_messages; begin; -select plan(15); +select plan(16); set search_path to camper, public; @@ -35,8 +35,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, tourist_tax, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 350, '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, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 350, 7, 'ES', 'EUR', 'ca') ; insert into season (season_id, company_id, name) @@ -115,6 +115,10 @@ select lives_ok( $$ select draft_payment(null, current_date + 6, current_date + 11, 'b065f4e3-2cc8-491d-a413-d015d7d00183', 1, 2, 3, 0, null, null) $$, 'A payment for a reservation in less than a week has a 100 % of downpayment' ); +select lives_ok( + $$ select draft_payment(null, current_date + 10, current_date + 58, 'b065f4e3-2cc8-491d-a413-d015d7d00183', 2, 3, 4, 0, null, null) $$, + 'All reservations incur a tourist tax for the first tourist_tax_max_days days' +); select lives_ok( $$ select draft_payment('7cccfe16-695e-486d-a6a5-1162fb85cafb', current_date + 58, current_date + 65, 'c1b6f4fc-32c1-4cd5-b796-0c5059152a52', 2, 4, 6, 3, 'pref I before E', array[(16, 2), (20, 3)]::option_units[]) $$, @@ -131,6 +135,7 @@ select bag_eq( $$ select company_id, campsite_type_id, arrival_date, departure_date, subtotal_nights, number_adults, subtotal_adults, number_teenagers, subtotal_teenagers, number_children, subtotal_children, number_dogs, subtotal_dogs, subtotal_tourist_tax, total, currency_code, down_payment_percent, zone_preferences, payment_status, created_at, updated_at from payment $$, $$ values (2, 12, current_date + 58, current_date + 65, 3200, 2, 10420, 4, 20840, 6, 25080, 3, 2450, 4900, 79160, 'EUR', 0.3, 'pref I before E', 'draft', '2024-01-01 01:01:01', current_timestamp) , (2, 14, current_date + 59, current_date + 64, 71000, 1, 0, 2, 0, 3, 0, 0, 0, 1750, 72750, 'EUR', 0.3, '', 'draft', current_timestamp, current_timestamp) + , (2, 14, current_date + 10, current_date + 58, 1632000, 2, 0, 3, 0, 4, 0, 0, 0, 4900, 1636900, 'EUR', 0.3, '', 'draft', current_timestamp, current_timestamp) , (2, 14, current_date + 6, current_date + 11, 85000, 1, 0, 2, 0, 3, 0, 0, 0, 1750, 86750, 'EUR', 1.0, '', 'draft', current_timestamp, current_timestamp) , (2, 12, current_date + 61, current_date + 62, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'USD', 1.0, '', 'pending', '2024-01-01 02:02:02', '2024-01-01 02:02:02') , (2, 14, current_date + 31, current_date + 36, 85000, 2, 0, 1, 0, 1, 0, 1, 0, 3500, 96000, 'EUR', 0.3, 'under a tree', 'draft', current_timestamp, current_timestamp) diff --git a/test/edit_amenity.sql b/test/edit_amenity.sql index 3bef67f..55f7a5a 100644 --- a/test/edit_amenity.sql +++ b/test/edit_amenity.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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into amenity (amenity_id, company_id, label, name, info1, info2, active) diff --git a/test/edit_amenity_feature.sql b/test/edit_amenity_feature.sql index 441ad18..44e8f21 100644 --- a/test/edit_amenity_feature.sql +++ b/test/edit_amenity_feature.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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into amenity (amenity_id, company_id, label, name) diff --git a/test/edit_campsite.sql b/test/edit_campsite.sql index a81f780..f4d58cb 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/edit_campsite_feature.sql b/test/edit_campsite_feature.sql index c39bba6..adc89d4 100644 --- a/test/edit_campsite_feature.sql +++ b/test/edit_campsite_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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, '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 ecdd7a8..9de405c 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, '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 77d9a75..44fd96e 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, '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 0bbaa9b..e324148 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/edit_media.sql b/test/edit_media.sql index e76b12f..8557c00 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/edit_season.sql b/test/edit_season.sql index daa77da..fa8e664 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, '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 8688ab5..fc1c6aa 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into service (service_id, company_id, icon_name, name, description) diff --git a/test/edit_surroundings_highlight.sql b/test/edit_surroundings_highlight.sql index e9d7292..7a57bc4 100644 --- a/test/edit_surroundings_highlight.sql +++ b/test/edit_surroundings_highlight.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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/ensure_role_exists.sql b/test/ensure_role_exists.sql index a6dccef..aa98539 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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; select lives_ok( diff --git a/test/home.sql b/test/home.sql index 52a8b17..59ab1cd 100644 --- a/test/home.sql +++ b/test/home.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, 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 5', 'XX345', '', '777-777-777', 'c@c', '', '', '', '', '', '', 60, '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, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'ca') + , (6, 'Company 5', 'XX345', '', '777-777-777', 'c@c', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'ca') ; insert into company_user (company_id, user_id, role) diff --git a/test/home_carousel.sql b/test/home_carousel.sql index a29f76e..2e55f26 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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, '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 162f490..fa705f7 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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'ca') ; insert into company_user (company_id, user_id, role) diff --git a/test/location.sql b/test/location.sql index 048b379..2c79839 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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'ca') + , (8, 'Company 8', 'XX345', '', '777-777-777', 'c@c', '', '', '', '', '', '', 60, 7, 'DE', 'USD', 'en') ; insert into company_user (company_id, user_id, role) diff --git a/test/media.sql b/test/media.sql index a13918d..8578c24 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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, '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 68068bf..32c3b47 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/order_amenity_carousel.sql b/test/order_amenity_carousel.sql index 221d3cf..2ac9d89 100644 --- a/test/order_amenity_carousel.sql +++ b/test/order_amenity_carousel.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, 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 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, '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, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/order_amenity_features.sql b/test/order_amenity_features.sql index e43a6ed..2bc46ee 100644 --- a/test/order_amenity_features.sql +++ b/test/order_amenity_features.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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into amenity (amenity_id, company_id, label, name) diff --git a/test/order_campsite_carousel.sql b/test/order_campsite_carousel.sql index c191441..fa38c2b 100644 --- a/test/order_campsite_carousel.sql +++ b/test/order_campsite_carousel.sql @@ -30,9 +30,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, 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 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, '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, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/order_campsite_features.sql b/test/order_campsite_features.sql index 16c7da5..07c4064 100644 --- a/test/order_campsite_features.sql +++ b/test/order_campsite_features.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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, '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 70d5e52..cdeb268 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, '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 f03dbc0..ecff467 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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, '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 043ad65..b8742b1 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, '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 bf1dc22..8d93c36 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/order_cover_carousel.sql b/test/order_cover_carousel.sql index d8121d0..b16be8a 100644 --- a/test/order_cover_carousel.sql +++ b/test/order_cover_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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, '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 7d8498d..2d3a156 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/order_seasons.sql b/test/order_seasons.sql index c69ceb1..6bf776f 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, '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 ae687e5..bbc9556 100644 --- a/test/order_services.sql +++ b/test/order_services.sql @@ -24,8 +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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, '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 5ad3de0..b2a2d7c 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/order_surroundings_highlights.sql b/test/order_surroundings_highlights.sql index 3932469..2b23a57 100644 --- a/test/order_surroundings_highlights.sql +++ b/test/order_surroundings_highlights.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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/payment.sql b/test/payment.sql index 3cc25d3..8bbffd1 100644 --- a/test/payment.sql +++ b/test/payment.sql @@ -156,8 +156,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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/payment_reference.sql b/test/payment_reference.sql index 9e8d880..279d0a5 100644 --- a/test/payment_reference.sql +++ b/test/payment_reference.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, tourist_tax, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 350, '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, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 350, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/process_payment_response.sql b/test/process_payment_response.sql index 8fc74f3..dcb1c4d 100644 --- a/test/process_payment_response.sql +++ b/test/process_payment_response.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, tourist_tax, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 350, '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, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 350, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/ready_payment.sql b/test/ready_payment.sql index 1e8ccae..ae488de 100644 --- a/test/ready_payment.sql +++ b/test/ready_payment.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, tourist_tax, country_code, currency_code, default_lang_tag) -values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 350, '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, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 350, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/redsys.sql b/test/redsys.sql index df77295..3293b07 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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values ( 2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , ( 4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'ca') + , ( 6, 'Company 6', 'XX345', '', '777-777-777', 'c@c', '', '', '', '', '', '', 60, 7, 'GB', 'EUR', 'en') + , ( 8, 'Company 8', 'XX456', '', '888-888-888', 'd@d', '', '', '', '', '', '', 60, 7, 'DE', 'USD', 'es') ; insert into company_user (company_id, user_id, role) diff --git a/test/redsys_decode_response.sql b/test/redsys_decode_response.sql index e40a96f..845f502 100644 --- a/test/redsys_decode_response.sql +++ b/test/redsys_decode_response.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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'ca') ; insert into redsys (company_id, merchant_code, terminal_number, environment, integration, encrypt_key) diff --git a/test/redsys_encrypt.sql b/test/redsys_encrypt.sql index f224bf5..8b375f3 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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, '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 0996110..e56273a 100644 --- a/test/redsys_sign_request.sql +++ b/test/redsys_sign_request.sql @@ -24,9 +24,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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'ca') ; insert into redsys (company_id, merchant_code, terminal_number, environment, integration, encrypt_key) diff --git a/test/remove_amenity.sql b/test/remove_amenity.sql index cf71d42..3c44e08 100644 --- a/test/remove_amenity.sql +++ b/test/remove_amenity.sql @@ -32,9 +32,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, tourist_tax, country_code, currency_code, default_lang_tag) -values (1, 'Company 1', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') - , (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, '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, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 1', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/remove_amenity_carousel_slide.sql b/test/remove_amenity_carousel_slide.sql index 577afe4..c7a6110 100644 --- a/test/remove_amenity_carousel_slide.sql +++ b/test/remove_amenity_carousel_slide.sql @@ -29,9 +29,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, 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 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, '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, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/remove_amenity_feature.sql b/test/remove_amenity_feature.sql index 06b9ad0..166e32a 100644 --- a/test/remove_amenity_feature.sql +++ b/test/remove_amenity_feature.sql @@ -27,8 +27,8 @@ truncate amenity 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into amenity (amenity_id, company_id, label, name) diff --git a/test/remove_campsite_carousel_slide.sql b/test/remove_campsite_carousel_slide.sql index bb3c236..3e502dc 100644 --- a/test/remove_campsite_carousel_slide.sql +++ b/test/remove_campsite_carousel_slide.sql @@ -30,9 +30,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, 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 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, '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, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/remove_campsite_feature.sql b/test/remove_campsite_feature.sql index af62f48..8c1e9be 100644 --- a/test/remove_campsite_feature.sql +++ b/test/remove_campsite_feature.sql @@ -30,8 +30,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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, '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 aec4133..0bd145b 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/remove_campsite_type_feature.sql b/test/remove_campsite_type_feature.sql index 3a198ee..3224b59 100644 --- a/test/remove_campsite_type_feature.sql +++ b/test/remove_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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/remove_campsite_type_option.sql b/test/remove_campsite_type_option.sql index bf8061b..5349dfe 100644 --- a/test/remove_campsite_type_option.sql +++ b/test/remove_campsite_type_option.sql @@ -30,8 +30,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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/remove_cover_carousel_slide.sql b/test/remove_cover_carousel_slide.sql index 2c92abd..578a9ca 100644 --- a/test/remove_cover_carousel_slide.sql +++ b/test/remove_cover_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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, '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 7fb51b9..f5dc15f 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/remove_service.sql b/test/remove_service.sql index 58ee409..05c8502 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, '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 b682ae6..c92c774 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/remove_surroundings_ad.sql b/test/remove_surroundings_ad.sql index 93d7996..8dddf2f 100644 --- a/test/remove_surroundings_ad.sql +++ b/test/remove_surroundings_ad.sql @@ -35,9 +35,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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'ca') ; insert into company_user (company_id, user_id, role) diff --git a/test/remove_surroundings_highlight.sql b/test/remove_surroundings_highlight.sql index 52fe578..e267102 100644 --- a/test/remove_surroundings_highlight.sql +++ b/test/remove_surroundings_highlight.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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/season.sql b/test/season.sql index 7bf4c52..ba786c1 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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, '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 6d732a7..252af0a 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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'ca') ; insert into company_user (company_id, user_id, role) diff --git a/test/service.sql b/test/service.sql index a164d0e..23dbe3c 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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, '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 3293f64..a654f30 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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, '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 a630d19..ad1ae7a 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, '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 5e4128a..88e64ee 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/set_campsite_type_pet_cost.sql b/test/set_campsite_type_pet_cost.sql index 5ca4096..0c8cd8f 100644 --- a/test/set_campsite_type_pet_cost.sql +++ b/test/set_campsite_type_pet_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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/set_cookie.sql b/test/set_cookie.sql index df484ee..14862ab 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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, '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 e1a8110..6b6b458 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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into season (season_id, company_id, name) diff --git a/test/setup_home.sql b/test/setup_home.sql index 53e4394..e80eb63 100644 --- a/test/setup_home.sql +++ b/test/setup_home.sql @@ -25,9 +25,9 @@ truncate home 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (2, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'ca') ; prepare home_data as diff --git a/test/setup_location.sql b/test/setup_location.sql index 6edbefd..d1b3f4f 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (2, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'ca') ; prepare location_data as diff --git a/test/setup_redsys.sql b/test/setup_redsys.sql index c8581d6..168cf72 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (2, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'ca') ; prepare redsys_data as diff --git a/test/setup_surroundings_ad.sql b/test/setup_surroundings_ad.sql index 2a6303f..a3592db 100644 --- a/test/setup_surroundings_ad.sql +++ b/test/setup_surroundings_ad.sql @@ -27,9 +27,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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (2, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/surroundings_ad.sql b/test/surroundings_ad.sql index a3c903e..5a42b23 100644 --- a/test/surroundings_ad.sql +++ b/test/surroundings_ad.sql @@ -62,10 +62,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, 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 5', 'XX345', '', '777-777-777', 'c@c', '', '', '', '', '', '', 60, '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, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'ca') + , (6, 'Company 5', 'XX345', '', '777-777-777', 'c@c', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'ca') ; insert into company_user (company_id, user_id, role) diff --git a/test/surroundings_highlight.sql b/test/surroundings_highlight.sql index f122e72..7f46ad4 100644 --- a/test/surroundings_highlight.sql +++ b/test/surroundings_highlight.sql @@ -68,9 +68,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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'ca') ; insert into company_user (company_id, user_id, role) diff --git a/test/translate_amenity.sql b/test/translate_amenity.sql index ec0b3f9..ab05b47 100644 --- a/test/translate_amenity.sql +++ b/test/translate_amenity.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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into amenity (amenity_id, company_id, label, name, info1, info2, active) diff --git a/test/translate_amenity_carousel_slide.sql b/test/translate_amenity_carousel_slide.sql index a7e417f..d69b8ab 100644 --- a/test/translate_amenity_carousel_slide.sql +++ b/test/translate_amenity_carousel_slide.sql @@ -29,9 +29,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, 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 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, '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, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/translate_amenity_feature.sql b/test/translate_amenity_feature.sql index ba50672..332e230 100644 --- a/test/translate_amenity_feature.sql +++ b/test/translate_amenity_feature.sql @@ -27,8 +27,8 @@ truncate amenity 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into amenity (amenity_id, company_id, label, name) diff --git a/test/translate_campsite.sql b/test/translate_campsite.sql index ca2aa2c..c420635 100644 --- a/test/translate_campsite.sql +++ b/test/translate_campsite.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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/translate_campsite_carousel_slide.sql b/test/translate_campsite_carousel_slide.sql index 988db15..09296e1 100644 --- a/test/translate_campsite_carousel_slide.sql +++ b/test/translate_campsite_carousel_slide.sql @@ -30,9 +30,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, 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 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, '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, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/translate_campsite_feature.sql b/test/translate_campsite_feature.sql index 0bf6568..9881fc8 100644 --- a/test/translate_campsite_feature.sql +++ b/test/translate_campsite_feature.sql @@ -30,8 +30,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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/translate_campsite_type.sql b/test/translate_campsite_type.sql index e412d94..d708531 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, '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 786ddfd..b1a62ff 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, '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 a6516ba..7a7f1cb 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, '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 b0086b6..c57340f 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/translate_cover_carousel_slide.sql b/test/translate_cover_carousel_slide.sql index 6a54bfb..4200e42 100644 --- a/test/translate_cover_carousel_slide.sql +++ b/test/translate_cover_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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/translate_home.sql b/test/translate_home.sql index c7e0203..29f0cef 100644 --- a/test/translate_home.sql +++ b/test/translate_home.sql @@ -26,9 +26,9 @@ truncate home 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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'ca') ; insert into home (company_id, slogan) diff --git a/test/translate_home_carousel_slide.sql b/test/translate_home_carousel_slide.sql index eb7d282..a5415da 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, '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 66017eb..7a3e7ad 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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, '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 0e7b7ee..8eb189e 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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, '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 4e25d06..3f4d8e0 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, '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 2474503..44f9ffd 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, '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 032bfa2..663edba 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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/translate_surroundings_ad.sql b/test/translate_surroundings_ad.sql index c90350c..ea8b0df 100644 --- a/test/translate_surroundings_ad.sql +++ b/test/translate_surroundings_ad.sql @@ -36,9 +36,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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'ca') ; insert into company_user (company_id, user_id, role) diff --git a/test/translate_surroundings_highlight.sql b/test/translate_surroundings_highlight.sql index a3f80b7..494ceb3 100644 --- a/test/translate_surroundings_highlight.sql +++ b/test/translate_surroundings_highlight.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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into media_content (media_type, bytes) diff --git a/test/unset_campsite_type_pet_cost.sql b/test/unset_campsite_type_pet_cost.sql index 4769098..17537da 100644 --- a/test/unset_campsite_type_pet_cost.sql +++ b/test/unset_campsite_type_pet_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, 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 company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, '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 42f8c10..7d8c13d 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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') ; insert into season (season_id, company_id, name) diff --git a/test/user_profile.sql b/test/user_profile.sql index d2f4523..0ed514c 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, 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 (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, tourist_tax_max_days, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 7, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 7, 'FR', 'USD', 'es') ; insert into company_user (company_id, user_id, role) diff --git a/verify/company__tourist_tax_max_days.sql b/verify/company__tourist_tax_max_days.sql new file mode 100644 index 0000000..e188c2f --- /dev/null +++ b/verify/company__tourist_tax_max_days.sql @@ -0,0 +1,10 @@ +-- Verify camper:company__tourist_tax_max_days on pg + +begin; + +select tourist_tax_max_days +from camper.company +where false +; + +rollback; diff --git a/verify/draft_payment@v4.sql b/verify/draft_payment@v4.sql new file mode 100644 index 0000000..653df13 --- /dev/null +++ b/verify/draft_payment@v4.sql @@ -0,0 +1,7 @@ +-- Verify camper:draft_payment on pg + +begin; + +select has_function_privilege('camper.draft_payment(uuid, date, date, uuid, integer, integer, integer, integer, text, camper.option_units[])', 'execute'); + +rollback; diff --git a/web/templates/admin/taxDetails.gohtml b/web/templates/admin/taxDetails.gohtml index cd90b26..63704ad 100644 --- a/web/templates/admin/taxDetails.gohtml +++ b/web/templates/admin/taxDetails.gohtml @@ -145,6 +145,15 @@ {{ template "error-message" . }} {{- end }} + {{ with .TouristTaxMaxDays -}} + + {{ template "error-message" . }} + {{- end }}
{{( pgettext "Invoicing" "title" )}} diff --git a/web/templates/public/campsite/type.gohtml b/web/templates/public/campsite/type.gohtml index a8dd526..b1b1653 100644 --- a/web/templates/public/campsite/type.gohtml +++ b/web/templates/public/campsite/type.gohtml @@ -99,7 +99,7 @@ {{- end }}

{{( gettext "10 % VAT included." )}}

-

{{printf (gettext "Tourist tax: %s/night per person aged 17 or older.") (formatPrice $.TouristTax)}}

+

{{printf (gettext "Tourist tax: %s/night per person aged 17 or older. Maximum %d nights.") (formatPrice $.TouristTax) $.TouristTaxDays}}

{{ if $.DogsAllowed -}}

{{printf (gettext "Dogs: %s/night, tied, accompanied, and minimal barking.") (formatPrice $.DogsPrice)}}

{{- else -}}