tandem
/
camper
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add ask_zone_preferences and overflow_allowed to campsite_type 

The “overflow” is for when people want to book plots for more guests
than is permitted, which the system would need to add a new plot to the
“shopping cart”, as it were; not implemented yet.

The ask zone preferences is to whether show the corresponding input on
the booking form, that it was done implicitly when the campsite type had
options, because up until now it was only for plots, but it is no longer
the case, thus i need to know when to show it; now it is explicit.
This commit is contained in:
jordi fita mas 2024-01-29 03:38:11 +01:00
parent a31f5038db
commit 23be6ff26c
31 changed files with 657 additions and 296 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
demo/demo.sql
View File

@ -127,11 +127,11 @@ select translate_services_carousel_slide(63, 'en', 'Safari Tents');
select translate_services_carousel_slide(63, 'es', 'Tiendas Safari'); select translate_services_carousel_slide(63, 'es', 'Tiendas Safari');
alter table campsite_type alter column campsite_type_id restart with 72; alter table campsite_type alter column campsite_type_id restart with 72;
select add_campsite_type(52, 62, 'Parceŀles', '<h3>Acampa enmig de la natura</h3><p>Ubicats al costat muntanya del càmping i amb vista a la natura que ens envolta.</p><p>Parcel·les amples amb serveis a prop d’on ets per fer allò que vols.</p>', '<h4>Proxo/terrassa (13 m²)</h4><ul><li>Moblat</li></ul><h4>Planta baixa (32 m²)</h4><ul><li>Sala menjador</li><li>Cuina equipada</li><li>Una habitació llit doble (150 × 200)</li><li>Bany complet</li></ul><h4>Planta altell (16 m²)</h4><ul><li>Tres llits individuals (90 × 200)</li></ul>', '<h4>El preu inclou</h4><ul><li>Llençols i nòrdic</li><li>Cistella de benvinguda: oli d’oliva, sal, sucre, cafè i te</li><li>WiFi</li><li>Plaça d’aparcament per un cotxe</li><li>Kit nadó (bressol, trona i banyera) <em>sota reserva</em></li></ul><p>* Tovalloles: preu extra</p>', '<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p><p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p><p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>', '', '15 h a 21 h', '12 h', 6, true); select add_campsite_type(52, 62, 'Parceŀles', '<h3>Acampa enmig de la natura</h3><p>Ubicats al costat muntanya del càmping i amb vista a la natura que ens envolta.</p><p>Parcel·les amples amb serveis a prop d’on ets per fer allò que vols.</p>', '<h4>Proxo/terrassa (13 m²)</h4><ul><li>Moblat</li></ul><h4>Planta baixa (32 m²)</h4><ul><li>Sala menjador</li><li>Cuina equipada</li><li>Una habitació llit doble (150 × 200)</li><li>Bany complet</li></ul><h4>Planta altell (16 m²)</h4><ul><li>Tres llits individuals (90 × 200)</li></ul>', '<h4>El preu inclou</h4><ul><li>Llençols i nòrdic</li><li>Cistella de benvinguda: oli d’oliva, sal, sucre, cafè i te</li><li>WiFi</li><li>Plaça d’aparcament per un cotxe</li><li>Kit nadó (bressol, trona i banyera) <em>sota reserva</em></li></ul><p>* Tovalloles: preu extra</p>', '<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p><p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p><p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>', '', '15 h a 21 h', '12 h', 6, true, true, true);
select add_campsite_type(52, 63, 'Safari Tents', '<h3>Glàmping a la teva disposició</h3><p>Un luxe de tendes per viure aventures.</p><p>Dues tendes amb terra de fusta, llits, cuina i tot de comoditats per gaudir de les teves vacances.</p>', '<h4>Proxo/terrassa (13 m²)</h4><ul><li>Moblat</li></ul><h4>Planta baixa (32 m²)</h4><ul><li>Sala menjador</li><li>Cuina equipada</li><li>Una habitació llit doble (150 × 200)</li><li>Bany complet</li></ul><h4>Planta altell (16 m²)</h4><ul><li>Tres llits individuals (90 × 200)</li></ul>', '<h4>El preu inclou</h4><ul><li>Llençols i nòrdic</li><li>Cistella de benvinguda: oli d’oliva, sal, sucre, cafè i te</li><li>WiFi</li><li>Plaça d’aparcament per un cotxe</li><li>Kit nadó (bressol, trona i banyera) <em>sota reserva</em></li></ul><p>* Tovalloles: preu extra</p>', '<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p><p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p><p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>', '', '16 h a 21 h', '10 h', 6, false); select add_campsite_type(52, 63, 'Safari Tents', '<h3>Glàmping a la teva disposició</h3><p>Un luxe de tendes per viure aventures.</p><p>Dues tendes amb terra de fusta, llits, cuina i tot de comoditats per gaudir de les teves vacances.</p>', '<h4>Proxo/terrassa (13 m²)</h4><ul><li>Moblat</li></ul><h4>Planta baixa (32 m²)</h4><ul><li>Sala menjador</li><li>Cuina equipada</li><li>Una habitació llit doble (150 × 200)</li><li>Bany complet</li></ul><h4>Planta altell (16 m²)</h4><ul><li>Tres llits individuals (90 × 200)</li></ul>', '<h4>El preu inclou</h4><ul><li>Llençols i nòrdic</li><li>Cistella de benvinguda: oli d’oliva, sal, sucre, cafè i te</li><li>WiFi</li><li>Plaça d’aparcament per un cotxe</li><li>Kit nadó (bressol, trona i banyera) <em>sota reserva</em></li></ul><p>* Tovalloles: preu extra</p>', '<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p><p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p><p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>', '', '16 h a 21 h', '10 h', 6, false, false, false);
select add_campsite_type(52, 64, 'Bungalous', '<h3>Allotjaments de luxe</h3><p>Ubicats al costat muntanya del càmping i amb vista a la natura que ens envolta.</p><p>Dues cabanes de fusta massissa de dues plantes i amb porxo cobert per gaudir entre arbres.</p>', '<h4>Proxo/terrassa (13 m²)</h4><ul><li>Moblat</li></ul><h4>Planta baixa (32 m²)</h4><ul><li>Sala menjador</li><li>Cuina equipada</li><li>Una habitació llit doble (150 × 200)</li><li>Bany complet</li></ul><h4>Planta altell (16 m²)</h4><ul><li>Tres llits individuals (90 × 200)</li></ul>', '<h4>El preu inclou</h4><ul><li>Llençols i nòrdic</li><li>Cistella de benvinguda: oli d’oliva, sal, sucre, cafè i te</li><li>WiFi</li><li>Plaça d’aparcament per un cotxe</li><li>Kit nadó (bressol, trona i banyera) <em>sota reserva</em></li></ul><p>* Tovalloles: preu extra</p>', '<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p><p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p><p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>', '', '15 h a 21 h', '12 h', 5, false); select add_campsite_type(52, 64, 'Bungalous', '<h3>Allotjaments de luxe</h3><p>Ubicats al costat muntanya del càmping i amb vista a la natura que ens envolta.</p><p>Dues cabanes de fusta massissa de dues plantes i amb porxo cobert per gaudir entre arbres.</p>', '<h4>Proxo/terrassa (13 m²)</h4><ul><li>Moblat</li></ul><h4>Planta baixa (32 m²)</h4><ul><li>Sala menjador</li><li>Cuina equipada</li><li>Una habitació llit doble (150 × 200)</li><li>Bany complet</li></ul><h4>Planta altell (16 m²)</h4><ul><li>Tres llits individuals (90 × 200)</li></ul>', '<h4>El preu inclou</h4><ul><li>Llençols i nòrdic</li><li>Cistella de benvinguda: oli d’oliva, sal, sucre, cafè i te</li><li>WiFi</li><li>Plaça d’aparcament per un cotxe</li><li>Kit nadó (bressol, trona i banyera) <em>sota reserva</em></li></ul><p>* Tovalloles: preu extra</p>', '<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p><p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p><p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>', '', '15 h a 21 h', '12 h', 5, false, false, false);
select add_campsite_type(52, 65, 'Bungalous prèmium', '<h3>Allotjaments de luxe</h3><p>Ubicats al costat muntanya del càmping i amb vista a la natura que ens envolta.</p><p>Dues cabanes de fusta massissa de dues plantes i amb porxo cobert per gaudir entre arbres.</p>', '<h4>Proxo/terrassa (13 m²)</h4><ul><li>Moblat</li></ul><h4>Planta baixa (32 m²)</h4><ul><li>Sala menjador</li><li>Cuina equipada</li><li>Una habitació llit doble (150 × 200)</li><li>Bany complet</li></ul><h4>Planta altell (16 m²)</h4><ul><li>Tres llits individuals (90 × 200)</li></ul>', '<h4>El preu inclou</h4><ul><li>Llençols i nòrdic</li><li>Cistella de benvinguda: oli d’oliva, sal, sucre, cafè i te</li><li>WiFi</li><li>Plaça d’aparcament per un cotxe</li><li>Kit nadó (bressol, trona i banyera) <em>sota reserva</em></li></ul><p>* Tovalloles: preu extra</p>', '<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p><p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p><p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>', '', '15 h a 21 h', '12 h', 5, false); select add_campsite_type(52, 65, 'Bungalous prèmium', '<h3>Allotjaments de luxe</h3><p>Ubicats al costat muntanya del càmping i amb vista a la natura que ens envolta.</p><p>Dues cabanes de fusta massissa de dues plantes i amb porxo cobert per gaudir entre arbres.</p>', '<h4>Proxo/terrassa (13 m²)</h4><ul><li>Moblat</li></ul><h4>Planta baixa (32 m²)</h4><ul><li>Sala menjador</li><li>Cuina equipada</li><li>Una habitació llit doble (150 × 200)</li><li>Bany complet</li></ul><h4>Planta altell (16 m²)</h4><ul><li>Tres llits individuals (90 × 200)</li></ul>', '<h4>El preu inclou</h4><ul><li>Llençols i nòrdic</li><li>Cistella de benvinguda: oli d’oliva, sal, sucre, cafè i te</li><li>WiFi</li><li>Plaça d’aparcament per un cotxe</li><li>Kit nadó (bressol, trona i banyera) <em>sota reserva</em></li></ul><p>* Tovalloles: preu extra</p>', '<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p><p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p><p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>', '', '15 h a 21 h', '12 h', 5, false, false, false);
select add_campsite_type(52, 66, 'Cabanes de fusta', '<h3>Allotjaments de luxe</h3><p>Ubicats al costat muntanya del càmping i amb vista a la natura que ens envolta.</p><p>Dues cabanes de fusta massissa de dues plantes i amb porxo cobert per gaudir entre arbres.</p>', '<h4>Proxo/terrassa (13 m²)</h4><ul><li>Moblat</li></ul><h4>Planta baixa (32 m²)</h4><ul><li>Sala menjador</li><li>Cuina equipada</li><li>Una habitació llit doble (150 × 200)</li><li>Bany complet</li></ul><h4>Planta altell (16 m²)</h4><ul><li>Tres llits individuals (90 × 200)</li></ul>', '<h4>El preu inclou</h4><ul><li>Llençols i nòrdic</li><li>Cistella de benvinguda: oli d’oliva, sal, sucre, cafè i te</li><li>WiFi</li><li>Plaça d’aparcament per un cotxe</li><li>Kit nadó (bressol, trona i banyera) <em>sota reserva</em></li></ul><p>* Tovalloles: preu extra</p>', '<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p><p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p><p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>', '', '15 h a 21 h', '12 h', 5, false); select add_campsite_type(52, 66, 'Cabanes de fusta', '<h3>Allotjaments de luxe</h3><p>Ubicats al costat muntanya del càmping i amb vista a la natura que ens envolta.</p><p>Dues cabanes de fusta massissa de dues plantes i amb porxo cobert per gaudir entre arbres.</p>', '<h4>Proxo/terrassa (13 m²)</h4><ul><li>Moblat</li></ul><h4>Planta baixa (32 m²)</h4><ul><li>Sala menjador</li><li>Cuina equipada</li><li>Una habitació llit doble (150 × 200)</li><li>Bany complet</li></ul><h4>Planta altell (16 m²)</h4><ul><li>Tres llits individuals (90 × 200)</li></ul>', '<h4>El preu inclou</h4><ul><li>Llençols i nòrdic</li><li>Cistella de benvinguda: oli d’oliva, sal, sucre, cafè i te</li><li>WiFi</li><li>Plaça d’aparcament per un cotxe</li><li>Kit nadó (bressol, trona i banyera) <em>sota reserva</em></li></ul><p>* Tovalloles: preu extra</p>', '<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p><p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p><p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>', '', '15 h a 21 h', '12 h', 5, false, false, false);
insert into campsite_type_i18n (campsite_type_id, lang_tag, name, spiel, info, facilities, description, additional_info, check_in, check_out) insert into campsite_type_i18n (campsite_type_id, lang_tag, name, spiel, info, facilities, description, additional_info, check_in, check_out)
values (72, 'en', 'Plots', '<h3>Camp in the middle of nature</h3><p>Located on the campground’s mountain-side and overlooking the nature that surrounds us.</p><p>Large plots with serivces close to where you are to do what you want.</p>', '<h4>Porch/terrace (13 m²)</h4><ul><li>Furnished</li></ul><h4>First floor (32 m²)</h4><ul><li>Dining room</li><li>Equipped kitchen</li><li>One room with a double bed (150 × 200)</li><li>Full bathroom</li></ul><h4>Loft floor (16 m²)</h4><ul><li>Three individual beds (90 × 200)</li></ul>', '<h4>Price includes</h4><ul><li>Sheets and duvet</li><li>Welcome basket: olive oil, salt, sugar, coffee, and tea</li><li>WiFi</li><li>Parking space for one car</li><li>Baby Kit (bassinet, high chair, and bathtub) <em>reservation required</em></li></ul><p>* Towels: extra cost</p>', '<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p><p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p><p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>', '', '3 p.m. to 9 p.m.', '12 a.m.') values (72, 'en', 'Plots', '<h3>Camp in the middle of nature</h3><p>Located on the campground’s mountain-side and overlooking the nature that surrounds us.</p><p>Large plots with serivces close to where you are to do what you want.</p>', '<h4>Porch/terrace (13 m²)</h4><ul><li>Furnished</li></ul><h4>First floor (32 m²)</h4><ul><li>Dining room</li><li>Equipped kitchen</li><li>One room with a double bed (150 × 200)</li><li>Full bathroom</li></ul><h4>Loft floor (16 m²)</h4><ul><li>Three individual beds (90 × 200)</li></ul>', '<h4>Price includes</h4><ul><li>Sheets and duvet</li><li>Welcome basket: olive oil, salt, sugar, coffee, and tea</li><li>WiFi</li><li>Parking space for one car</li><li>Baby Kit (bassinet, high chair, and bathtub) <em>reservation required</em></li></ul><p>* Towels: extra cost</p>', '<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p><p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p><p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>', '', '3 p.m. to 9 p.m.', '12 a.m.')

15
deploy/add_campsite_type.sql
View File

@ -3,23 +3,26 @@
-- requires: schema_camper -- requires: schema_camper
-- requires: campsite_type -- requires: campsite_type
-- requires: company -- requires: company
-- requires: campsite_type__check_in_out
-- requires: campsite_type__overflow_allowed
-- requires: campsite_type__ask_zone_preferences
begin; begin;
set search_path to camper, public; set search_path to camper, public;
drop function if exists add_campsite_type(integer, integer, text, text, text, text, text, text, integer, boolean); drop function if exists add_campsite_type(integer, integer, text, text, text, text, text, text, text, text, integer, boolean);
create or replace function add_campsite_type(company integer, media_id integer, name text, spiel text, info text, facilities text, description text, additional_info text, check_in text, check_out text, max_campers integer, dogs_allowed boolean) returns uuid as create or replace function add_campsite_type(company integer, media_id integer, name text, spiel text, info text, facilities text, description text, additional_info text, check_in text, check_out text, max_campers integer, dogs_allowed boolean, overflow_allowed boolean, ask_zone_preferences boolean) returns uuid as
$$ $$
insert into campsite_type (company_id, media_id, name, spiel, info, facilities, description, additional_info, check_in, check_out, max_campers, dogs_allowed) insert into campsite_type (company_id, media_id, name, spiel, info, facilities, description, additional_info, check_in, check_out, max_campers, dogs_allowed, overflow_allowed, ask_zone_preferences)
values (company, media_id, name, xmlparse(content spiel), xmlparse(content info), xmlparse(content facilities), xmlparse(content description), xmlparse(content additional_info), check_in, check_out, max_campers, dogs_allowed) values (company, media_id, name, xmlparse(content spiel), xmlparse(content info), xmlparse(content facilities), xmlparse(content description), xmlparse(content additional_info), check_in, check_out, max_campers, dogs_allowed, overflow_allowed, ask_zone_preferences)
returning slug; returning slug;
$$ $$
language sql language sql
; ;
revoke execute on function add_campsite_type(integer, integer, text, text, text, text, text, text, text, text, integer, boolean) from public; revoke execute on function add_campsite_type(integer, integer, text, text, text, text, text, text, text, text, integer, boolean, boolean, boolean) from public;
grant execute on function add_campsite_type(integer, integer, text, text, text, text, text, text, text, text, integer, boolean) to admin; grant execute on function add_campsite_type(integer, integer, text, text, text, text, text, text, text, text, integer, boolean, boolean, boolean) to admin;
commit; commit;

25
deploy/add_campsite_type@v2.sql Normal file
View File

@ -0,0 +1,25 @@
-- Deploy camper:add_campsite_type to pg
-- requires: roles
-- requires: schema_camper
-- requires: campsite_type
-- requires: company
begin;
set search_path to camper, public;
drop function if exists add_campsite_type(integer, integer, text, text, text, text, text, text, integer, boolean);
create or replace function add_campsite_type(company integer, media_id integer, name text, spiel text, info text, facilities text, description text, additional_info text, check_in text, check_out text, max_campers integer, dogs_allowed boolean) returns uuid as
$$
insert into campsite_type (company_id, media_id, name, spiel, info, facilities, description, additional_info, check_in, check_out, max_campers, dogs_allowed)
values (company, media_id, name, xmlparse(content spiel), xmlparse(content info), xmlparse(content facilities), xmlparse(content description), xmlparse(content additional_info), check_in, check_out, max_campers, dogs_allowed)
returning slug;
$$
language sql
;
revoke execute on function add_campsite_type(integer, integer, text, text, text, text, text, text, text, text, integer, boolean) from public;
grant execute on function add_campsite_type(integer, integer, text, text, text, text, text, text, text, text, integer, boolean) to admin;
commit;

10
deploy/campsite_type__ask_zone_preferences.sql Normal file
View File

@ -0,0 +1,10 @@
-- Deploy camper:campsite_type__ask_zone_preferences to pg
-- requires: campsite_type
begin;
alter table camper.campsite_type
add column ask_zone_preferences boolean not null default false
;
commit;

10
deploy/campsite_type__overflow_allowed.sql Normal file
View File

@ -0,0 +1,10 @@
-- Deploy camper:campsite_type__overflow_allowed to pg
-- requires: campsite_type
begin;
alter table camper.campsite_type
add column overflow_allowed boolean not null default false
;
commit;

13
deploy/edit_campsite_type.sql
View File

@ -3,14 +3,17 @@
-- requires: schema_camper -- requires: schema_camper
-- requires: campsite_type -- requires: campsite_type
-- requires: company -- requires: company
-- requires: campsite_type__check_in_out
-- requires: campsite_type__overflow_allowed
-- requires: campsite_type__ask_zone_preferences
begin; begin;
set search_path to camper, public; set search_path to camper, public;
drop function if exists edit_campsite_type(uuid, integer, text, text, text, text, text, text, integer, boolean, boolean); drop function if exists edit_campsite_type(uuid, integer, text, text, text, text, text, text, text, text, integer, boolean, boolean);
create or replace function edit_campsite_type(slug uuid, media_id integer, name text, spiel text, info text, facilities text, description text, additional_info text, check_in text, check_out text, max_campers integer, dogs_allowed boolean, active boolean) returns uuid as create or replace function edit_campsite_type(slug uuid, media_id integer, name text, spiel text, info text, facilities text, description text, additional_info text, check_in text, check_out text, max_campers integer, dogs_allowed boolean, overflow_allowed boolean, ask_zone_preferences boolean, active boolean) returns uuid as
$$ $$
update campsite_type update campsite_type
set name = edit_campsite_type.name set name = edit_campsite_type.name
@ -24,6 +27,8 @@ $$
, media_id = coalesce(edit_campsite_type.media_id, campsite_type.media_id) , media_id = coalesce(edit_campsite_type.media_id, campsite_type.media_id)
, max_campers = edit_campsite_type.max_campers , max_campers = edit_campsite_type.max_campers
, dogs_allowed = edit_campsite_type.dogs_allowed , dogs_allowed = edit_campsite_type.dogs_allowed
, overflow_allowed = edit_campsite_type.overflow_allowed
, ask_zone_preferences = edit_campsite_type.ask_zone_preferences
, active = edit_campsite_type.active , active = edit_campsite_type.active
where slug = edit_campsite_type.slug where slug = edit_campsite_type.slug
returning slug; returning slug;
@ -31,7 +36,7 @@ $$
language sql language sql
; ;
revoke execute on function edit_campsite_type(uuid, integer, text, text, text, text, text, text, text, text, integer, boolean, boolean) from public; revoke execute on function edit_campsite_type(uuid, integer, text, text, text, text, text, text, text, text, integer, boolean, boolean, boolean, boolean) from public;
grant execute on function edit_campsite_type(uuid, integer, text, text, text, text, text, text, text, text, integer, boolean, boolean) to admin; grant execute on function edit_campsite_type(uuid, integer, text, text, text, text, text, text, text, text, integer, boolean, boolean, boolean, boolean) to admin;
commit; commit;

37
deploy/edit_campsite_type@v2.sql Normal file
View File

@ -0,0 +1,37 @@
-- Deploy camper:edit_campsite_type to pg
-- requires: roles
-- requires: schema_camper
-- requires: campsite_type
-- requires: company
begin;
set search_path to camper, public;
drop function if exists edit_campsite_type(uuid, integer, text, text, text, text, text, text, integer, boolean, boolean);
create or replace function edit_campsite_type(slug uuid, media_id integer, name text, spiel text, info text, facilities text, description text, additional_info text, check_in text, check_out text, max_campers integer, dogs_allowed boolean, active boolean) returns uuid as
$$
update campsite_type
set name = edit_campsite_type.name
, spiel = xmlparse(content edit_campsite_type.spiel)
, description = xmlparse(content edit_campsite_type.description)
, info = xmlparse(content edit_campsite_type.info)
, additional_info = xmlparse(content edit_campsite_type.additional_info)
, check_in = edit_campsite_type.check_in
, check_out = edit_campsite_type.check_out
, facilities = xmlparse(content edit_campsite_type.facilities)
, media_id = coalesce(edit_campsite_type.media_id, campsite_type.media_id)
, max_campers = edit_campsite_type.max_campers
, dogs_allowed = edit_campsite_type.dogs_allowed
, active = edit_campsite_type.active
where slug = edit_campsite_type.slug
returning slug;
$$
language sql
;
revoke execute on function edit_campsite_type(uuid, integer, text, text, text, text, text, text, text, text, integer, boolean, boolean) from public;
grant execute on function edit_campsite_type(uuid, integer, text, text, text, text, text, text, text, text, integer, boolean, boolean) to admin;
commit;

64
pkg/booking/public.go
View File

@ -136,7 +136,7 @@ type bookingForm struct {
CampsiteTypeOptions map[string][]*campsiteTypeOption CampsiteTypeOptions map[string][]*campsiteTypeOption
ArrivalDate *form.Input ArrivalDate *form.Input
DepartureDate *form.Input DepartureDate *form.Input
AreaPreferences *form.Input ZonePreferences map[string]*form.Input
ACSICard *form.Checkbox ACSICard *form.Checkbox
Agreement *form.Checkbox Agreement *form.Checkbox
} }
@ -149,7 +149,43 @@ type campsiteTypeOption struct {
} }
func newBookingForm(ctx context.Context, company *auth.Company, conn *database.Conn, l *locale.Locale) *bookingForm { func newBookingForm(ctx context.Context, company *auth.Company, conn *database.Conn, l *locale.Locale) *bookingForm {
f := &bookingForm{ var typeSelectOptions []*form.Option
zonePreferences := make(map[string]*form.Input)
rows, err := conn.Query(ctx, `
select type.slug
, coalesce(i18n.name, type.name) as l10n_name
, ask_zone_preferences
from campsite_type as type
left join campsite_type_i18n as i18n
on type.campsite_type_id = i18n.campsite_type_id
and i18n.lang_tag = $1
where company_id = $2
and active
order by position, l10n_name
`, l.Language, company.ID)
if err != nil {
panic(err)
}
defer rows.Close()
for rows.Next() {
option := &form.Option{}
var ask bool
if err = rows.Scan(&option.Value, &option.Label, &ask); err != nil {
panic(err)
}
typeSelectOptions = append(typeSelectOptions, option)
if ask {
zonePreferences[option.Value] = &form.Input{
Name: "zone_preferences_" + option.Value,
}
}
}
if rows.Err() != nil {
panic(rows.Err())
}
return &bookingForm{
FullName: &form.Input{ FullName: &form.Input{
Name: "full_name", Name: "full_name",
}, },
@ -174,18 +210,16 @@ func newBookingForm(ctx context.Context, company *auth.Company, conn *database.C
}, },
CampsiteType: &form.Select{ CampsiteType: &form.Select{
Name: "campsite_type", Name: "campsite_type",
Options: form.MustGetOptions(ctx, conn, "select type.slug, coalesce(i18n.name, type.name) as l10n_name from campsite_type as type left join campsite_type_i18n as i18n on type.campsite_type_id = i18n.campsite_type_id and i18n.lang_tag = $1 where company_id = $2 and active order by position, l10n_name", l.Language, company.ID), Options: typeSelectOptions,
}, },
CampsiteTypeOptions: make(map[string][]*campsiteTypeOption), CampsiteTypeOptions: mustGetCampsiteTypeOptions(ctx, conn, company, l),
ArrivalDate: &form.Input{ ArrivalDate: &form.Input{
Name: "arrival_date", Name: "arrival_date",
}, },
DepartureDate: &form.Input{ DepartureDate: &form.Input{
Name: "departure_date", Name: "departure_date",
}, },
AreaPreferences: &form.Input{ ZonePreferences: zonePreferences,
Name: "area_preferences",
},
ACSICard: &form.Checkbox{ ACSICard: &form.Checkbox{
Name: "acsi_card", Name: "acsi_card",
}, },
@ -193,6 +227,9 @@ func newBookingForm(ctx context.Context, company *auth.Company, conn *database.C
Name: "agreement", Name: "agreement",
}, },
} }
}
func mustGetCampsiteTypeOptions(ctx context.Context, conn *database.Conn, company *auth.Company, l *locale.Locale) map[string][]*campsiteTypeOption {
rows, err := conn.Query(ctx, ` rows, err := conn.Query(ctx, `
select 'campsite_type_option_' || option.campsite_type_option_id select 'campsite_type_option_' || option.campsite_type_option_id
, slug , slug
@ -210,21 +247,24 @@ func newBookingForm(ctx context.Context, company *auth.Company, conn *database.C
if err != nil { if err != nil {
panic(err) panic(err)
} }
defer rows.Close()
options := make(map[string][]*campsiteTypeOption)
for rows.Next() { for rows.Next() {
var slug string var slug string
option := &campsiteTypeOption{ option := &campsiteTypeOption{
Input: &form.Input{}, Input: &form.Input{},
} }
if err := rows.Scan(&option.Input.Name, &slug, &option.Label, &option.Input.Val, &option.Min, &option.Max); err != nil { if err = rows.Scan(&option.Input.Name, &slug, &option.Label, &option.Input.Val, &option.Min, &option.Max); err != nil {
panic(err) panic(err)
} }
f.CampsiteTypeOptions[slug] = append(f.CampsiteTypeOptions[slug], option) options[slug] = append(options[slug], option)
} }
if rows.Err() != nil { if rows.Err() != nil {
panic(rows.Err()) panic(rows.Err())
} }
return f return options
} }
func (f *bookingForm) Parse(r *http.Request) error { func (f *bookingForm) Parse(r *http.Request) error {
if err := r.ParseForm(); err != nil { if err := r.ParseForm(); err != nil {
return err return err
@ -239,9 +279,11 @@ func (f *bookingForm) Parse(r *http.Request) error {
f.CampsiteType.FillValue(r) f.CampsiteType.FillValue(r)
f.ArrivalDate.FillValue(r) f.ArrivalDate.FillValue(r)
f.DepartureDate.FillValue(r) f.DepartureDate.FillValue(r)
f.AreaPreferences.FillValue(r)
f.ACSICard.FillValue(r) f.ACSICard.FillValue(r)
f.Agreement.FillValue(r) f.Agreement.FillValue(r)
for _, preferences := range f.ZonePreferences {
preferences.FillValue(r)
}
for _, options := range f.CampsiteTypeOptions { for _, options := range f.CampsiteTypeOptions {
for _, option := range options { for _, option := range options {
option.Input.FillValue(r) option.Input.FillValue(r)

20
pkg/campsite/types/admin.go
View File

@ -167,7 +167,7 @@ func addType(w http.ResponseWriter, r *http.Request, user *auth.User, company *a
} }
processTypeForm(w, r, user, company, conn, f, func(ctx context.Context, tx *database.Tx) error { processTypeForm(w, r, user, company, conn, f, func(ctx context.Context, tx *database.Tx) error {
var err error var err error
f.Slug, err = tx.AddCampsiteType(ctx, company.ID, f.Media.Int(), f.Name[f.DefaultLang].Val, f.Spiel[f.DefaultLang].Val, f.Info[f.DefaultLang].Val, f.Facilities[f.DefaultLang].Val, f.Description[f.DefaultLang].Val, f.AdditionalInfo[f.DefaultLang].Val, f.CheckIn[f.DefaultLang].Val, f.CheckOut[f.DefaultLang].Val, f.MaxCampers.Int(), f.DogsAllowed.Checked) f.Slug, err = tx.AddCampsiteType(ctx, company.ID, f.Media.Int(), f.Name[f.DefaultLang].Val, f.Spiel[f.DefaultLang].Val, f.Info[f.DefaultLang].Val, f.Facilities[f.DefaultLang].Val, f.Description[f.DefaultLang].Val, f.AdditionalInfo[f.DefaultLang].Val, f.CheckIn[f.DefaultLang].Val, f.CheckOut[f.DefaultLang].Val, f.MaxCampers.Int(), f.DogsAllowed.Checked, f.OverflowAllowed.Checked, f.AskZonePreferences.Checked)
if err != nil { if err != nil {
return err return err
} }
@ -202,7 +202,7 @@ func setTypePrices(ctx context.Context, tx *database.Tx, slug string, prices map
func editType(w http.ResponseWriter, r *http.Request, user *auth.User, company *auth.Company, conn *database.Conn, f *typeForm) { func editType(w http.ResponseWriter, r *http.Request, user *auth.User, company *auth.Company, conn *database.Conn, f *typeForm) {
processTypeForm(w, r, user, company, conn, f, func(ctx context.Context, tx *database.Tx) error { processTypeForm(w, r, user, company, conn, f, func(ctx context.Context, tx *database.Tx) error {
if _, err := tx.EditCampsiteType(ctx, f.Slug, f.Media.Int(), f.Name[f.DefaultLang].Val, f.Spiel[f.DefaultLang].Val, f.Info[f.DefaultLang].Val, f.Facilities[f.DefaultLang].Val, f.Description[f.DefaultLang].Val, f.AdditionalInfo[f.DefaultLang].Val, f.CheckIn[f.DefaultLang].Val, f.CheckOut[f.DefaultLang].Val, f.MaxCampers.Int(), f.DogsAllowed.Checked, f.Active.Checked); err != nil { if _, err := tx.EditCampsiteType(ctx, f.Slug, f.Media.Int(), f.Name[f.DefaultLang].Val, f.Spiel[f.DefaultLang].Val, f.Info[f.DefaultLang].Val, f.Facilities[f.DefaultLang].Val, f.Description[f.DefaultLang].Val, f.AdditionalInfo[f.DefaultLang].Val, f.CheckIn[f.DefaultLang].Val, f.CheckOut[f.DefaultLang].Val, f.MaxCampers.Int(), f.DogsAllowed.Checked, f.OverflowAllowed.Checked, f.AskZonePreferences.Checked, f.Active.Checked); err != nil {
return err return err
} }
if err := translateTypes(ctx, tx, company, f); err != nil { if err := translateTypes(ctx, tx, company, f); err != nil {
@ -277,6 +277,8 @@ type typeForm struct {
Name form.I18nInput Name form.I18nInput
MaxCampers *form.Input MaxCampers *form.Input
DogsAllowed *form.Checkbox DogsAllowed *form.Checkbox
OverflowAllowed *form.Checkbox
AskZonePreferences *form.Checkbox
Spiel form.I18nInput Spiel form.I18nInput
Info form.I18nInput Info form.I18nInput
Facilities form.I18nInput Facilities form.I18nInput
@ -314,6 +316,12 @@ func newTypeForm(ctx context.Context, company *auth.Company, conn *database.Conn
DogsAllowed: &form.Checkbox{ DogsAllowed: &form.Checkbox{
Name: "dogs_allowed", Name: "dogs_allowed",
}, },
OverflowAllowed: &form.Checkbox{
Name: "overflow_allowed",
},
AskZonePreferences: &form.Checkbox{
Name: "ask_zone_preferences",
},
Spiel: form.NewI18nInput(company.Locales, "spiel"), Spiel: form.NewI18nInput(company.Locales, "spiel"),
Info: form.NewI18nInput(company.Locales, "info"), Info: form.NewI18nInput(company.Locales, "info"),
Facilities: form.NewI18nInput(company.Locales, "facilities"), Facilities: form.NewI18nInput(company.Locales, "facilities"),
@ -374,6 +382,8 @@ func (f *typeForm) FillFromDatabase(ctx context.Context, conn *database.Conn, sl
, media_id::text , media_id::text
, max_campers::text , max_campers::text
, dogs_allowed , dogs_allowed
, overflow_allowed
, ask_zone_preferences
, active , active
, array_agg((lang_tag, i18n.name)) , array_agg((lang_tag, i18n.name))
, array_agg((lang_tag, i18n.spiel::text)) , array_agg((lang_tag, i18n.spiel::text))
@ -397,9 +407,11 @@ func (f *typeForm) FillFromDatabase(ctx context.Context, conn *database.Conn, sl
, media_id::text , media_id::text
, max_campers::text , max_campers::text
, dogs_allowed , dogs_allowed
, overflow_allowed
, ask_zone_preferences
, active , active
`, pgx.QueryResultFormats{pgx.BinaryFormatCode}, slug) `, pgx.QueryResultFormats{pgx.BinaryFormatCode}, slug)
if err := row.Scan(&f.Name[f.DefaultLang].Val, &f.Spiel[f.DefaultLang].Val, &f.Info[f.DefaultLang].Val, &f.Facilities[f.DefaultLang].Val, &f.Description[f.DefaultLang].Val, &f.AdditionalInfo[f.DefaultLang].Val, &f.CheckIn[f.DefaultLang].Val, &f.CheckOut[f.DefaultLang].Val, &f.Media.Val, &f.MaxCampers.Val, &f.DogsAllowed.Checked, &f.Active.Checked, &name, &spiel, &info, &facilities, &description, &additionalInfo, &checkIn, &checkOut); err != nil { if err := row.Scan(&f.Name[f.DefaultLang].Val, &f.Spiel[f.DefaultLang].Val, &f.Info[f.DefaultLang].Val, &f.Facilities[f.DefaultLang].Val, &f.Description[f.DefaultLang].Val, &f.AdditionalInfo[f.DefaultLang].Val, &f.CheckIn[f.DefaultLang].Val, &f.CheckOut[f.DefaultLang].Val, &f.Media.Val, &f.MaxCampers.Val, &f.DogsAllowed.Checked, &f.OverflowAllowed.Checked, &f.AskZonePreferences.Checked, &f.Active.Checked, &name, &spiel, &info, &facilities, &description, &additionalInfo, &checkIn, &checkOut); err != nil {
return err return err
} }
if err := f.Name.FillArray(name); err != nil { if err := f.Name.FillArray(name); err != nil {
@ -463,6 +475,8 @@ func (f *typeForm) Parse(r *http.Request) error {
f.Name.FillValue(r) f.Name.FillValue(r)
f.MaxCampers.FillValue(r) f.MaxCampers.FillValue(r)
f.DogsAllowed.FillValue(r) f.DogsAllowed.FillValue(r)
f.OverflowAllowed.FillValue(r)
f.AskZonePreferences.FillValue(r)
f.Spiel.FillValue(r) f.Spiel.FillValue(r)
f.Info.FillValue(r) f.Info.FillValue(r)
f.Facilities.FillValue(r) f.Facilities.FillValue(r)

8
pkg/database/funcs.go
View File

@ -130,12 +130,12 @@ func (c *Conn) RemoveCampsiteFeature(ctx context.Context, id int) error {
return err return err
} }
func (tx *Tx) AddCampsiteType(ctx context.Context, companyID int, mediaID int, name string, spiel string, info string, facilities string, description string, additionalInfo string, checkIn string, checkOut string, maxCampers int, dogsAllowed bool) (string, error) { func (tx *Tx) AddCampsiteType(ctx context.Context, companyID int, mediaID int, name string, spiel string, info string, facilities string, description string, additionalInfo string, checkIn string, checkOut string, maxCampers int, dogsAllowed bool, overflowAllowed bool, askZonePreferences bool) (string, error) {
return tx.GetText(ctx, "select add_campsite_type($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)", companyID, mediaID, name, spiel, info, facilities, description, additionalInfo, checkIn, checkOut, maxCampers, dogsAllowed) return tx.GetText(ctx, "select add_campsite_type($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14)", companyID, mediaID, name, spiel, info, facilities, description, additionalInfo, checkIn, checkOut, maxCampers, dogsAllowed, overflowAllowed, askZonePreferences)
} }
func (tx *Tx) EditCampsiteType(ctx context.Context, slug string, mediaID int, name string, spiel string, info string, facilities string, description string, additionalInfo string, checkIn string, checkOut string, maxCampers int, dogsAllowed bool, active bool) (string, error) { func (tx *Tx) EditCampsiteType(ctx context.Context, slug string, mediaID int, name string, spiel string, info string, facilities string, description string, additionalInfo string, checkIn string, checkOut string, maxCampers int, dogsAllowed bool, overflowAllowed bool, askZonePreferences bool, active bool) (string, error) {
return tx.GetText(ctx, "select edit_campsite_type($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)", slug, mediaID, name, spiel, info, facilities, description, additionalInfo, checkIn, checkOut, maxCampers, dogsAllowed, active) return tx.GetText(ctx, "select edit_campsite_type($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15)", slug, mediaID, name, spiel, info, facilities, description, additionalInfo, checkIn, checkOut, maxCampers, dogsAllowed, overflowAllowed, askZonePreferences, active)
} }
func (c *Conn) OrderCampsiteTypes(ctx context.Context, slugs []string) error { func (c *Conn) OrderCampsiteTypes(ctx context.Context, slugs []string) error {

146
po/ca.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: camper\n" "Project-Id-Version: camper\n"
"Report-Msgid-Bugs-To: jordi@tandem.blog\n" "Report-Msgid-Bugs-To: jordi@tandem.blog\n"
"POT-Creation-Date: 2024-01-27 22:29+0100\n" "POT-Creation-Date: 2024-01-29 03:30+0100\n"
"PO-Revision-Date: 2023-07-22 23:45+0200\n" "PO-Revision-Date: 2023-07-22 23:45+0200\n"
"Last-Translator: jordi fita mas <jordi@tandem.blog>\n" "Last-Translator: jordi fita mas <jordi@tandem.blog>\n"
"Language-Team: Catalan <ca@dodds.net>\n" "Language-Team: Catalan <ca@dodds.net>\n"
@ -124,7 +124,7 @@ msgid "Check-out Date"
msgstr "Data de sortida" msgstr "Data de sortida"
#: web/templates/public/campsite/type.gohtml:54 #: web/templates/public/campsite/type.gohtml:54
#: web/templates/public/booking.gohtml:164 #: web/templates/public/booking.gohtml:169
msgctxt "action" msgctxt "action"
msgid "Book" msgid "Book"
msgstr "Reserva" msgstr "Reserva"
@ -136,7 +136,7 @@ msgid "Calendar"
msgstr "Calendari" msgstr "Calendari"
#: web/templates/public/campsite/type.gohtml:73 #: web/templates/public/campsite/type.gohtml:73
#: web/templates/admin/campsite/type/form.gohtml:109 #: web/templates/admin/campsite/type/form.gohtml:127
#: web/templates/admin/campsite/type/option/form.gohtml:70 #: web/templates/admin/campsite/type/option/form.gohtml:70
msgctxt "title" msgctxt "title"
msgid "Prices" msgid "Prices"
@ -351,32 +351,36 @@ msgctxt "title"
msgid "Accommodation" msgid "Accommodation"
msgstr "Allotjaments" msgstr "Allotjaments"
#: web/templates/public/booking.gohtml:99 #: web/templates/public/booking.gohtml:101
msgctxt "input" msgctxt "input"
msgid "Area preferences (optional)" msgid "Area preferences (optional)"
msgstr "Preferències d’àrea (opcional)" msgstr "Preferències d’àrea (opcional)"
#: web/templates/public/booking.gohtml:121 #: web/templates/public/booking.gohtml:108
msgid "Campground map"
msgstr "Mapa del càmping"
#: web/templates/public/booking.gohtml:126
msgctxt "title" msgctxt "title"
msgid "Booking Period" msgid "Booking Period"
msgstr "Període de reserva" msgstr "Període de reserva"
#: web/templates/public/booking.gohtml:124 #: web/templates/public/booking.gohtml:129
msgctxt "input" msgctxt "input"
msgid "Arrival date" msgid "Arrival date"
msgstr "Data d’arribada" msgstr "Data d’arribada"
#: web/templates/public/booking.gohtml:133 #: web/templates/public/booking.gohtml:138
msgctxt "input" msgctxt "input"
msgid "Departure date" msgid "Departure date"
msgstr "Data de sortida" msgstr "Data de sortida"
#: web/templates/public/booking.gohtml:144 #: web/templates/public/booking.gohtml:149
msgctxt "input" msgctxt "input"
msgid "ACSI card? (optional)" msgid "ACSI card? (optional)"
msgstr "Targeta ACSI? (opcional)" msgstr "Targeta ACSI? (opcional)"
#: web/templates/public/booking.gohtml:151 #: web/templates/public/booking.gohtml:156
msgctxt "input" msgctxt "input"
msgid "I have read and I accept %[1]sthe reservation conditions%[2]s" msgid "I have read and I accept %[1]sthe reservation conditions%[2]s"
msgstr "He llegit i accepto %[1]sles condicions de reserves%[2]s" msgstr "He llegit i accepto %[1]sles condicions de reserves%[2]s"
@ -481,7 +485,7 @@ msgstr "Contingut"
#: web/templates/admin/campsite/form.gohtml:92 #: web/templates/admin/campsite/form.gohtml:92
#: web/templates/admin/campsite/type/feature/form.gohtml:74 #: web/templates/admin/campsite/type/feature/form.gohtml:74
#: web/templates/admin/campsite/type/carousel/form.gohtml:59 #: web/templates/admin/campsite/type/carousel/form.gohtml:59
#: web/templates/admin/campsite/type/form.gohtml:202 #: web/templates/admin/campsite/type/form.gohtml:220
#: web/templates/admin/campsite/type/option/form.gohtml:90 #: web/templates/admin/campsite/type/option/form.gohtml:90
#: web/templates/admin/season/form.gohtml:73 #: web/templates/admin/season/form.gohtml:73
#: web/templates/admin/services/form.gohtml:81 #: web/templates/admin/services/form.gohtml:81
@ -503,7 +507,7 @@ msgstr "Actualitza"
#: web/templates/admin/campsite/form.gohtml:94 #: web/templates/admin/campsite/form.gohtml:94
#: web/templates/admin/campsite/type/feature/form.gohtml:76 #: web/templates/admin/campsite/type/feature/form.gohtml:76
#: web/templates/admin/campsite/type/carousel/form.gohtml:61 #: web/templates/admin/campsite/type/carousel/form.gohtml:61
#: web/templates/admin/campsite/type/form.gohtml:204 #: web/templates/admin/campsite/type/form.gohtml:222
#: web/templates/admin/campsite/type/option/form.gohtml:92 #: web/templates/admin/campsite/type/option/form.gohtml:92
#: web/templates/admin/season/form.gohtml:75 #: web/templates/admin/season/form.gohtml:75
#: web/templates/admin/services/form.gohtml:83 #: web/templates/admin/services/form.gohtml:83
@ -627,6 +631,7 @@ msgstr "Afegeix característica"
#: web/templates/admin/surroundings/index.gohtml:84 #: web/templates/admin/surroundings/index.gohtml:84
#: web/templates/admin/amenity/feature/index.gohtml:31 #: web/templates/admin/amenity/feature/index.gohtml:31
#: web/templates/admin/amenity/carousel/index.gohtml:31 #: web/templates/admin/amenity/carousel/index.gohtml:31
#: web/templates/admin/amenity/index.gohtml:25
#: web/templates/admin/home/index.gohtml:54 #: web/templates/admin/home/index.gohtml:54
#: web/templates/admin/home/index.gohtml:99 #: web/templates/admin/home/index.gohtml:99
msgctxt "header" msgctxt "header"
@ -651,6 +656,7 @@ msgstr "Esteu segur de voler esborrar aquesta característica?"
#: web/templates/admin/surroundings/index.gohtml:101 #: web/templates/admin/surroundings/index.gohtml:101
#: web/templates/admin/amenity/feature/index.gohtml:47 #: web/templates/admin/amenity/feature/index.gohtml:47
#: web/templates/admin/amenity/carousel/index.gohtml:49 #: web/templates/admin/amenity/carousel/index.gohtml:49
#: web/templates/admin/amenity/index.gohtml:45
#: web/templates/admin/home/index.gohtml:71 #: web/templates/admin/home/index.gohtml:71
#: web/templates/admin/home/index.gohtml:116 #: web/templates/admin/home/index.gohtml:116
msgctxt "action" msgctxt "action"
@ -798,14 +804,14 @@ msgstr "Carrusel"
#: web/templates/admin/campsite/index.gohtml:36 #: web/templates/admin/campsite/index.gohtml:36
#: web/templates/admin/campsite/type/index.gohtml:45 #: web/templates/admin/campsite/type/index.gohtml:45
#: web/templates/admin/amenity/index.gohtml:33 #: web/templates/admin/amenity/index.gohtml:35
msgctxt "action" msgctxt "action"
msgid "Edit Features" msgid "Edit Features"
msgstr "Edita les característiques" msgstr "Edita les característiques"
#: web/templates/admin/campsite/index.gohtml:39 #: web/templates/admin/campsite/index.gohtml:39
#: web/templates/admin/campsite/type/index.gohtml:51 #: web/templates/admin/campsite/type/index.gohtml:51
#: web/templates/admin/amenity/index.gohtml:36 #: web/templates/admin/amenity/index.gohtml:38
msgctxt "action" msgctxt "action"
msgid "Edit Carousel" msgid "Edit Carousel"
msgstr "Edita el carrusel" msgstr "Edita el carrusel"
@ -814,7 +820,7 @@ msgstr "Edita el carrusel"
#: web/templates/admin/campsite/type/index.gohtml:53 #: web/templates/admin/campsite/type/index.gohtml:53
#: web/templates/admin/season/index.gohtml:44 #: web/templates/admin/season/index.gohtml:44
#: web/templates/admin/user/login-attempts.gohtml:31 #: web/templates/admin/user/login-attempts.gohtml:31
#: web/templates/admin/amenity/index.gohtml:38 #: web/templates/admin/amenity/index.gohtml:40
msgid "Yes" msgid "Yes"
msgstr "Sí" msgstr "Sí"
@ -822,7 +828,7 @@ msgstr "Sí"
#: web/templates/admin/campsite/type/index.gohtml:53 #: web/templates/admin/campsite/type/index.gohtml:53
#: web/templates/admin/season/index.gohtml:44 #: web/templates/admin/season/index.gohtml:44
#: web/templates/admin/user/login-attempts.gohtml:31 #: web/templates/admin/user/login-attempts.gohtml:31
#: web/templates/admin/amenity/index.gohtml:38 #: web/templates/admin/amenity/index.gohtml:40
msgid "No" msgid "No"
msgstr "No" msgstr "No"
@ -914,50 +920,60 @@ msgctxt "input"
msgid "Check-out" msgid "Check-out"
msgstr "Sortida" msgstr "Sortida"
#: web/templates/admin/campsite/type/form.gohtml:93 #: web/templates/admin/campsite/type/form.gohtml:94
msgctxt "input" msgctxt "input"
msgid "Maximum number of campers" msgid "Maximum number of campers"
msgstr "Número màxim de persones" msgstr "Número màxim de persones"
#: web/templates/admin/campsite/type/form.gohtml:103 #: web/templates/admin/campsite/type/form.gohtml:104
msgctxt "input"
msgid "Allow overflowing guests to neighbouring campsites"
msgstr "Permet reservar allotjaments veïns si es supera el màxim de persones"
#: web/templates/admin/campsite/type/form.gohtml:113
msgctxt "input"
msgid "Ask for zone preferences when booking"
msgstr "Demana la preferència de zona durant la reserva"
#: web/templates/admin/campsite/type/form.gohtml:121
msgctxt "input" msgctxt "input"
msgid "Dogs allowed" msgid "Dogs allowed"
msgstr "Es permeten gossos" msgstr "Es permeten gossos"
#: web/templates/admin/campsite/type/form.gohtml:115 #: web/templates/admin/campsite/type/form.gohtml:133
#: web/templates/admin/campsite/type/option/form.gohtml:76 #: web/templates/admin/campsite/type/option/form.gohtml:76
msgctxt "input" msgctxt "input"
msgid "Price per night" msgid "Price per night"
msgstr "Preu per nit" msgstr "Preu per nit"
#: web/templates/admin/campsite/type/form.gohtml:123 #: web/templates/admin/campsite/type/form.gohtml:141
msgctxt "input" msgctxt "input"
msgid "Minimum number of nights" msgid "Minimum number of nights"
msgstr "Número mínim de nits" msgstr "Número mínim de nits"
#: web/templates/admin/campsite/type/form.gohtml:135 #: web/templates/admin/campsite/type/form.gohtml:153
msgctxt "input" msgctxt "input"
msgid "Spiel" msgid "Spiel"
msgstr "Introducció" msgstr "Introducció"
#: web/templates/admin/campsite/type/form.gohtml:148 #: web/templates/admin/campsite/type/form.gohtml:166
msgctxt "input" msgctxt "input"
msgid "Info" msgid "Info"
msgstr "Informació" msgstr "Informació"
#: web/templates/admin/campsite/type/form.gohtml:161 #: web/templates/admin/campsite/type/form.gohtml:179
msgctxt "input" msgctxt "input"
msgid "Facilities" msgid "Facilities"
msgstr "Equipaments" msgstr "Equipaments"
#: web/templates/admin/campsite/type/form.gohtml:174 #: web/templates/admin/campsite/type/form.gohtml:192
#: web/templates/admin/services/form.gohtml:66 #: web/templates/admin/services/form.gohtml:66
#: web/templates/admin/surroundings/form.gohtml:54 #: web/templates/admin/surroundings/form.gohtml:54
msgctxt "input" msgctxt "input"
msgid "Description" msgid "Description"
msgstr "Descripció" msgstr "Descripció"
#: web/templates/admin/campsite/type/form.gohtml:187 #: web/templates/admin/campsite/type/form.gohtml:205
msgctxt "input" msgctxt "input"
msgid "Additional Information" msgid "Additional Information"
msgstr "Informació addicional" msgstr "Informació addicional"
@ -1432,7 +1448,11 @@ msgctxt "action"
msgid "Add Amenity" msgid "Add Amenity"
msgstr "Afegeix instaŀlació" msgstr "Afegeix instaŀlació"
#: web/templates/admin/amenity/index.gohtml:44 #: web/templates/admin/amenity/index.gohtml:29
msgid "Are you sure you wish to delete this amenity?"
msgstr "Esteu segur de voler esborrar aquesta instaŀlació?"
#: web/templates/admin/amenity/index.gohtml:53
msgid "No amenities added yet." msgid "No amenities added yet."
msgstr "No s’ha afegit cap instaŀlació encara." msgstr "No s’ha afegit cap instaŀlació encara."
@ -1650,15 +1670,15 @@ msgid "No booking found."
msgstr "No s’ha trobat cap reserva." msgstr "No s’ha trobat cap reserva."
#: pkg/legal/admin.go:258 pkg/app/user.go:249 pkg/campsite/types/option.go:357 #: pkg/legal/admin.go:258 pkg/app/user.go:249 pkg/campsite/types/option.go:357
#: pkg/campsite/types/feature.go:272 pkg/campsite/types/admin.go:483 #: pkg/campsite/types/feature.go:272 pkg/campsite/types/admin.go:497
#: pkg/campsite/feature.go:269 pkg/season/admin.go:412 #: pkg/campsite/feature.go:269 pkg/season/admin.go:412
#: pkg/services/admin.go:316 pkg/surroundings/admin.go:340 #: pkg/services/admin.go:316 pkg/surroundings/admin.go:340
#: pkg/amenity/feature.go:269 pkg/amenity/admin.go:270 #: pkg/amenity/feature.go:269 pkg/amenity/admin.go:283
msgid "Name can not be empty." msgid "Name can not be empty."
msgstr "No podeu deixar el nom en blanc." msgstr "No podeu deixar el nom en blanc."
#: pkg/legal/admin.go:259 pkg/campsite/types/option.go:358 #: pkg/legal/admin.go:259 pkg/campsite/types/option.go:358
#: pkg/campsite/types/feature.go:273 pkg/campsite/types/admin.go:484 #: pkg/campsite/types/feature.go:273 pkg/campsite/types/admin.go:498
#: pkg/campsite/feature.go:270 pkg/amenity/feature.go:270 #: pkg/campsite/feature.go:270 pkg/amenity/feature.go:270
msgid "Name must have at least one letter." msgid "Name must have at least one letter."
msgstr "El nom ha de tenir com a mínim una lletra." msgstr "El nom ha de tenir com a mínim una lletra."
@ -1688,12 +1708,12 @@ msgid "Slide image must be an image media type."
msgstr "La imatge de la diapositiva ha de ser un mèdia de tipus imatge." 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:217
#: pkg/booking/public.go:269 #: pkg/booking/public.go:312
msgid "Email can not be empty." msgid "Email can not be empty."
msgstr "No podeu deixar el correu-e en blanc." 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:218
#: pkg/booking/public.go:270 #: pkg/booking/public.go:313
msgid "This email is not valid. It should be like name@domain.com." 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." msgstr "Aquest correu-e no és vàlid. Hauria de ser similar a nom@domini.com."
@ -1750,15 +1770,15 @@ msgstr "El valor del màxim ha de ser un número enter."
msgid "Maximum must be equal or greater than minimum." msgid "Maximum must be equal or greater than minimum."
msgstr "El valor del màxim ha de ser igual o superir al del mínim." msgstr "El valor del màxim ha de ser igual o superir al del mínim."
#: pkg/campsite/types/option.go:374 pkg/campsite/types/admin.go:499 #: pkg/campsite/types/option.go:374 pkg/campsite/types/admin.go:513
msgid "Price per night can not be empty." msgid "Price per night can not be empty."
msgstr "No podeu deixar el preu per nit en blanc." msgstr "No podeu deixar el preu per nit en blanc."
#: pkg/campsite/types/option.go:375 pkg/campsite/types/admin.go:500 #: pkg/campsite/types/option.go:375 pkg/campsite/types/admin.go:514
msgid "Price per night must be a decimal number." msgid "Price per night must be a decimal number."
msgstr "El preu per nit ha de ser un número decimal." msgstr "El preu per nit ha de ser un número decimal."
#: pkg/campsite/types/option.go:376 pkg/campsite/types/admin.go:501 #: pkg/campsite/types/option.go:376 pkg/campsite/types/admin.go:515
msgid "Price per night must be zero or greater." msgid "Price per night must be zero or greater."
msgstr "El preu per nit ha de ser com a mínim zero." msgstr "El preu per nit ha de ser com a mínim zero."
@ -1767,61 +1787,61 @@ msgstr "El preu per nit ha de ser com a mínim zero."
msgid "Selected icon is not valid." msgid "Selected icon is not valid."
msgstr "La icona escollida no és vàlida." msgstr "La icona escollida no és vàlida."
#: pkg/campsite/types/admin.go:307 #: pkg/campsite/types/admin.go:309
msgctxt "input" msgctxt "input"
msgid "Cover image" msgid "Cover image"
msgstr "Imatge de portada" msgstr "Imatge de portada"
#: pkg/campsite/types/admin.go:308 #: pkg/campsite/types/admin.go:310
msgctxt "action" msgctxt "action"
msgid "Set campsite type cover" msgid "Set campsite type cover"
msgstr "Estableix la portada del tipus d’allotjament" msgstr "Estableix la portada del tipus d’allotjament"
#: pkg/campsite/types/admin.go:486 #: pkg/campsite/types/admin.go:500
msgid "Check-in can not be empty." msgid "Check-in can not be empty."
msgstr "No podeu deixar l’entrada en blanc." msgstr "No podeu deixar l’entrada en blanc."
#: pkg/campsite/types/admin.go:487 #: pkg/campsite/types/admin.go:501
msgid "Check-out can not be empty." msgid "Check-out can not be empty."
msgstr "No podeu deixar la sortida en blanc." msgstr "No podeu deixar la sortida en blanc."
#: pkg/campsite/types/admin.go:488 #: pkg/campsite/types/admin.go:502
msgid "Cover image can not be empty." msgid "Cover image can not be empty."
msgstr "No podeu deixar la imatge de portada en blanc." msgstr "No podeu deixar la imatge de portada en blanc."
#: pkg/campsite/types/admin.go:489 #: pkg/campsite/types/admin.go:503
msgid "Cover image must be an image media type." msgid "Cover image must be an image media type."
msgstr "La imatge de portada ha de ser un mèdia de tipus imatge." msgstr "La imatge de portada ha de ser un mèdia de tipus imatge."
#: pkg/campsite/types/admin.go:493 #: pkg/campsite/types/admin.go:507
msgid "Maximum number of campers can not be empty." msgid "Maximum number of campers can not be empty."
msgstr "No podeu deixar el número màxim de persones en blanc." msgstr "No podeu deixar el número màxim de persones en blanc."
#: pkg/campsite/types/admin.go:494 #: pkg/campsite/types/admin.go:508
msgid "Maximum number of campers must be an integer number." msgid "Maximum number of campers must be an integer number."
msgstr "El número màxim de persones ha de ser enter." msgstr "El número màxim de persones ha de ser enter."
#: pkg/campsite/types/admin.go:495 #: pkg/campsite/types/admin.go:509
msgid "Maximum number of campers must be one or greater." msgid "Maximum number of campers must be one or greater."
msgstr "El número màxim de persones no pot ser zero." msgstr "El número màxim de persones no pot ser zero."
#: pkg/campsite/types/admin.go:504 #: pkg/campsite/types/admin.go:518
msgid "Minimum number of nights can not be empty." msgid "Minimum number of nights can not be empty."
msgstr "No podeu deixar el número mínim de nits en blanc." msgstr "No podeu deixar el número mínim de nits en blanc."
#: pkg/campsite/types/admin.go:505 #: pkg/campsite/types/admin.go:519
msgid "Minimum number of nights must be an integer." msgid "Minimum number of nights must be an integer."
msgstr "El número mínim de nits ha de ser enter." msgstr "El número mínim de nits ha de ser enter."
#: pkg/campsite/types/admin.go:506 #: pkg/campsite/types/admin.go:520
msgid "Minimum number of nights must be one or greater." msgid "Minimum number of nights must be one or greater."
msgstr "El número mínim de nits no pot ser zero." msgstr "El número mínim de nits no pot ser zero."
#: pkg/campsite/admin.go:275 pkg/booking/public.go:278 #: pkg/campsite/admin.go:275 pkg/booking/public.go:321
msgid "Selected campsite type is not valid." msgid "Selected campsite type is not valid."
msgstr "El tipus d’allotjament escollit no és vàlid." msgstr "El tipus d’allotjament escollit no és vàlid."
#: pkg/campsite/admin.go:276 pkg/amenity/admin.go:269 #: pkg/campsite/admin.go:276 pkg/amenity/admin.go:282
msgid "Label can not be empty." msgid "Label can not be empty."
msgstr "No podeu deixar l’etiqueta en blanc." msgstr "No podeu deixar l’etiqueta en blanc."
@ -1973,7 +1993,7 @@ msgstr "No podeu deixar l’adreça de l’enllaç en blanc."
msgid "This web address is not valid. It should be like https://domain.com/." 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/." 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:256 #: pkg/company/admin.go:200 pkg/booking/public.go:299
msgid "Selected country is not valid." msgid "Selected country is not valid."
msgstr "El país escollit no és vàlid." msgstr "El país escollit no és vàlid."
@ -1993,11 +2013,11 @@ msgstr "No podeu deixar el NIF en blanc."
msgid "This VAT number is not valid." msgid "This VAT number is not valid."
msgstr "Aquest NIF no és vàlid." msgstr "Aquest NIF no és vàlid."
#: pkg/company/admin.go:212 pkg/booking/public.go:272 #: pkg/company/admin.go:212 pkg/booking/public.go:315
msgid "Phone can not be empty." msgid "Phone can not be empty."
msgstr "No podeu deixar el telèfon en blanc." msgstr "No podeu deixar el telèfon en blanc."
#: pkg/company/admin.go:213 pkg/booking/public.go:273 #: pkg/company/admin.go:213 pkg/booking/public.go:316
msgid "This phone number is not valid." msgid "This phone number is not valid."
msgstr "Aquest número de telèfon no és vàlid." msgstr "Aquest número de telèfon no és vàlid."
@ -2017,7 +2037,7 @@ msgstr "No podeu deixar la província en blanc."
msgid "Postal code can not be empty." msgid "Postal code can not be empty."
msgstr "No podeu deixar el codi postal en blanc." msgstr "No podeu deixar el codi postal en blanc."
#: pkg/company/admin.go:227 pkg/booking/public.go:265 #: pkg/company/admin.go:227 pkg/booking/public.go:308
msgid "This postal code is not valid." msgid "This postal code is not valid."
msgstr "Aquest codi postal no és vàlid." msgstr "Aquest codi postal no és vàlid."
@ -2114,54 +2134,54 @@ msgstr "La integració escollida no és vàlida."
msgid "The merchant key is not valid." msgid "The merchant key is not valid."
msgstr "Aquesta clau del comerç no és vàlid." msgstr "Aquesta clau del comerç no és vàlid."
#: pkg/booking/public.go:260 #: pkg/booking/public.go:303
msgid "Full name can not be empty." msgid "Full name can not be empty."
msgstr "No podeu deixar el nom i els cognoms en blanc." msgstr "No podeu deixar el nom i els cognoms en blanc."
#: pkg/booking/public.go:261 #: pkg/booking/public.go:304
msgid "Full name must have at least one letter." msgid "Full name must have at least one letter."
msgstr "El nom i els cognoms han de tenir com a mínim una lletra." msgstr "El nom i els cognoms han de tenir com a mínim una lletra."
#: pkg/booking/public.go:279 #: pkg/booking/public.go:322
msgid "Arrival date can not be empty" msgid "Arrival date can not be empty"
msgstr "No podeu deixar la data d’arribada en blanc." msgstr "No podeu deixar la data d’arribada en blanc."
#: pkg/booking/public.go:280 #: pkg/booking/public.go:323
msgid "Arrival date must be a valid date." msgid "Arrival date must be a valid date."
msgstr "La data d’arribada ha de ser una data vàlida." msgstr "La data d’arribada ha de ser una data vàlida."
#: pkg/booking/public.go:284 #: pkg/booking/public.go:327
msgid "Departure date can not be empty" msgid "Departure date can not be empty"
msgstr "No podeu deixar la data de sortida en blanc." msgstr "No podeu deixar la data de sortida en blanc."
#: pkg/booking/public.go:285 #: pkg/booking/public.go:328
msgid "Departure date must be a valid date." msgid "Departure date must be a valid date."
msgstr "La data de sortida ha de ser una data vàlida." msgstr "La data de sortida ha de ser una data vàlida."
#: pkg/booking/public.go:286 #: pkg/booking/public.go:329
msgid "The departure date must be after the arrival date." msgid "The departure date must be after the arrival date."
msgstr "La data de sortida ha de ser posterior a la d’arribada." msgstr "La data de sortida ha de ser posterior a la d’arribada."
#: pkg/booking/public.go:289 #: pkg/booking/public.go:332
msgid "It is mandatory to agree to the reservation conditions." msgid "It is mandatory to agree to the reservation conditions."
msgstr "És obligatori acceptar les condicions de reserves." msgstr "És obligatori acceptar les condicions de reserves."
#: pkg/booking/public.go:292 #: pkg/booking/public.go:335
#, c-format #, c-format
msgid "%s can not be empty" msgid "%s can not be empty"
msgstr "No podeu deixar %s en blanc." msgstr "No podeu deixar %s en blanc."
#: pkg/booking/public.go:293 #: pkg/booking/public.go:336
#, c-format #, c-format
msgid "%s must be an integer." msgid "%s must be an integer."
msgstr "%s ha de ser un número enter." msgstr "%s ha de ser un número enter."
#: pkg/booking/public.go:294 #: pkg/booking/public.go:337
#, c-format #, c-format
msgid "%s must be %d or greater." msgid "%s must be %d or greater."
msgstr "El valor de %s ha de ser com a mínim %d." msgstr "El valor de %s ha de ser com a mínim %d."
#: pkg/booking/public.go:295 #: pkg/booking/public.go:338
#, c-format #, c-format
msgid "%s must be at most %d." msgid "%s must be at most %d."
msgstr "El valor de %s ha de ser com a màxim %d." msgstr "El valor de %s ha de ser com a màxim %d."

146
po/es.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: camper\n" "Project-Id-Version: camper\n"
"Report-Msgid-Bugs-To: jordi@tandem.blog\n" "Report-Msgid-Bugs-To: jordi@tandem.blog\n"
"POT-Creation-Date: 2024-01-27 22:29+0100\n" "POT-Creation-Date: 2024-01-29 03:30+0100\n"
"PO-Revision-Date: 2023-07-22 23:46+0200\n" "PO-Revision-Date: 2023-07-22 23:46+0200\n"
"Last-Translator: jordi fita mas <jordi@tandem.blog>\n" "Last-Translator: jordi fita mas <jordi@tandem.blog>\n"
"Language-Team: Spanish <es@tp.org.es>\n" "Language-Team: Spanish <es@tp.org.es>\n"
@ -124,7 +124,7 @@ msgid "Check-out Date"
msgstr "Fecha de salida" msgstr "Fecha de salida"
#: web/templates/public/campsite/type.gohtml:54 #: web/templates/public/campsite/type.gohtml:54
#: web/templates/public/booking.gohtml:164 #: web/templates/public/booking.gohtml:169
msgctxt "action" msgctxt "action"
msgid "Book" msgid "Book"
msgstr "Reservar" msgstr "Reservar"
@ -136,7 +136,7 @@ msgid "Calendar"
msgstr "Calendario" msgstr "Calendario"
#: web/templates/public/campsite/type.gohtml:73 #: web/templates/public/campsite/type.gohtml:73
#: web/templates/admin/campsite/type/form.gohtml:109 #: web/templates/admin/campsite/type/form.gohtml:127
#: web/templates/admin/campsite/type/option/form.gohtml:70 #: web/templates/admin/campsite/type/option/form.gohtml:70
msgctxt "title" msgctxt "title"
msgid "Prices" msgid "Prices"
@ -351,32 +351,36 @@ msgctxt "title"
msgid "Accommodation" msgid "Accommodation"
msgstr "Alojamientos" msgstr "Alojamientos"
#: web/templates/public/booking.gohtml:99 #: web/templates/public/booking.gohtml:101
msgctxt "input" msgctxt "input"
msgid "Area preferences (optional)" msgid "Area preferences (optional)"
msgstr "Preferencias de área (opcional)" msgstr "Preferencias de área (opcional)"
#: web/templates/public/booking.gohtml:121 #: web/templates/public/booking.gohtml:108
msgid "Campground map"
msgstr "Mapa del camping"
#: web/templates/public/booking.gohtml:126
msgctxt "title" msgctxt "title"
msgid "Booking Period" msgid "Booking Period"
msgstr "Periodo de reserva" msgstr "Periodo de reserva"
#: web/templates/public/booking.gohtml:124 #: web/templates/public/booking.gohtml:129
msgctxt "input" msgctxt "input"
msgid "Arrival date" msgid "Arrival date"
msgstr "Fecha de llegada" msgstr "Fecha de llegada"
#: web/templates/public/booking.gohtml:133 #: web/templates/public/booking.gohtml:138
msgctxt "input" msgctxt "input"
msgid "Departure date" msgid "Departure date"
msgstr "Fecha de salida" msgstr "Fecha de salida"
#: web/templates/public/booking.gohtml:144 #: web/templates/public/booking.gohtml:149
msgctxt "input" msgctxt "input"
msgid "ACSI card? (optional)" msgid "ACSI card? (optional)"
msgstr "¿Tarjeta ACSI? (opcional)" msgstr "¿Tarjeta ACSI? (opcional)"
#: web/templates/public/booking.gohtml:151 #: web/templates/public/booking.gohtml:156
msgctxt "input" msgctxt "input"
msgid "I have read and I accept %[1]sthe reservation conditions%[2]s" msgid "I have read and I accept %[1]sthe reservation conditions%[2]s"
msgstr "He leído y acepto %[1]slas condiciones de reserva%[2]s" msgstr "He leído y acepto %[1]slas condiciones de reserva%[2]s"
@ -481,7 +485,7 @@ msgstr "Contenido"
#: web/templates/admin/campsite/form.gohtml:92 #: web/templates/admin/campsite/form.gohtml:92
#: web/templates/admin/campsite/type/feature/form.gohtml:74 #: web/templates/admin/campsite/type/feature/form.gohtml:74
#: web/templates/admin/campsite/type/carousel/form.gohtml:59 #: web/templates/admin/campsite/type/carousel/form.gohtml:59
#: web/templates/admin/campsite/type/form.gohtml:202 #: web/templates/admin/campsite/type/form.gohtml:220
#: web/templates/admin/campsite/type/option/form.gohtml:90 #: web/templates/admin/campsite/type/option/form.gohtml:90
#: web/templates/admin/season/form.gohtml:73 #: web/templates/admin/season/form.gohtml:73
#: web/templates/admin/services/form.gohtml:81 #: web/templates/admin/services/form.gohtml:81
@ -503,7 +507,7 @@ msgstr "Actualizar"
#: web/templates/admin/campsite/form.gohtml:94 #: web/templates/admin/campsite/form.gohtml:94
#: web/templates/admin/campsite/type/feature/form.gohtml:76 #: web/templates/admin/campsite/type/feature/form.gohtml:76
#: web/templates/admin/campsite/type/carousel/form.gohtml:61 #: web/templates/admin/campsite/type/carousel/form.gohtml:61
#: web/templates/admin/campsite/type/form.gohtml:204 #: web/templates/admin/campsite/type/form.gohtml:222
#: web/templates/admin/campsite/type/option/form.gohtml:92 #: web/templates/admin/campsite/type/option/form.gohtml:92
#: web/templates/admin/season/form.gohtml:75 #: web/templates/admin/season/form.gohtml:75
#: web/templates/admin/services/form.gohtml:83 #: web/templates/admin/services/form.gohtml:83
@ -627,6 +631,7 @@ msgstr "Añadir características"
#: web/templates/admin/surroundings/index.gohtml:84 #: web/templates/admin/surroundings/index.gohtml:84
#: web/templates/admin/amenity/feature/index.gohtml:31 #: web/templates/admin/amenity/feature/index.gohtml:31
#: web/templates/admin/amenity/carousel/index.gohtml:31 #: web/templates/admin/amenity/carousel/index.gohtml:31
#: web/templates/admin/amenity/index.gohtml:25
#: web/templates/admin/home/index.gohtml:54 #: web/templates/admin/home/index.gohtml:54
#: web/templates/admin/home/index.gohtml:99 #: web/templates/admin/home/index.gohtml:99
msgctxt "header" msgctxt "header"
@ -651,6 +656,7 @@ msgstr "¿Estáis seguro de querer borrar esta característica?"
#: web/templates/admin/surroundings/index.gohtml:101 #: web/templates/admin/surroundings/index.gohtml:101
#: web/templates/admin/amenity/feature/index.gohtml:47 #: web/templates/admin/amenity/feature/index.gohtml:47
#: web/templates/admin/amenity/carousel/index.gohtml:49 #: web/templates/admin/amenity/carousel/index.gohtml:49
#: web/templates/admin/amenity/index.gohtml:45
#: web/templates/admin/home/index.gohtml:71 #: web/templates/admin/home/index.gohtml:71
#: web/templates/admin/home/index.gohtml:116 #: web/templates/admin/home/index.gohtml:116
msgctxt "action" msgctxt "action"
@ -798,14 +804,14 @@ msgstr "Carrusel"
#: web/templates/admin/campsite/index.gohtml:36 #: web/templates/admin/campsite/index.gohtml:36
#: web/templates/admin/campsite/type/index.gohtml:45 #: web/templates/admin/campsite/type/index.gohtml:45
#: web/templates/admin/amenity/index.gohtml:33 #: web/templates/admin/amenity/index.gohtml:35
msgctxt "action" msgctxt "action"
msgid "Edit Features" msgid "Edit Features"
msgstr "Editar las características" msgstr "Editar las características"
#: web/templates/admin/campsite/index.gohtml:39 #: web/templates/admin/campsite/index.gohtml:39
#: web/templates/admin/campsite/type/index.gohtml:51 #: web/templates/admin/campsite/type/index.gohtml:51
#: web/templates/admin/amenity/index.gohtml:36 #: web/templates/admin/amenity/index.gohtml:38
msgctxt "action" msgctxt "action"
msgid "Edit Carousel" msgid "Edit Carousel"
msgstr "Editar el carrusel" msgstr "Editar el carrusel"
@ -814,7 +820,7 @@ msgstr "Editar el carrusel"
#: web/templates/admin/campsite/type/index.gohtml:53 #: web/templates/admin/campsite/type/index.gohtml:53
#: web/templates/admin/season/index.gohtml:44 #: web/templates/admin/season/index.gohtml:44
#: web/templates/admin/user/login-attempts.gohtml:31 #: web/templates/admin/user/login-attempts.gohtml:31
#: web/templates/admin/amenity/index.gohtml:38 #: web/templates/admin/amenity/index.gohtml:40
msgid "Yes" msgid "Yes"
msgstr "Sí" msgstr "Sí"
@ -822,7 +828,7 @@ msgstr "Sí"
#: web/templates/admin/campsite/type/index.gohtml:53 #: web/templates/admin/campsite/type/index.gohtml:53
#: web/templates/admin/season/index.gohtml:44 #: web/templates/admin/season/index.gohtml:44
#: web/templates/admin/user/login-attempts.gohtml:31 #: web/templates/admin/user/login-attempts.gohtml:31
#: web/templates/admin/amenity/index.gohtml:38 #: web/templates/admin/amenity/index.gohtml:40
msgid "No" msgid "No"
msgstr "No" msgstr "No"
@ -914,50 +920,60 @@ msgctxt "input"
msgid "Check-out" msgid "Check-out"
msgstr "Salida" msgstr "Salida"
#: web/templates/admin/campsite/type/form.gohtml:93 #: web/templates/admin/campsite/type/form.gohtml:94
msgctxt "input" msgctxt "input"
msgid "Maximum number of campers" msgid "Maximum number of campers"
msgstr "Número máximo de personas" msgstr "Número máximo de personas"
#: web/templates/admin/campsite/type/form.gohtml:103 #: web/templates/admin/campsite/type/form.gohtml:104
msgctxt "input"
msgid "Allow overflowing guests to neighbouring campsites"
msgstr "Permitir reservar alojamientos vecinos si se supera el máximo de personas"
#: web/templates/admin/campsite/type/form.gohtml:113
msgctxt "input"
msgid "Ask for zone preferences when booking"
msgstr "Pedir la preferencia de zona durante la reserva"
#: web/templates/admin/campsite/type/form.gohtml:121
msgctxt "input" msgctxt "input"
msgid "Dogs allowed" msgid "Dogs allowed"
msgstr "Se permiten perros" msgstr "Se permiten perros"
#: web/templates/admin/campsite/type/form.gohtml:115 #: web/templates/admin/campsite/type/form.gohtml:133
#: web/templates/admin/campsite/type/option/form.gohtml:76 #: web/templates/admin/campsite/type/option/form.gohtml:76
msgctxt "input" msgctxt "input"
msgid "Price per night" msgid "Price per night"
msgstr "Precio por noche" msgstr "Precio por noche"
#: web/templates/admin/campsite/type/form.gohtml:123 #: web/templates/admin/campsite/type/form.gohtml:141
msgctxt "input" msgctxt "input"
msgid "Minimum number of nights" msgid "Minimum number of nights"
msgstr "Número mínimos de noches" msgstr "Número mínimos de noches"
#: web/templates/admin/campsite/type/form.gohtml:135 #: web/templates/admin/campsite/type/form.gohtml:153
msgctxt "input" msgctxt "input"
msgid "Spiel" msgid "Spiel"
msgstr "Introducción" msgstr "Introducción"
#: web/templates/admin/campsite/type/form.gohtml:148 #: web/templates/admin/campsite/type/form.gohtml:166
msgctxt "input" msgctxt "input"
msgid "Info" msgid "Info"
msgstr "Información" msgstr "Información"
#: web/templates/admin/campsite/type/form.gohtml:161 #: web/templates/admin/campsite/type/form.gohtml:179
msgctxt "input" msgctxt "input"
msgid "Facilities" msgid "Facilities"
msgstr "Equipamento" msgstr "Equipamento"
#: web/templates/admin/campsite/type/form.gohtml:174 #: web/templates/admin/campsite/type/form.gohtml:192
#: web/templates/admin/services/form.gohtml:66 #: web/templates/admin/services/form.gohtml:66
#: web/templates/admin/surroundings/form.gohtml:54 #: web/templates/admin/surroundings/form.gohtml:54
msgctxt "input" msgctxt "input"
msgid "Description" msgid "Description"
msgstr "Descripción" msgstr "Descripción"
#: web/templates/admin/campsite/type/form.gohtml:187 #: web/templates/admin/campsite/type/form.gohtml:205
msgctxt "input" msgctxt "input"
msgid "Additional Information" msgid "Additional Information"
msgstr "Información adicional" msgstr "Información adicional"
@ -1432,7 +1448,11 @@ msgctxt "action"
msgid "Add Amenity" msgid "Add Amenity"
msgstr "Añadir instalación" msgstr "Añadir instalación"
#: web/templates/admin/amenity/index.gohtml:44 #: web/templates/admin/amenity/index.gohtml:29
msgid "Are you sure you wish to delete this amenity?"
msgstr "¿Estáis seguro de querer borrar esta instalación?"
#: web/templates/admin/amenity/index.gohtml:53
msgid "No amenities added yet." msgid "No amenities added yet."
msgstr "No se ha añadido ninguna instalación todavía." msgstr "No se ha añadido ninguna instalación todavía."
@ -1650,15 +1670,15 @@ msgid "No booking found."
msgstr "No se ha encontrado ninguna reserva." msgstr "No se ha encontrado ninguna reserva."
#: pkg/legal/admin.go:258 pkg/app/user.go:249 pkg/campsite/types/option.go:357 #: pkg/legal/admin.go:258 pkg/app/user.go:249 pkg/campsite/types/option.go:357
#: pkg/campsite/types/feature.go:272 pkg/campsite/types/admin.go:483 #: pkg/campsite/types/feature.go:272 pkg/campsite/types/admin.go:497
#: pkg/campsite/feature.go:269 pkg/season/admin.go:412 #: pkg/campsite/feature.go:269 pkg/season/admin.go:412
#: pkg/services/admin.go:316 pkg/surroundings/admin.go:340 #: pkg/services/admin.go:316 pkg/surroundings/admin.go:340
#: pkg/amenity/feature.go:269 pkg/amenity/admin.go:270 #: pkg/amenity/feature.go:269 pkg/amenity/admin.go:283
msgid "Name can not be empty." msgid "Name can not be empty."
msgstr "No podéis dejar el nombre en blanco." msgstr "No podéis dejar el nombre en blanco."
#: pkg/legal/admin.go:259 pkg/campsite/types/option.go:358 #: pkg/legal/admin.go:259 pkg/campsite/types/option.go:358
#: pkg/campsite/types/feature.go:273 pkg/campsite/types/admin.go:484 #: pkg/campsite/types/feature.go:273 pkg/campsite/types/admin.go:498
#: pkg/campsite/feature.go:270 pkg/amenity/feature.go:270 #: pkg/campsite/feature.go:270 pkg/amenity/feature.go:270
msgid "Name must have at least one letter." msgid "Name must have at least one letter."
msgstr "El nombre tiene que tener como mínimo una letra." msgstr "El nombre tiene que tener como mínimo una letra."
@ -1688,12 +1708,12 @@ msgid "Slide image must be an image media type."
msgstr "La imagen de la diapositiva tiene que ser un medio de tipo imagen." 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:217
#: pkg/booking/public.go:269 #: pkg/booking/public.go:312
msgid "Email can not be empty." msgid "Email can not be empty."
msgstr "No podéis dejar el correo-e en blanco." 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:218
#: pkg/booking/public.go:270 #: pkg/booking/public.go:313
msgid "This email is not valid. It should be like name@domain.com." 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." msgstr "Este correo-e no es válido. Tiene que ser parecido a nombre@dominio.com."
@ -1750,15 +1770,15 @@ msgstr "El valor del máximo tiene que ser un número entero."
msgid "Maximum must be equal or greater than minimum." msgid "Maximum must be equal or greater than minimum."
msgstr "El valor del máximo tiene que ser igual o mayor al del mínimo." msgstr "El valor del máximo tiene que ser igual o mayor al del mínimo."
#: pkg/campsite/types/option.go:374 pkg/campsite/types/admin.go:499 #: pkg/campsite/types/option.go:374 pkg/campsite/types/admin.go:513
msgid "Price per night can not be empty." msgid "Price per night can not be empty."
msgstr "No podéis dejar el precio por noche en blanco." msgstr "No podéis dejar el precio por noche en blanco."
#: pkg/campsite/types/option.go:375 pkg/campsite/types/admin.go:500 #: pkg/campsite/types/option.go:375 pkg/campsite/types/admin.go:514
msgid "Price per night must be a decimal number." msgid "Price per night must be a decimal number."
msgstr "El precio por noche tiene que ser un número decimal." msgstr "El precio por noche tiene que ser un número decimal."
#: pkg/campsite/types/option.go:376 pkg/campsite/types/admin.go:501 #: pkg/campsite/types/option.go:376 pkg/campsite/types/admin.go:515
msgid "Price per night must be zero or greater." msgid "Price per night must be zero or greater."
msgstr "El precio por noche tiene que ser como mínimo cero." msgstr "El precio por noche tiene que ser como mínimo cero."
@ -1767,61 +1787,61 @@ msgstr "El precio por noche tiene que ser como mínimo cero."
msgid "Selected icon is not valid." msgid "Selected icon is not valid."
msgstr "El icono escogido no es válido." msgstr "El icono escogido no es válido."
#: pkg/campsite/types/admin.go:307 #: pkg/campsite/types/admin.go:309
msgctxt "input" msgctxt "input"
msgid "Cover image" msgid "Cover image"
msgstr "Imagen de portada" msgstr "Imagen de portada"
#: pkg/campsite/types/admin.go:308 #: pkg/campsite/types/admin.go:310
msgctxt "action" msgctxt "action"
msgid "Set campsite type cover" msgid "Set campsite type cover"
msgstr "Establecer la portada del tipo de alojamiento" msgstr "Establecer la portada del tipo de alojamiento"
#: pkg/campsite/types/admin.go:486 #: pkg/campsite/types/admin.go:500
msgid "Check-in can not be empty." msgid "Check-in can not be empty."
msgstr "No podéis dejar la entrada en blanco." msgstr "No podéis dejar la entrada en blanco."
#: pkg/campsite/types/admin.go:487 #: pkg/campsite/types/admin.go:501
msgid "Check-out can not be empty." msgid "Check-out can not be empty."
msgstr "No podéis dejar la salida en blanco." msgstr "No podéis dejar la salida en blanco."
#: pkg/campsite/types/admin.go:488 #: pkg/campsite/types/admin.go:502
msgid "Cover image can not be empty." msgid "Cover image can not be empty."
msgstr "No podéis dejar la imagen de portada en blanco." msgstr "No podéis dejar la imagen de portada en blanco."
#: pkg/campsite/types/admin.go:489 #: pkg/campsite/types/admin.go:503
msgid "Cover image must be an image media type." msgid "Cover image must be an image media type."
msgstr "La imagen de portada tiene que ser un medio de tipo imagen." msgstr "La imagen de portada tiene que ser un medio de tipo imagen."
#: pkg/campsite/types/admin.go:493 #: pkg/campsite/types/admin.go:507
msgid "Maximum number of campers can not be empty." msgid "Maximum number of campers can not be empty."
msgstr "No podéis dejar el número máximo de personas en blanco." msgstr "No podéis dejar el número máximo de personas en blanco."
#: pkg/campsite/types/admin.go:494 #: pkg/campsite/types/admin.go:508
msgid "Maximum number of campers must be an integer number." msgid "Maximum number of campers must be an integer number."
msgstr "El número máximo de personas tiene que ser entero." msgstr "El número máximo de personas tiene que ser entero."
#: pkg/campsite/types/admin.go:495 #: pkg/campsite/types/admin.go:509
msgid "Maximum number of campers must be one or greater." msgid "Maximum number of campers must be one or greater."
msgstr "El número máximo de personas no puede ser cero." msgstr "El número máximo de personas no puede ser cero."
#: pkg/campsite/types/admin.go:504 #: pkg/campsite/types/admin.go:518
msgid "Minimum number of nights can not be empty." msgid "Minimum number of nights can not be empty."
msgstr "No podéis dejar el número mínimo de noches en blanco." msgstr "No podéis dejar el número mínimo de noches en blanco."
#: pkg/campsite/types/admin.go:505 #: pkg/campsite/types/admin.go:519
msgid "Minimum number of nights must be an integer." msgid "Minimum number of nights must be an integer."
msgstr "El número mínimo de noches tiene que ser entero." msgstr "El número mínimo de noches tiene que ser entero."
#: pkg/campsite/types/admin.go:506 #: pkg/campsite/types/admin.go:520
msgid "Minimum number of nights must be one or greater." msgid "Minimum number of nights must be one or greater."
msgstr "El número mínimo de noches no puede ser cero." msgstr "El número mínimo de noches no puede ser cero."
#: pkg/campsite/admin.go:275 pkg/booking/public.go:278 #: pkg/campsite/admin.go:275 pkg/booking/public.go:321
msgid "Selected campsite type is not valid." msgid "Selected campsite type is not valid."
msgstr "El tipo de alojamiento escogido no es válido." msgstr "El tipo de alojamiento escogido no es válido."
#: pkg/campsite/admin.go:276 pkg/amenity/admin.go:269 #: pkg/campsite/admin.go:276 pkg/amenity/admin.go:282
msgid "Label can not be empty." msgid "Label can not be empty."
msgstr "No podéis dejar la etiqueta en blanco." msgstr "No podéis dejar la etiqueta en blanco."
@ -1973,7 +1993,7 @@ msgstr "No podéis dejar la dirección del enlace en blanco."
msgid "This web address is not valid. It should be like https://domain.com/." 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/." 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:256 #: pkg/company/admin.go:200 pkg/booking/public.go:299
msgid "Selected country is not valid." msgid "Selected country is not valid."
msgstr "El país escogido no es válido." msgstr "El país escogido no es válido."
@ -1993,11 +2013,11 @@ msgstr "No podéis dejar el NIF en blanco."
msgid "This VAT number is not valid." msgid "This VAT number is not valid."
msgstr "Este NIF no es válido." msgstr "Este NIF no es válido."
#: pkg/company/admin.go:212 pkg/booking/public.go:272 #: pkg/company/admin.go:212 pkg/booking/public.go:315
msgid "Phone can not be empty." msgid "Phone can not be empty."
msgstr "No podéis dejar el teléfono en blanco." msgstr "No podéis dejar el teléfono en blanco."
#: pkg/company/admin.go:213 pkg/booking/public.go:273 #: pkg/company/admin.go:213 pkg/booking/public.go:316
msgid "This phone number is not valid." msgid "This phone number is not valid."
msgstr "Este teléfono no es válido." msgstr "Este teléfono no es válido."
@ -2017,7 +2037,7 @@ msgstr "No podéis dejar la provincia en blanco."
msgid "Postal code can not be empty." msgid "Postal code can not be empty."
msgstr "No podéis dejar el código postal en blanco." msgstr "No podéis dejar el código postal en blanco."
#: pkg/company/admin.go:227 pkg/booking/public.go:265 #: pkg/company/admin.go:227 pkg/booking/public.go:308
msgid "This postal code is not valid." msgid "This postal code is not valid."
msgstr "Este código postal no es válido." msgstr "Este código postal no es válido."
@ -2114,54 +2134,54 @@ msgstr "La integración escogida no es válida."
msgid "The merchant key is not valid." msgid "The merchant key is not valid."
msgstr "Esta clave del comercio no es válida." msgstr "Esta clave del comercio no es válida."
#: pkg/booking/public.go:260 #: pkg/booking/public.go:303
msgid "Full name can not be empty." msgid "Full name can not be empty."
msgstr "No podéis dejar el nombre y los apellidos en blanco." msgstr "No podéis dejar el nombre y los apellidos en blanco."
#: pkg/booking/public.go:261 #: pkg/booking/public.go:304
msgid "Full name must have at least one letter." msgid "Full name must have at least one letter."
msgstr "El nombre y los apellidos tienen que tener como mínimo una letra." msgstr "El nombre y los apellidos tienen que tener como mínimo una letra."
#: pkg/booking/public.go:279 #: pkg/booking/public.go:322
msgid "Arrival date can not be empty" msgid "Arrival date can not be empty"
msgstr "No podéis dejar la fecha de llegada en blanco." msgstr "No podéis dejar la fecha de llegada en blanco."
#: pkg/booking/public.go:280 #: pkg/booking/public.go:323
msgid "Arrival date must be a valid date." msgid "Arrival date must be a valid date."
msgstr "La fecha de llegada tiene que ser una fecha válida." msgstr "La fecha de llegada tiene que ser una fecha válida."
#: pkg/booking/public.go:284 #: pkg/booking/public.go:327
msgid "Departure date can not be empty" msgid "Departure date can not be empty"
msgstr "No podéis dejar la fecha de partida en blanco." msgstr "No podéis dejar la fecha de partida en blanco."
#: pkg/booking/public.go:285 #: pkg/booking/public.go:328
msgid "Departure date must be a valid date." msgid "Departure date must be a valid date."
msgstr "La fecha de partida tiene que ser una fecha válida." msgstr "La fecha de partida tiene que ser una fecha válida."
#: pkg/booking/public.go:286 #: pkg/booking/public.go:329
msgid "The departure date must be after the arrival date." msgid "The departure date must be after the arrival date."
msgstr "La fecha de partida tiene que ser posterior a la de llegada." msgstr "La fecha de partida tiene que ser posterior a la de llegada."
#: pkg/booking/public.go:289 #: pkg/booking/public.go:332
msgid "It is mandatory to agree to the reservation conditions." msgid "It is mandatory to agree to the reservation conditions."
msgstr "Es obligatorio aceptar las condiciones de reserva." msgstr "Es obligatorio aceptar las condiciones de reserva."
#: pkg/booking/public.go:292 #: pkg/booking/public.go:335
#, c-format #, c-format
msgid "%s can not be empty" msgid "%s can not be empty"
msgstr "No podéis dejar %s en blanco." msgstr "No podéis dejar %s en blanco."
#: pkg/booking/public.go:293 #: pkg/booking/public.go:336
#, c-format #, c-format
msgid "%s must be an integer." msgid "%s must be an integer."
msgstr "%s tiene que ser un número entero." msgstr "%s tiene que ser un número entero."
#: pkg/booking/public.go:294 #: pkg/booking/public.go:337
#, c-format #, c-format
msgid "%s must be %d or greater." msgid "%s must be %d or greater."
msgstr "%s tiene que ser como mínimo %d." msgstr "%s tiene que ser como mínimo %d."
#: pkg/booking/public.go:295 #: pkg/booking/public.go:338
#, c-format #, c-format
msgid "%s must be at most %d." msgid "%s must be at most %d."
msgstr "%s tiene que ser como máximo %d" msgstr "%s tiene que ser como máximo %d"

148
po/fr.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: camper\n" "Project-Id-Version: camper\n"
"Report-Msgid-Bugs-To: jordi@tandem.blog\n" "Report-Msgid-Bugs-To: jordi@tandem.blog\n"
"POT-Creation-Date: 2024-01-27 22:29+0100\n" "POT-Creation-Date: 2024-01-29 03:30+0100\n"
"PO-Revision-Date: 2023-12-20 10:13+0100\n" "PO-Revision-Date: 2023-12-20 10:13+0100\n"
"Last-Translator: Oriol Carbonell <info@oriolcarbonell.cat>\n" "Last-Translator: Oriol Carbonell <info@oriolcarbonell.cat>\n"
"Language-Team: French <traduc@traduc.org>\n" "Language-Team: French <traduc@traduc.org>\n"
@ -125,7 +125,7 @@ msgid "Check-out Date"
msgstr "Date de départ" msgstr "Date de départ"
#: web/templates/public/campsite/type.gohtml:54 #: web/templates/public/campsite/type.gohtml:54
#: web/templates/public/booking.gohtml:164 #: web/templates/public/booking.gohtml:169
msgctxt "action" msgctxt "action"
msgid "Book" msgid "Book"
msgstr "Réserver" msgstr "Réserver"
@ -137,7 +137,7 @@ msgid "Calendar"
msgstr "Calendrier" msgstr "Calendrier"
#: web/templates/public/campsite/type.gohtml:73 #: web/templates/public/campsite/type.gohtml:73
#: web/templates/admin/campsite/type/form.gohtml:109 #: web/templates/admin/campsite/type/form.gohtml:127
#: web/templates/admin/campsite/type/option/form.gohtml:70 #: web/templates/admin/campsite/type/option/form.gohtml:70
msgctxt "title" msgctxt "title"
msgid "Prices" msgid "Prices"
@ -352,32 +352,36 @@ msgctxt "title"
msgid "Accommodation" msgid "Accommodation"
msgstr "Hébergement" msgstr "Hébergement"
#: web/templates/public/booking.gohtml:99 #: web/templates/public/booking.gohtml:101
msgctxt "input" msgctxt "input"
msgid "Area preferences (optional)" msgid "Area preferences (optional)"
msgstr "Préférences de zone (facultatif)" msgstr "Préférences de zone (facultatif)"
#: web/templates/public/booking.gohtml:121 #: web/templates/public/booking.gohtml:108
msgid "Campground map"
msgstr "Plan du camping"
#: web/templates/public/booking.gohtml:126
msgctxt "title" msgctxt "title"
msgid "Booking Period" msgid "Booking Period"
msgstr "Période de réservation" msgstr "Période de réservation"
#: web/templates/public/booking.gohtml:124 #: web/templates/public/booking.gohtml:129
msgctxt "input" msgctxt "input"
msgid "Arrival date" msgid "Arrival date"
msgstr "Date d’arrivée" msgstr "Date d’arrivée"
#: web/templates/public/booking.gohtml:133 #: web/templates/public/booking.gohtml:138
msgctxt "input" msgctxt "input"
msgid "Departure date" msgid "Departure date"
msgstr "Date de depart" msgstr "Date de depart"
#: web/templates/public/booking.gohtml:144 #: web/templates/public/booking.gohtml:149
msgctxt "input" msgctxt "input"
msgid "ACSI card? (optional)" msgid "ACSI card? (optional)"
msgstr "Carte ACSI ? (Facultatif)" msgstr "Carte ACSI ? (Facultatif)"
#: web/templates/public/booking.gohtml:151 #: web/templates/public/booking.gohtml:156
msgctxt "input" msgctxt "input"
msgid "I have read and I accept %[1]sthe reservation conditions%[2]s" msgid "I have read and I accept %[1]sthe reservation conditions%[2]s"
msgstr "J’ai lu et j’accepte %[1]sles conditions de réservation%[2]s" msgstr "J’ai lu et j’accepte %[1]sles conditions de réservation%[2]s"
@ -482,7 +486,7 @@ msgstr "Contenu"
#: web/templates/admin/campsite/form.gohtml:92 #: web/templates/admin/campsite/form.gohtml:92
#: web/templates/admin/campsite/type/feature/form.gohtml:74 #: web/templates/admin/campsite/type/feature/form.gohtml:74
#: web/templates/admin/campsite/type/carousel/form.gohtml:59 #: web/templates/admin/campsite/type/carousel/form.gohtml:59
#: web/templates/admin/campsite/type/form.gohtml:202 #: web/templates/admin/campsite/type/form.gohtml:220
#: web/templates/admin/campsite/type/option/form.gohtml:90 #: web/templates/admin/campsite/type/option/form.gohtml:90
#: web/templates/admin/season/form.gohtml:73 #: web/templates/admin/season/form.gohtml:73
#: web/templates/admin/services/form.gohtml:81 #: web/templates/admin/services/form.gohtml:81
@ -504,7 +508,7 @@ msgstr "Mettre à jour"
#: web/templates/admin/campsite/form.gohtml:94 #: web/templates/admin/campsite/form.gohtml:94
#: web/templates/admin/campsite/type/feature/form.gohtml:76 #: web/templates/admin/campsite/type/feature/form.gohtml:76
#: web/templates/admin/campsite/type/carousel/form.gohtml:61 #: web/templates/admin/campsite/type/carousel/form.gohtml:61
#: web/templates/admin/campsite/type/form.gohtml:204 #: web/templates/admin/campsite/type/form.gohtml:222
#: web/templates/admin/campsite/type/option/form.gohtml:92 #: web/templates/admin/campsite/type/option/form.gohtml:92
#: web/templates/admin/season/form.gohtml:75 #: web/templates/admin/season/form.gohtml:75
#: web/templates/admin/services/form.gohtml:83 #: web/templates/admin/services/form.gohtml:83
@ -628,6 +632,7 @@ msgstr "Ajouter une caractéristique"
#: web/templates/admin/surroundings/index.gohtml:84 #: web/templates/admin/surroundings/index.gohtml:84
#: web/templates/admin/amenity/feature/index.gohtml:31 #: web/templates/admin/amenity/feature/index.gohtml:31
#: web/templates/admin/amenity/carousel/index.gohtml:31 #: web/templates/admin/amenity/carousel/index.gohtml:31
#: web/templates/admin/amenity/index.gohtml:25
#: web/templates/admin/home/index.gohtml:54 #: web/templates/admin/home/index.gohtml:54
#: web/templates/admin/home/index.gohtml:99 #: web/templates/admin/home/index.gohtml:99
msgctxt "header" msgctxt "header"
@ -652,6 +657,7 @@ msgstr "Êtes-vous sûr de vouloir supprimer cette caractéristique ?"
#: web/templates/admin/surroundings/index.gohtml:101 #: web/templates/admin/surroundings/index.gohtml:101
#: web/templates/admin/amenity/feature/index.gohtml:47 #: web/templates/admin/amenity/feature/index.gohtml:47
#: web/templates/admin/amenity/carousel/index.gohtml:49 #: web/templates/admin/amenity/carousel/index.gohtml:49
#: web/templates/admin/amenity/index.gohtml:45
#: web/templates/admin/home/index.gohtml:71 #: web/templates/admin/home/index.gohtml:71
#: web/templates/admin/home/index.gohtml:116 #: web/templates/admin/home/index.gohtml:116
msgctxt "action" msgctxt "action"
@ -799,14 +805,14 @@ msgstr "Carrousel"
#: web/templates/admin/campsite/index.gohtml:36 #: web/templates/admin/campsite/index.gohtml:36
#: web/templates/admin/campsite/type/index.gohtml:45 #: web/templates/admin/campsite/type/index.gohtml:45
#: web/templates/admin/amenity/index.gohtml:33 #: web/templates/admin/amenity/index.gohtml:35
msgctxt "action" msgctxt "action"
msgid "Edit Features" msgid "Edit Features"
msgstr "Edit caractéristiques" msgstr "Edit caractéristiques"
#: web/templates/admin/campsite/index.gohtml:39 #: web/templates/admin/campsite/index.gohtml:39
#: web/templates/admin/campsite/type/index.gohtml:51 #: web/templates/admin/campsite/type/index.gohtml:51
#: web/templates/admin/amenity/index.gohtml:36 #: web/templates/admin/amenity/index.gohtml:38
msgctxt "action" msgctxt "action"
msgid "Edit Carousel" msgid "Edit Carousel"
msgstr "Modifier le carrousel" msgstr "Modifier le carrousel"
@ -815,7 +821,7 @@ msgstr "Modifier le carrousel"
#: web/templates/admin/campsite/type/index.gohtml:53 #: web/templates/admin/campsite/type/index.gohtml:53
#: web/templates/admin/season/index.gohtml:44 #: web/templates/admin/season/index.gohtml:44
#: web/templates/admin/user/login-attempts.gohtml:31 #: web/templates/admin/user/login-attempts.gohtml:31
#: web/templates/admin/amenity/index.gohtml:38 #: web/templates/admin/amenity/index.gohtml:40
msgid "Yes" msgid "Yes"
msgstr "Oui" msgstr "Oui"
@ -823,7 +829,7 @@ msgstr "Oui"
#: web/templates/admin/campsite/type/index.gohtml:53 #: web/templates/admin/campsite/type/index.gohtml:53
#: web/templates/admin/season/index.gohtml:44 #: web/templates/admin/season/index.gohtml:44
#: web/templates/admin/user/login-attempts.gohtml:31 #: web/templates/admin/user/login-attempts.gohtml:31
#: web/templates/admin/amenity/index.gohtml:38 #: web/templates/admin/amenity/index.gohtml:40
msgid "No" msgid "No"
msgstr "Non" msgstr "Non"
@ -915,50 +921,60 @@ msgctxt "input"
msgid "Check-out" msgid "Check-out"
msgstr "Départ" msgstr "Départ"
#: web/templates/admin/campsite/type/form.gohtml:93 #: web/templates/admin/campsite/type/form.gohtml:94
msgctxt "input" msgctxt "input"
msgid "Maximum number of campers" msgid "Maximum number of campers"
msgstr "Nombre maximum de campeurs" msgstr "Nombre maximum de personnes"
#: web/templates/admin/campsite/type/form.gohtml:103 #: web/templates/admin/campsite/type/form.gohtml:104
msgctxt "input"
msgid "Allow overflowing guests to neighbouring campsites"
msgstr "Autoriser la réservation d’un hébergement voisin si le nombre maximum de personnes est dépassé"
#: web/templates/admin/campsite/type/form.gohtml:113
msgctxt "input"
msgid "Ask for zone preferences when booking"
msgstr "Demandez la préférence de zone lors de la réservation"
#: web/templates/admin/campsite/type/form.gohtml:121
msgctxt "input" msgctxt "input"
msgid "Dogs allowed" msgid "Dogs allowed"
msgstr "Chiens acceptés" msgstr "Chiens acceptés"
#: web/templates/admin/campsite/type/form.gohtml:115 #: web/templates/admin/campsite/type/form.gohtml:133
#: web/templates/admin/campsite/type/option/form.gohtml:76 #: web/templates/admin/campsite/type/option/form.gohtml:76
msgctxt "input" msgctxt "input"
msgid "Price per night" msgid "Price per night"
msgstr "Prix par nuit" msgstr "Prix par nuit"
#: web/templates/admin/campsite/type/form.gohtml:123 #: web/templates/admin/campsite/type/form.gohtml:141
msgctxt "input" msgctxt "input"
msgid "Minimum number of nights" msgid "Minimum number of nights"
msgstr "Nombre minimum de nuits" msgstr "Nombre minimum de nuits"
#: web/templates/admin/campsite/type/form.gohtml:135 #: web/templates/admin/campsite/type/form.gohtml:153
msgctxt "input" msgctxt "input"
msgid "Spiel" msgid "Spiel"
msgstr "Boniment" msgstr "Boniment"
#: web/templates/admin/campsite/type/form.gohtml:148 #: web/templates/admin/campsite/type/form.gohtml:166
msgctxt "input" msgctxt "input"
msgid "Info" msgid "Info"
msgstr "Info" msgstr "Info"
#: web/templates/admin/campsite/type/form.gohtml:161 #: web/templates/admin/campsite/type/form.gohtml:179
msgctxt "input" msgctxt "input"
msgid "Facilities" msgid "Facilities"
msgstr "Installations" msgstr "Installations"
#: web/templates/admin/campsite/type/form.gohtml:174 #: web/templates/admin/campsite/type/form.gohtml:192
#: web/templates/admin/services/form.gohtml:66 #: web/templates/admin/services/form.gohtml:66
#: web/templates/admin/surroundings/form.gohtml:54 #: web/templates/admin/surroundings/form.gohtml:54
msgctxt "input" msgctxt "input"
msgid "Description" msgid "Description"
msgstr "Description" msgstr "Description"
#: web/templates/admin/campsite/type/form.gohtml:187 #: web/templates/admin/campsite/type/form.gohtml:205
msgctxt "input" msgctxt "input"
msgid "Additional Information" msgid "Additional Information"
msgstr "Informations Complémentaires" msgstr "Informations Complémentaires"
@ -1433,7 +1449,11 @@ msgctxt "action"
msgid "Add Amenity" msgid "Add Amenity"
msgstr "Ajouter un installation" msgstr "Ajouter un installation"
#: web/templates/admin/amenity/index.gohtml:44 #: web/templates/admin/amenity/index.gohtml:29
msgid "Are you sure you wish to delete this amenity?"
msgstr "Êtes-vous sûr de vouloir supprimer ce installation ?"
#: web/templates/admin/amenity/index.gohtml:53
msgid "No amenities added yet." msgid "No amenities added yet."
msgstr "Aucun installation n’a encore été ajouté." msgstr "Aucun installation n’a encore été ajouté."
@ -1651,15 +1671,15 @@ msgid "No booking found."
msgstr "Aucune réservation trouvée." msgstr "Aucune réservation trouvée."
#: pkg/legal/admin.go:258 pkg/app/user.go:249 pkg/campsite/types/option.go:357 #: pkg/legal/admin.go:258 pkg/app/user.go:249 pkg/campsite/types/option.go:357
#: pkg/campsite/types/feature.go:272 pkg/campsite/types/admin.go:483 #: pkg/campsite/types/feature.go:272 pkg/campsite/types/admin.go:497
#: pkg/campsite/feature.go:269 pkg/season/admin.go:412 #: pkg/campsite/feature.go:269 pkg/season/admin.go:412
#: pkg/services/admin.go:316 pkg/surroundings/admin.go:340 #: pkg/services/admin.go:316 pkg/surroundings/admin.go:340
#: pkg/amenity/feature.go:269 pkg/amenity/admin.go:270 #: pkg/amenity/feature.go:269 pkg/amenity/admin.go:283
msgid "Name can not be empty." msgid "Name can not be empty."
msgstr "Le nom ne peut pas être laissé vide." msgstr "Le nom ne peut pas être laissé vide."
#: pkg/legal/admin.go:259 pkg/campsite/types/option.go:358 #: pkg/legal/admin.go:259 pkg/campsite/types/option.go:358
#: pkg/campsite/types/feature.go:273 pkg/campsite/types/admin.go:484 #: pkg/campsite/types/feature.go:273 pkg/campsite/types/admin.go:498
#: pkg/campsite/feature.go:270 pkg/amenity/feature.go:270 #: pkg/campsite/feature.go:270 pkg/amenity/feature.go:270
msgid "Name must have at least one letter." msgid "Name must have at least one letter."
msgstr "Le nom doit comporter au moins une lettre." msgstr "Le nom doit comporter au moins une lettre."
@ -1689,12 +1709,12 @@ msgid "Slide image must be an image media type."
msgstr "L’image de la diapositive doit être de type média d’image." 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:217
#: pkg/booking/public.go:269 #: pkg/booking/public.go:312
msgid "Email can not be empty." msgid "Email can not be empty."
msgstr "L’e-mail ne peut pas être vide." 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:218
#: pkg/booking/public.go:270 #: pkg/booking/public.go:313
msgid "This email is not valid. It should be like name@domain.com." 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." msgstr "Cette adresse e-mail n’est pas valide. Il devrait en être name@domain.com."
@ -1751,15 +1771,15 @@ msgstr "Le maximum doit être un nombre entier."
msgid "Maximum must be equal or greater than minimum." msgid "Maximum must be equal or greater than minimum."
msgstr "Le maximum doit être égal ou supérieur au minimum." msgstr "Le maximum doit être égal ou supérieur au minimum."
#: pkg/campsite/types/option.go:374 pkg/campsite/types/admin.go:499 #: pkg/campsite/types/option.go:374 pkg/campsite/types/admin.go:513
msgid "Price per night can not be empty." msgid "Price per night can not be empty."
msgstr "Le prix par nuit ne peut pas être vide." msgstr "Le prix par nuit ne peut pas être vide."
#: pkg/campsite/types/option.go:375 pkg/campsite/types/admin.go:500 #: pkg/campsite/types/option.go:375 pkg/campsite/types/admin.go:514
msgid "Price per night must be a decimal number." msgid "Price per night must be a decimal number."
msgstr "Le prix par nuit doit être un nombre décimal." msgstr "Le prix par nuit doit être un nombre décimal."
#: pkg/campsite/types/option.go:376 pkg/campsite/types/admin.go:501 #: pkg/campsite/types/option.go:376 pkg/campsite/types/admin.go:515
msgid "Price per night must be zero or greater." msgid "Price per night must be zero or greater."
msgstr "Le prix par nuit doit être égal ou supérieur." msgstr "Le prix par nuit doit être égal ou supérieur."
@ -1768,61 +1788,61 @@ msgstr "Le prix par nuit doit être égal ou supérieur."
msgid "Selected icon is not valid." msgid "Selected icon is not valid."
msgstr "L’icône sélectionnée n’est pas valide." msgstr "L’icône sélectionnée n’est pas valide."
#: pkg/campsite/types/admin.go:307 #: pkg/campsite/types/admin.go:309
msgctxt "input" msgctxt "input"
msgid "Cover image" msgid "Cover image"
msgstr "Image de couverture" msgstr "Image de couverture"
#: pkg/campsite/types/admin.go:308 #: pkg/campsite/types/admin.go:310
msgctxt "action" msgctxt "action"
msgid "Set campsite type cover" msgid "Set campsite type cover"
msgstr "Définir une couverture type camping" msgstr "Définir une couverture type camping"
#: pkg/campsite/types/admin.go:486 #: pkg/campsite/types/admin.go:500
msgid "Check-in can not be empty." msgid "Check-in can not be empty."
msgstr "L’arrivée ne peut pas être vide." msgstr "L’arrivée ne peut pas être vide."
#: pkg/campsite/types/admin.go:487 #: pkg/campsite/types/admin.go:501
msgid "Check-out can not be empty." msgid "Check-out can not be empty."
msgstr "Le départ ne peut pas être vide." msgstr "Le départ ne peut pas être vide."
#: pkg/campsite/types/admin.go:488 #: pkg/campsite/types/admin.go:502
msgid "Cover image can not be empty." msgid "Cover image can not be empty."
msgstr "L’image de couverture ne peut pas être vide." msgstr "L’image de couverture ne peut pas être vide."
#: pkg/campsite/types/admin.go:489 #: pkg/campsite/types/admin.go:503
msgid "Cover image must be an image media type." msgid "Cover image must be an image media type."
msgstr "L’image de couverture doit être de type média d’image." msgstr "L’image de couverture doit être de type média d’image."
#: pkg/campsite/types/admin.go:493 #: pkg/campsite/types/admin.go:507
msgid "Maximum number of campers can not be empty." msgid "Maximum number of campers can not be empty."
msgstr "Le nombre maximum de campeurs ne peut pas être vide." msgstr "Le nombre maximum de campeurs ne peut pas être vide."
#: pkg/campsite/types/admin.go:494 #: pkg/campsite/types/admin.go:508
msgid "Maximum number of campers must be an integer number." msgid "Maximum number of campers must be an integer number."
msgstr "Le nombre maximum de campeurs doit être un nombre entier." msgstr "Le nombre maximum de campeurs doit être un nombre entier."
#: pkg/campsite/types/admin.go:495 #: pkg/campsite/types/admin.go:509
msgid "Maximum number of campers must be one or greater." msgid "Maximum number of campers must be one or greater."
msgstr "Le nombre maximum de campeurs doit être égal ou supérieur à un campeur." msgstr "Le nombre maximum de campeurs doit être égal ou supérieur à un campeur."
#: pkg/campsite/types/admin.go:504 #: pkg/campsite/types/admin.go:518
msgid "Minimum number of nights can not be empty." msgid "Minimum number of nights can not be empty."
msgstr "Le nombre minimum de nuits ne peut pas être vide." msgstr "Le nombre minimum de nuits ne peut pas être vide."
#: pkg/campsite/types/admin.go:505 #: pkg/campsite/types/admin.go:519
msgid "Minimum number of nights must be an integer." msgid "Minimum number of nights must be an integer."
msgstr "Le nombre minimum de nuits doit être un entier." msgstr "Le nombre minimum de nuits doit être un entier."
#: pkg/campsite/types/admin.go:506 #: pkg/campsite/types/admin.go:520
msgid "Minimum number of nights must be one or greater." msgid "Minimum number of nights must be one or greater."
msgstr "Le nombre minimum de nuits doit être supérieur ou égal à une nuit." msgstr "Le nombre minimum de nuits doit être supérieur ou égal à une nuit."
#: pkg/campsite/admin.go:275 pkg/booking/public.go:278 #: pkg/campsite/admin.go:275 pkg/booking/public.go:321
msgid "Selected campsite type is not valid." msgid "Selected campsite type is not valid."
msgstr "Le type d’emplacement sélectionné n’est pas valide." msgstr "Le type d’emplacement sélectionné n’est pas valide."
#: pkg/campsite/admin.go:276 pkg/amenity/admin.go:269 #: pkg/campsite/admin.go:276 pkg/amenity/admin.go:282
msgid "Label can not be empty." msgid "Label can not be empty."
msgstr "L'étiquette ne peut pas être vide." msgstr "L'étiquette ne peut pas être vide."
@ -1974,7 +1994,7 @@ msgstr "L’addresse du lien ne peut pas être vide."
msgid "This web address is not valid. It should be like https://domain.com/." 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/." msgstr "Cette adresse web n’est pas valide. Il devrait en être https://domain.com/."
#: pkg/company/admin.go:200 pkg/booking/public.go:256 #: pkg/company/admin.go:200 pkg/booking/public.go:299
msgid "Selected country is not valid." msgid "Selected country is not valid."
msgstr "Le pays sélectionné n’est pas valide." msgstr "Le pays sélectionné n’est pas valide."
@ -1994,11 +2014,11 @@ msgstr "Le numéro de TVA ne peut pas être vide."
msgid "This VAT number is not valid." msgid "This VAT number is not valid."
msgstr "Ce numéro de TVA n’est pas valide." msgstr "Ce numéro de TVA n’est pas valide."
#: pkg/company/admin.go:212 pkg/booking/public.go:272 #: pkg/company/admin.go:212 pkg/booking/public.go:315
msgid "Phone can not be empty." msgid "Phone can not be empty."
msgstr "Le téléphone ne peut pas être vide." msgstr "Le téléphone ne peut pas être vide."
#: pkg/company/admin.go:213 pkg/booking/public.go:273 #: pkg/company/admin.go:213 pkg/booking/public.go:316
msgid "This phone number is not valid." msgid "This phone number is not valid."
msgstr "Ce numéro de téléphone n’est pas valide." msgstr "Ce numéro de téléphone n’est pas valide."
@ -2018,7 +2038,7 @@ msgstr "La province ne peut pas être vide."
msgid "Postal code can not be empty." msgid "Postal code can not be empty."
msgstr "Le code postal ne peut pas être vide." msgstr "Le code postal ne peut pas être vide."
#: pkg/company/admin.go:227 pkg/booking/public.go:265 #: pkg/company/admin.go:227 pkg/booking/public.go:308
msgid "This postal code is not valid." msgid "This postal code is not valid."
msgstr "Ce code postal n’est pas valide." msgstr "Ce code postal n’est pas valide."
@ -2115,54 +2135,54 @@ msgstr "L’intégration sélectionnée n’est pas valide."
msgid "The merchant key is not valid." msgid "The merchant key is not valid."
msgstr "La clé marchand n’est pas valide." msgstr "La clé marchand n’est pas valide."
#: pkg/booking/public.go:260 #: pkg/booking/public.go:303
msgid "Full name can not be empty." msgid "Full name can not be empty."
msgstr "Le nom complet ne peut pas être vide." msgstr "Le nom complet ne peut pas être vide."
#: pkg/booking/public.go:261 #: pkg/booking/public.go:304
msgid "Full name must have at least one letter." msgid "Full name must have at least one letter."
msgstr "Le nom complet doit comporter au moins une lettre." msgstr "Le nom complet doit comporter au moins une lettre."
#: pkg/booking/public.go:279 #: pkg/booking/public.go:322
msgid "Arrival date can not be empty" msgid "Arrival date can not be empty"
msgstr "La date d’arrivée ne peut pas être vide" msgstr "La date d’arrivée ne peut pas être vide"
#: pkg/booking/public.go:280 #: pkg/booking/public.go:323
msgid "Arrival date must be a valid date." msgid "Arrival date must be a valid date."
msgstr "La date d’arrivée doit être une date valide." msgstr "La date d’arrivée doit être une date valide."
#: pkg/booking/public.go:284 #: pkg/booking/public.go:327
msgid "Departure date can not be empty" msgid "Departure date can not be empty"
msgstr "La date de départ ne peut pas être vide" msgstr "La date de départ ne peut pas être vide"
#: pkg/booking/public.go:285 #: pkg/booking/public.go:328
msgid "Departure date must be a valid date." msgid "Departure date must be a valid date."
msgstr "La date de départ doit être une date valide." msgstr "La date de départ doit être une date valide."
#: pkg/booking/public.go:286 #: pkg/booking/public.go:329
msgid "The departure date must be after the arrival date." msgid "The departure date must be after the arrival date."
msgstr "La date de départ doit être postérieure à la date d’arrivée." msgstr "La date de départ doit être postérieure à la date d’arrivée."
#: pkg/booking/public.go:289 #: pkg/booking/public.go:332
msgid "It is mandatory to agree to the reservation conditions." msgid "It is mandatory to agree to the reservation conditions."
msgstr "Il est obligatoire d’accepter les conditions de réservation." msgstr "Il est obligatoire d’accepter les conditions de réservation."
#: pkg/booking/public.go:292 #: pkg/booking/public.go:335
#, c-format #, c-format
msgid "%s can not be empty" msgid "%s can not be empty"
msgstr "%s ne peut pas être vide" msgstr "%s ne peut pas être vide"
#: pkg/booking/public.go:293 #: pkg/booking/public.go:336
#, c-format #, c-format
msgid "%s must be an integer." msgid "%s must be an integer."
msgstr "%s doit être un entier." msgstr "%s doit être un entier."
#: pkg/booking/public.go:294 #: pkg/booking/public.go:337
#, c-format #, c-format
msgid "%s must be %d or greater." msgid "%s must be %d or greater."
msgstr "%s doit être %d ou plus." msgstr "%s doit être %d ou plus."
#: pkg/booking/public.go:295 #: pkg/booking/public.go:338
#, c-format #, c-format
msgid "%s must be at most %d." msgid "%s must be at most %d."
msgstr "%s doit être tout au plus %d." msgstr "%s doit être tout au plus %d."

13
revert/add_campsite_type.sql
View File

@ -3,23 +3,24 @@
-- requires: schema_camper -- requires: schema_camper
-- requires: campsite_type -- requires: campsite_type
-- requires: company -- requires: company
-- requires: campsite_type__check_in_out
begin; begin;
set search_path to camper, public; set search_path to camper, public;
drop function if exists add_campsite_type(integer, integer, text, text, text, text, text, text, text, text, integer, boolean); drop function if exists add_campsite_type(integer, integer, text, text, text, text, text, text, text, text, integer, boolean, boolean, boolean);
create or replace function add_campsite_type(company integer, media_id integer, name text, spiel text, info text, facilities text, description text, additional_info text, max_campers integer, dogs_allowed boolean) returns uuid as create or replace function add_campsite_type(company integer, media_id integer, name text, spiel text, info text, facilities text, description text, additional_info text, check_in text, check_out text, max_campers integer, dogs_allowed boolean) returns uuid as
$$ $$
insert into campsite_type (company_id, media_id, name, spiel, info, facilities, description, additional_info, max_campers, dogs_allowed) insert into campsite_type (company_id, media_id, name, spiel, info, facilities, description, additional_info, check_in, check_out, max_campers, dogs_allowed)
values (company, media_id, name, xmlparse(content spiel), xmlparse(content info), xmlparse(content facilities), xmlparse(content description), xmlparse(content additional_info), max_campers, dogs_allowed) values (company, media_id, name, xmlparse(content spiel), xmlparse(content info), xmlparse(content facilities), xmlparse(content description), xmlparse(content additional_info), check_in, check_out, max_campers, dogs_allowed)
returning slug; returning slug;
$$ $$
language sql language sql
; ;
revoke execute on function add_campsite_type(integer, integer, text, text, text, text, text, text, integer, boolean) from public; revoke execute on function add_campsite_type(integer, integer, text, text, text, text, text, text, text, text, integer, boolean) from public;
grant execute on function add_campsite_type(integer, integer, text, text, text, text, text, text, integer, boolean) to admin; grant execute on function add_campsite_type(integer, integer, text, text, text, text, text, text, text, text, integer, boolean) to admin;
commit; commit;

25
revert/add_campsite_type@v2.sql Normal file
View File

@ -0,0 +1,25 @@
-- Deploy camper:add_campsite_type to pg
-- requires: roles
-- requires: schema_camper
-- requires: campsite_type
-- requires: company
begin;
set search_path to camper, public;
drop function if exists add_campsite_type(integer, integer, text, text, text, text, text, text, text, text, integer, boolean);
create or replace function add_campsite_type(company integer, media_id integer, name text, spiel text, info text, facilities text, description text, additional_info text, max_campers integer, dogs_allowed boolean) returns uuid as
$$
insert into campsite_type (company_id, media_id, name, spiel, info, facilities, description, additional_info, max_campers, dogs_allowed)
values (company, media_id, name, xmlparse(content spiel), xmlparse(content info), xmlparse(content facilities), xmlparse(content description), xmlparse(content additional_info), max_campers, dogs_allowed)
returning slug;
$$
language sql
;
revoke execute on function add_campsite_type(integer, integer, text, text, text, text, text, text, integer, boolean) from public;
grant execute on function add_campsite_type(integer, integer, text, text, text, text, text, text, integer, boolean) to admin;
commit;

9
revert/campsite_type__ask_zone_preferences.sql Normal file
View File

@ -0,0 +1,9 @@
-- Revert camper:campsite_type__ask_zone_preferences from pg
begin;
alter table camper.campsite_type
drop column if exists ask_zone_preferences
;
commit;

9
revert/campsite_type__overflow_allowed.sql Normal file
View File

@ -0,0 +1,9 @@
-- Revert camper:campsite_type__overflow_allowed from pg
begin;
alter table camper.campsite_type
drop column if exists overflow_allowed
;
commit;

11
revert/edit_campsite_type.sql
View File

@ -3,14 +3,15 @@
-- requires: schema_camper -- requires: schema_camper
-- requires: campsite_type -- requires: campsite_type
-- requires: company -- requires: company
-- requires: campsite_type__check_in_out
begin; begin;
set search_path to camper, public; set search_path to camper, public;
drop function if exists edit_campsite_type(uuid, integer, text, text, text, text, text, text, text, text, integer, boolean, boolean); drop function if exists edit_campsite_type(uuid, integer, text, text, text, text, text, text, text, text, integer, boolean, boolean, boolean, boolean);
create or replace function edit_campsite_type(slug uuid, media_id integer, name text, spiel text, info text, facilities text, description text, additional_info text, max_campers integer, dogs_allowed boolean, active boolean) returns uuid as create or replace function edit_campsite_type(slug uuid, media_id integer, name text, spiel text, info text, facilities text, description text, additional_info text, check_in text, check_out text, max_campers integer, dogs_allowed boolean, active boolean) returns uuid as
$$ $$
update campsite_type update campsite_type
set name = edit_campsite_type.name set name = edit_campsite_type.name
@ -18,6 +19,8 @@ $$
, description = xmlparse(content edit_campsite_type.description) , description = xmlparse(content edit_campsite_type.description)
, info = xmlparse(content edit_campsite_type.info) , info = xmlparse(content edit_campsite_type.info)
, additional_info = xmlparse(content edit_campsite_type.additional_info) , additional_info = xmlparse(content edit_campsite_type.additional_info)
, check_in = edit_campsite_type.check_in
, check_out = edit_campsite_type.check_out
, facilities = xmlparse(content edit_campsite_type.facilities) , facilities = xmlparse(content edit_campsite_type.facilities)
, media_id = coalesce(edit_campsite_type.media_id, campsite_type.media_id) , media_id = coalesce(edit_campsite_type.media_id, campsite_type.media_id)
, max_campers = edit_campsite_type.max_campers , max_campers = edit_campsite_type.max_campers
@ -29,7 +32,7 @@ $$
language sql language sql
; ;
revoke execute on function edit_campsite_type(uuid, integer, text, text, text, text, text, text, integer, boolean, boolean) from public; revoke execute on function edit_campsite_type(uuid, integer, text, text, text, text, text, text, text, text, integer, boolean, boolean) from public;
grant execute on function edit_campsite_type(uuid, integer, text, text, text, text, text, text, integer, boolean, boolean) to admin; grant execute on function edit_campsite_type(uuid, integer, text, text, text, text, text, text, text, text, integer, boolean, boolean) to admin;
commit; commit;

35
revert/edit_campsite_type@v2.sql Normal file
View File

@ -0,0 +1,35 @@
-- Deploy camper:edit_campsite_type to pg
-- requires: roles
-- requires: schema_camper
-- requires: campsite_type
-- requires: company
begin;
set search_path to camper, public;
drop function if exists edit_campsite_type(uuid, integer, text, text, text, text, text, text, text, text, integer, boolean, boolean);
create or replace function edit_campsite_type(slug uuid, media_id integer, name text, spiel text, info text, facilities text, description text, additional_info text, max_campers integer, dogs_allowed boolean, active boolean) returns uuid as
$$
update campsite_type
set name = edit_campsite_type.name
, spiel = xmlparse(content edit_campsite_type.spiel)
, description = xmlparse(content edit_campsite_type.description)
, info = xmlparse(content edit_campsite_type.info)
, additional_info = xmlparse(content edit_campsite_type.additional_info)
, facilities = xmlparse(content edit_campsite_type.facilities)
, media_id = coalesce(edit_campsite_type.media_id, campsite_type.media_id)
, max_campers = edit_campsite_type.max_campers
, dogs_allowed = edit_campsite_type.dogs_allowed
, active = edit_campsite_type.active
where slug = edit_campsite_type.slug
returning slug;
$$
language sql
;
revoke execute on function edit_campsite_type(uuid, integer, text, text, text, text, text, text, integer, boolean, boolean) from public;
grant execute on function edit_campsite_type(uuid, integer, text, text, text, text, text, text, integer, boolean, boolean) to admin;
commit;

4
sqitch.plan
View File

@ -218,3 +218,7 @@ amenity_feature_i18n [roles schema_camper amenity_feature language] 2024-01-27T1
translate_amenity_feature [roles schema_camper amenity_feature_i18n] 2024-01-27T19:26:21Z jordi fita mas <jordi@tandem.blog> # Add function to translate amenity features translate_amenity_feature [roles schema_camper amenity_feature_i18n] 2024-01-27T19:26:21Z jordi fita mas <jordi@tandem.blog> # Add function to translate amenity features
remove_amenity_feature [roles schema_camper amenity_feature amenity_feature_i18n] 2024-01-27T19:34:52Z jordi fita mas <jordi@tandem.blog> # Add function to remove amenity features remove_amenity_feature [roles schema_camper amenity_feature amenity_feature_i18n] 2024-01-27T19:34:52Z jordi fita mas <jordi@tandem.blog> # Add function to remove amenity features
remove_amenity [roles schema_camper amenity amenity_i18n amenity_carousel amenity_carousel_i18n amenity_feature amenity_feature_i18n] 2024-01-27T18:54:34Z jordi fita mas <jordi@tandem.blog> # Add function to remove amenity remove_amenity [roles schema_camper amenity amenity_i18n amenity_carousel amenity_carousel_i18n amenity_feature amenity_feature_i18n] 2024-01-27T18:54:34Z jordi fita mas <jordi@tandem.blog> # Add function to remove amenity
campsite_type__overflow_allowed [campsite_type] 2024-01-29T01:05:11Z jordi fita mas <jordi@tandem.blog> # Add overflow_allowed column to campsite_type
campsite_type__ask_zone_preferences [campsite_type] 2024-01-29T01:08:14Z jordi fita mas <jordi@tandem.blog> # Add ask_zone_preferences column to campsite_type
add_campsite_type [add_campsite_type@v2 campsite_type__overflow_allowed campsite_type__ask_zone_preferences] 2024-01-29T01:13:55Z jordi fita mas <jordi@tandem.blog> # Add overflow_allowed and ask_zone_preferences parameters to add_campsite_type
edit_campsite_type [edit_campsite_type@v2 campsite_type__overflow_allowed campsite_type__ask_zone_preferences] 2024-01-29T01:18:03Z jordi fita mas <jordi@tandem.blog> # Add overflow_allowed and ask_zone_preferences parameters to edit_campsite_type

28
test/add_campsite_type.sql
View File

@ -9,15 +9,15 @@ set search_path to camper, public;
select plan(13); select plan(13);
select has_function('camper', 'add_campsite_type', array ['integer', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean']); select has_function('camper', 'add_campsite_type', array ['integer', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean', 'boolean', 'boolean']);
select function_lang_is('camper', 'add_campsite_type', array ['integer', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean'], 'sql'); select function_lang_is('camper', 'add_campsite_type', array ['integer', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean', 'boolean', 'boolean'], 'sql');
select function_returns('camper', 'add_campsite_type', array ['integer', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean'], 'uuid'); select function_returns('camper', 'add_campsite_type', array ['integer', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean', 'boolean', 'boolean'], 'uuid');
select isnt_definer('camper', 'add_campsite_type', array ['integer', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean']); select isnt_definer('camper', 'add_campsite_type', array ['integer', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean', 'boolean', 'boolean']);
select volatility_is('camper', 'add_campsite_type', array ['integer', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean'], 'volatile'); select volatility_is('camper', 'add_campsite_type', array ['integer', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean', 'boolean', 'boolean'], 'volatile');
select function_privs_are('camper', 'add_campsite_type', array ['integer', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean'], 'guest', array[]::text[]); select function_privs_are('camper', 'add_campsite_type', array ['integer', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean', 'boolean', 'boolean'], 'guest', array[]::text[]);
select function_privs_are('camper', 'add_campsite_type', array ['integer', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean'], 'employee', array[]::text[]); select function_privs_are('camper', 'add_campsite_type', array ['integer', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean', 'boolean', 'boolean'], 'employee', array[]::text[]);
select function_privs_are('camper', 'add_campsite_type', array ['integer', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean'], 'admin', array['EXECUTE']); select function_privs_are('camper', 'add_campsite_type', array ['integer', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean', 'boolean', 'boolean'], 'admin', array['EXECUTE']);
select function_privs_are('camper', 'add_campsite_type', array ['integer', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean'], 'authenticator', array[]::text[]); select function_privs_are('camper', 'add_campsite_type', array ['integer', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean', 'boolean', 'boolean'], 'authenticator', array[]::text[]);
set client_min_messages to warning; set client_min_messages to warning;
@ -44,19 +44,19 @@ values (3, 1, 'cover2.xpm', sha256('static char *s[]={"1 1 1 1","a c #ffffff","a
; ;
select lives_ok( select lives_ok(
$$ select add_campsite_type(1, 3, 'Type A', '', '<p>Features</p>', '', '<!-- block --><h2>This is what, exactly?</h2><!-- /block --><p>Dunno</p>', '', 'After 4 p.m.', '12 a.m.', 5, true) $$, $$ select add_campsite_type(1, 3, 'Type A', '', '<p>Features</p>', '', '<!-- block --><h2>This is what, exactly?</h2><!-- /block --><p>Dunno</p>', '', 'After 4 p.m.', '12 a.m.', 5, true, false, true) $$,
'Should be able to add a campsite type to the first company' 'Should be able to add a campsite type to the first company'
); );
select lives_ok( select lives_ok(
$$ select add_campsite_type(2, 4, 'Type B', '<p>One</p><p>Two</p>', '', '<p>Pricing</p>', '', '<p>More</p>', 'After 9 p.m.', '9 a.m.', 2, false) $$, $$ select add_campsite_type(2, 4, 'Type B', '<p>One</p><p>Two</p>', '', '<p>Pricing</p>', '', '<p>More</p>', 'After 9 p.m.', '9 a.m.', 2, false, true, false) $$,
'Should be able to add a campsite type to the second company' 'Should be able to add a campsite type to the second company'
); );
select bag_eq( select bag_eq(
$$ select company_id, media_id, name, spiel::text, info::text, facilities::text, description::text, additional_info::text, check_in, check_out, active, max_campers, dogs_allowed from campsite_type $$, $$ select company_id, media_id, name, spiel::text, info::text, facilities::text, description::text, additional_info::text, check_in, check_out, active, max_campers, dogs_allowed, overflow_allowed, ask_zone_preferences from campsite_type $$,
$$ values (1, 3, 'Type A', '', '<p>Features</p>', '', '<!-- block --><h2>This is what, exactly?</h2><!-- /block --><p>Dunno</p>', '', 'After 4 p.m.', '12 a.m.', true, 5, true) $$ values (1, 3, 'Type A', '', '<p>Features</p>', '', '<!-- block --><h2>This is what, exactly?</h2><!-- /block --><p>Dunno</p>', '', 'After 4 p.m.', '12 a.m.', true, 5, true, false, true)
, (2, 4, 'Type B', '<p>One</p><p>Two</p>', '', '<p>Pricing</p>', '', '<p>More</p>', 'After 9 p.m.', '9 a.m.', true, 2, false) , (2, 4, 'Type B', '<p>One</p><p>Two</p>', '', '<p>Pricing</p>', '', '<p>More</p>', 'After 9 p.m.', '9 a.m.', true, 2, false, true, false)
$$, $$,
'Should have added all two campsite type' 'Should have added all two campsite type'
); );

14
test/campsite_type.sql
View File

@ -5,7 +5,7 @@ reset client_min_messages;
begin; begin;
select plan(96); select plan(106);
set search_path to camper, public; set search_path to camper, public;
@ -88,6 +88,18 @@ select col_type_is('campsite_type', 'dogs_allowed', 'boolean');
select col_not_null('campsite_type', 'dogs_allowed'); select col_not_null('campsite_type', 'dogs_allowed');
select col_hasnt_default('campsite_type', 'dogs_allowed'); select col_hasnt_default('campsite_type', 'dogs_allowed');
select has_column('campsite_type', 'overflow_allowed');
select col_type_is('campsite_type', 'overflow_allowed', 'boolean');
select col_not_null('campsite_type', 'overflow_allowed');
select col_has_default('campsite_type', 'overflow_allowed');
select col_default_is('campsite_type', 'overflow_allowed', false);
select has_column('campsite_type', 'ask_zone_preferences');
select col_type_is('campsite_type', 'ask_zone_preferences', 'boolean');
select col_not_null('campsite_type', 'ask_zone_preferences');
select col_has_default('campsite_type', 'ask_zone_preferences');
select col_default_is('campsite_type', 'ask_zone_preferences', false);
select has_column('campsite_type', 'check_in'); select has_column('campsite_type', 'check_in');
select col_type_is('campsite_type', 'check_in', 'text'); select col_type_is('campsite_type', 'check_in', 'text');
select col_not_null('campsite_type', 'check_in'); select col_not_null('campsite_type', 'check_in');

34
test/edit_campsite_type.sql
View File

@ -9,15 +9,15 @@ set search_path to camper, public;
select plan(12); select plan(12);
select has_function('camper', 'edit_campsite_type', array ['uuid', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean', 'boolean']); select has_function('camper', 'edit_campsite_type', array ['uuid', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean', 'boolean', 'boolean', 'boolean']);
select function_lang_is('camper', 'edit_campsite_type', array ['uuid', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean', 'boolean'], 'sql'); select function_lang_is('camper', 'edit_campsite_type', array ['uuid', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean', 'boolean', 'boolean', 'boolean'], 'sql');
select function_returns('camper', 'edit_campsite_type', array ['uuid', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean', 'boolean'], 'uuid'); select function_returns('camper', 'edit_campsite_type', array ['uuid', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean', 'boolean', 'boolean', 'boolean'], 'uuid');
select isnt_definer('camper', 'edit_campsite_type', array ['uuid', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean', 'boolean']); select isnt_definer('camper', 'edit_campsite_type', array ['uuid', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean', 'boolean', 'boolean', 'boolean']);
select volatility_is('camper', 'edit_campsite_type', array ['uuid', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean', 'boolean'], 'volatile'); select volatility_is('camper', 'edit_campsite_type', array ['uuid', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean', 'boolean', 'boolean', 'boolean'], 'volatile');
select function_privs_are('camper', 'edit_campsite_type', array ['uuid', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean', 'boolean'], 'guest', array[]::text[]); select function_privs_are('camper', 'edit_campsite_type', array ['uuid', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean', 'boolean', 'boolean', 'boolean'], 'guest', array[]::text[]);
select function_privs_are('camper', 'edit_campsite_type', array ['uuid', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean', 'boolean'], 'employee', array[]::text[]); select function_privs_are('camper', 'edit_campsite_type', array ['uuid', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean', 'boolean', 'boolean', 'boolean'], 'employee', array[]::text[]);
select function_privs_are('camper', 'edit_campsite_type', array ['uuid', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean', 'boolean'], 'admin', array['EXECUTE']); select function_privs_are('camper', 'edit_campsite_type', array ['uuid', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean', 'boolean', 'boolean', 'boolean'], 'admin', array['EXECUTE']);
select function_privs_are('camper', 'edit_campsite_type', array ['uuid', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean', 'boolean'], 'authenticator', array[]::text[]); select function_privs_are('camper', 'edit_campsite_type', array ['uuid', 'integer', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'text', 'integer', 'boolean', 'boolean', 'boolean', 'boolean'], 'authenticator', array[]::text[]);
set client_min_messages to warning; set client_min_messages to warning;
truncate campsite_type cascade; truncate campsite_type cascade;
@ -43,25 +43,25 @@ values (2, 1, 'cover2.xpm', sha256('static char *s[]={"1 1 1 1","a c #ffffff","a
, (4, 1, 'cover4.xpm', sha256('static char *s[]={"1 1 1 1","a c #ffff00","a"};')) , (4, 1, 'cover4.xpm', sha256('static char *s[]={"1 1 1 1","a c #ffff00","a"};'))
; ;
insert into campsite_type (company_id, slug, media_id, name, spiel, info, facilities, description, additional_info, check_in, check_out, max_campers, dogs_allowed, active) insert into campsite_type (company_id, slug, media_id, name, spiel, info, facilities, description, additional_info, check_in, check_out, max_campers, dogs_allowed, overflow_allowed, ask_zone_preferences, active)
values (1, '87452b88-b48f-48d3-bb6c-0296de64164e', 2, 'Type A', '<h1>1</h1>', '<p>info 1</p>', '<p>facilities A</p>', '<p>A</p>', '<p>Additional A</p>', '', '', 5, false, true) values (1, '87452b88-b48f-48d3-bb6c-0296de64164e', 2, 'Type A', '<h1>1</h1>', '<p>info 1</p>', '<p>facilities A</p>', '<p>A</p>', '<p>Additional A</p>', '', '', 5, false, true, false, true)
, (1, '9b6370f7-f941-46f2-bc6e-de455675bd0a', 3, 'Type B', '<h2>2</h2>', '<p>info 2</p>', '<p>facilities B</p>', '<p>B</p>', '<p>Additional B</p>', '', '', 4, true, false) , (1, '9b6370f7-f941-46f2-bc6e-de455675bd0a', 3, 'Type B', '<h2>2</h2>', '<p>info 2</p>', '<p>facilities B</p>', '<p>B</p>', '<p>Additional B</p>', '', '', 4, true, false, true, false)
; ;
select lives_ok( select lives_ok(
$$ select edit_campsite_type('87452b88-b48f-48d3-bb6c-0296de64164e', 4, 'Type 1', '<h3>A</h3>', '<p>Features A</p>', '<p>Pricing 1</p>', '<p>1</p>', '<p>Additional 1</p>', 'Check-in 1', 'Check-out 1', 2, true, false) $$, $$ select edit_campsite_type('87452b88-b48f-48d3-bb6c-0296de64164e', 4, 'Type 1', '<h3>A</h3>', '<p>Features A</p>', '<p>Pricing 1</p>', '<p>1</p>', '<p>Additional 1</p>', 'Check-in 1', 'Check-out 1', 2, true, false, true, false) $$,
'Should be able to edit the first type' 'Should be able to edit the first type'
); );
select lives_ok( select lives_ok(
$$ select edit_campsite_type('9b6370f7-f941-46f2-bc6e-de455675bd0a', null, 'Type 2', '<h1>B</h1>', '<p>Features B</p>', '<p>Pricing 2</p>', '<p>2</p>', '<p>Additional 2</p>', 'Check-in 2', 'Check-out 2', 9, false, true) $$, $$ select edit_campsite_type('9b6370f7-f941-46f2-bc6e-de455675bd0a', null, 'Type 2', '<h1>B</h1>', '<p>Features B</p>', '<p>Pricing 2</p>', '<p>2</p>', '<p>Additional 2</p>', 'Check-in 2', 'Check-out 2', 9, false, true, false, true) $$,
'Should be able to edit the second type' 'Should be able to edit the second type'
); );
select bag_eq( select bag_eq(
$$ select slug::text, media_id, name, spiel::text, info::text, facilities::text, description::text, additional_info::text, check_in, check_out, max_campers, dogs_allowed, active from campsite_type $$, $$ select slug::text, media_id, name, spiel::text, info::text, facilities::text, description::text, additional_info::text, check_in, check_out, max_campers, dogs_allowed, overflow_allowed, ask_zone_preferences, active from campsite_type $$,
$$ values ('87452b88-b48f-48d3-bb6c-0296de64164e', 4, 'Type 1', '<h3>A</h3>', '<p>Features A</p>', '<p>Pricing 1</p>', '<p>1</p>', '<p>Additional 1</p>', 'Check-in 1', 'Check-out 1', 2, true, false) $$ values ('87452b88-b48f-48d3-bb6c-0296de64164e', 4, 'Type 1', '<h3>A</h3>', '<p>Features A</p>', '<p>Pricing 1</p>', '<p>1</p>', '<p>Additional 1</p>', 'Check-in 1', 'Check-out 1', 2, true, false, true, false)
, ('9b6370f7-f941-46f2-bc6e-de455675bd0a', 3, 'Type 2', '<h1>B</h1>', '<p>Features B</p>', '<p>Pricing 2</p>', '<p>2</p>', '<p>Additional 2</p>', 'Check-in 2', 'Check-out 2', 9, false, true) , ('9b6370f7-f941-46f2-bc6e-de455675bd0a', 3, 'Type 2', '<h1>B</h1>', '<p>Features B</p>', '<p>Pricing 2</p>', '<p>2</p>', '<p>Additional 2</p>', 'Check-in 2', 'Check-out 2', 9, false, true, false, true)
$$, $$,
'Should have updated all campsite types.' 'Should have updated all campsite types.'
); );

2
verify/add_campsite_type.sql
View File

@ -2,6 +2,6 @@
begin; begin;
select has_function_privilege('camper.add_campsite_type(integer, integer, text, text, text, text, text, text, text, text, integer, boolean)', 'execute'); select has_function_privilege('camper.add_campsite_type(integer, integer, text, text, text, text, text, text, text, text, integer, boolean, boolean, boolean)', 'execute');
rollback; rollback;

7
verify/add_campsite_type@v2.sql Normal file
View File

@ -0,0 +1,7 @@
-- Verify camper:add_campsite_type on pg
begin;
select has_function_privilege('camper.add_campsite_type(integer, integer, text, text, text, text, text, text, text, text, integer, boolean)', 'execute');
rollback;

10
verify/campsite_type__ask_zone_preferences.sql Normal file
View File

@ -0,0 +1,10 @@
-- Verify camper:campsite_type__ask_zone_preferences on pg
begin;
select ask_zone_preferences
from camper.campsite_type
where false
;
rollback;

10
verify/campsite_type__overflow_allowed.sql Normal file
View File

@ -0,0 +1,10 @@
-- Verify camper:campsite_type__overflow_allowed on pg
begin;
select overflow_allowed
from camper.campsite_type
where false
;
rollback;

2
verify/edit_campsite_type.sql
View File

@ -2,6 +2,6 @@
begin; begin;
select has_function_privilege('camper.edit_campsite_type(uuid, integer, text, text, text, text, text, text, text, text, integer, boolean, boolean)', 'execute'); select has_function_privilege('camper.edit_campsite_type(uuid, integer, text, text, text, text, text, text, text, text, integer, boolean, boolean, boolean, boolean)', 'execute');
rollback; rollback;

7
verify/edit_campsite_type@v2.sql Normal file
View File

@ -0,0 +1,7 @@
-- Verify camper:edit_campsite_type on pg
begin;
select has_function_privilege('camper.edit_campsite_type(uuid, integer, text, text, text, text, text, text, text, text, integer, boolean, boolean)', 'execute');
rollback;

18
web/templates/admin/campsite/type/form.gohtml
View File

@ -88,6 +88,7 @@
{{ template "error-message" . }} {{ template "error-message" . }}
</fieldset> </fieldset>
{{- end }} {{- end }}
<fieldset>
{{ with .MaxCampers -}} {{ with .MaxCampers -}}
<label> <label>
{{( pgettext "Maximum number of campers" "input")}}<br> {{( pgettext "Maximum number of campers" "input")}}<br>
@ -96,6 +97,23 @@
{{ template "error-message" . }} {{ template "error-message" . }}
</label> </label>
{{- end }} {{- end }}
{{ with .OverflowAllowed -}}
<label>
<input type="checkbox" name="{{ .Name }}" {{ if .Checked}}checked{{ end }}
{{ template "error-attrs" . }}>
{{( pgettext "Allow overflowing guests to neighbouring campsites" "input" )}}<br>
</label>
{{ template "error-message" . }}
{{- end }}
</fieldset>
{{ with .AskZonePreferences -}}
<label>
<input type="checkbox" name="{{ .Name }}" {{ if .Checked}}checked{{ end }}
{{ template "error-attrs" . }}>
{{( pgettext "Ask for zone preferences when booking" "input" )}}<br>
</label>
{{ template "error-message" . }}
{{- end }}
{{ with .DogsAllowed -}} {{ with .DogsAllowed -}}
<label> <label>
<input type="checkbox" name="{{ .Name }}" {{ if .Checked}}checked{{ end }} <input type="checkbox" name="{{ .Name }}" {{ if .Checked}}checked{{ end }}

9
web/templates/public/booking.gohtml
View File

@ -91,10 +91,12 @@
</fieldset> </fieldset>
{{ range $campsiteType := .CampsiteType.Options -}} {{ range $campsiteType := .CampsiteType.Options -}}
{{ $options := index $.Form.CampsiteTypeOptions .Value }} {{ $options := index $.Form.CampsiteTypeOptions .Value }}
{{ if $options -}} {{ $zonePreferences := index $.Form.ZonePreferences .Value }}
{{ if or $options $zonePreferences }}
<fieldset class="campsite-options" data-campsite="{{ $campsiteType.Value }}"> <fieldset class="campsite-options" data-campsite="{{ $campsiteType.Value }}">
<legend>{{ .Label }}</legend> <legend>{{ .Label }}</legend>
{{ with $.Form.AreaPreferences -}} {{ with $zonePreferences -}}
<div>
<label> <label>
{{( pgettext "Area preferences (optional)" "input" )}}<br> {{( pgettext "Area preferences (optional)" "input" )}}<br>
<input type="text" <input type="text"
@ -102,6 +104,9 @@
><br> ><br>
</label> </label>
{{ template "error-message" . }} {{ template "error-message" . }}
<a href="/{{ currentLocale }}/campground"
target="_blank">{{( gettext "Campground map" )}}</a><br/>
</div>
{{- end }} {{- end }}
{{ range $options -}} {{ range $options -}}
<label> <label>