Pont d’estil romànic i bany natural a 400 m del càmping.
'); diff --git a/deploy/acsi.sql b/deploy/acsi.sql new file mode 100644 index 0000000..19cfc65 --- /dev/null +++ b/deploy/acsi.sql @@ -0,0 +1,23 @@ +-- Deploy camper:acsi to pg +-- requires: roles +-- requires: schema_camper +-- requires: campsite_type + +begin; + +set search_path to camper, public; + +create table acsi ( + campsite_type_id integer primary key references campsite_type, + number_adults positive_integer not null, + number_teenagers nonnegative_integer not null, + number_children nonnegative_integer not null, + number_dogs nonnegative_integer not null, + cost_per_night nonnegative_integer not null +); + +grant select on table acsi to guest; +grant select on table acsi to employee; +grant select, insert, update, delete on table acsi to admin; + +commit; diff --git a/deploy/acsi_calendar.sql b/deploy/acsi_calendar.sql new file mode 100644 index 0000000..909500d --- /dev/null +++ b/deploy/acsi_calendar.sql @@ -0,0 +1,21 @@ +-- Deploy camper:acsi_calendar to pg +-- requires: roles +-- requires: schema_camper +-- requires: acsi + +begin; + +set search_path to camper, public; + +create table acsi_calendar ( + campsite_type_id integer not null references acsi, + acsi_range daterange not null, + primary key (campsite_type_id, acsi_range), + constraint disallow_acsi_overlap exclude using gist (campsite_type_id with =, acsi_range with &&) +); + +grant select on table acsi_calendar to guest; +grant select on table acsi_calendar to employee; +grant select, insert, update, delete on table acsi_calendar to admin; + +commit; diff --git a/deploy/acsi_option.sql b/deploy/acsi_option.sql new file mode 100644 index 0000000..528a7ef --- /dev/null +++ b/deploy/acsi_option.sql @@ -0,0 +1,22 @@ +-- Deploy camper:acsi_option to pg +-- requires: roles +-- requires: schema_camper +-- requires: acsi +-- requires: campsite_type_option + +begin; + +set search_path to camper, public; + +create table acsi_option ( + campsite_type_id integer not null references acsi, + campsite_type_option_id integer not null references campsite_type_option, + units positive_integer not null, + primary key (campsite_type_id, campsite_type_option_id) +); + +grant select on table acsi_option to guest; +grant select on table acsi_option to employee; +grant select, insert, update, delete on table acsi_option to admin; + +commit; diff --git a/deploy/draft_payment.sql b/deploy/draft_payment.sql index 894cd94..036438e 100644 --- a/deploy/draft_payment.sql +++ b/deploy/draft_payment.sql @@ -11,12 +11,17 @@ -- requires: payment -- requires: payment_option -- requires: company__tourist_tax_max_days +-- requires: acsi +-- requires: acsi_calendar +-- requires: acsi_options begin; set search_path to camper, public; -create or replace function draft_payment(payment_slug uuid, arrival_date date, departure_date date, campsite_type_slug uuid, num_adults integer, num_teenagers integer, num_children integer, num_dogs integer, zone_preferences text, options option_units[]) returns payment as +drop function if exists draft_payment(uuid, date, date, uuid, integer, integer, integer, integer, text, option_units[]); + +create or replace function draft_payment(payment_slug uuid, arrival_date date, departure_date date, campsite_type_slug uuid, num_adults integer, num_teenagers integer, num_children integer, num_dogs integer, zone_preferences text, acsi_card boolean, options option_units[]) returns payment as $$ declare p payment; @@ -44,26 +49,28 @@ begin , currency_code , down_payment_percent , zone_preferences + , acsi_card ) select coalesce(payment_slug, gen_random_uuid()) , company_id - , campsite_type_id + , campsite_type.campsite_type_id , arrival_date , departure_date - , sum(cost.cost_per_night * ceiling((num_adults::numeric + num_teenagers::numeric + num_children::numeric) / max_campers::numeric)::integer)::integer + , sum(coalesce(acsi.cost_per_night, 0) + cost.cost_per_night * (ceiling((num_adults::numeric + num_teenagers::numeric + num_children::numeric) / max_campers::numeric)::integer - case when acsi.cost_per_night is null then 0 else 1 end))::integer , num_adults - , sum(cost_per_adult * num_adults)::integer + , sum(cost_per_adult * greatest(0, num_adults - coalesce(acsi.number_adults, 0)))::integer , num_teenagers - , sum(cost_per_teenager * num_teenagers)::integer + , sum(cost_per_teenager * greatest(0, num_teenagers - coalesce(acsi.number_teenagers, 0)))::integer , num_children - , sum(cost_per_child * num_children)::integer + , sum(cost_per_child * greatest(0, num_children - coalesce(acsi.number_children, 0)))::integer , num_dogs - , sum(case when num_dogs > 0 then coalesce(pet.cost_per_night, 0) else 0 end)::integer + , sum(case when (num_dogs - coalesce(acsi.number_dogs, 0)) > 0 then coalesce(pet.cost_per_night, 0) else 0 end)::integer , sum(case when day_num <= tourist_tax_max_days then tourist_tax * num_adults else 0 end)::integer , 0 , currency_code , case when arrival_date - current_date >= 7 then 0.3 else 1.0 end , coalesce(zone_preferences, '') + , acsi_card from generate_series(arrival_date, departure_date - 1, interval '1 day') with ordinality as date(day, day_num) left join season_calendar on season_range @> date.day::date left join season using (season_id) @@ -71,9 +78,13 @@ begin left join campsite_type_pet_cost as pet using (campsite_type_id) left join campsite_type_cost as cost using (campsite_type_id, season_id) left join company using (company_id) + left join (acsi join acsi_calendar using (campsite_type_id)) as acsi + on acsi_card + and acsi.campsite_type_id = campsite_type.campsite_type_id + and date.day::date <@ acsi_range where campsite_type.slug = campsite_type_slug group by company_id - , campsite_type_id + , campsite_type.campsite_type_id , currency_code on conflict (slug) do update set company_id = excluded.company_id @@ -94,6 +105,7 @@ begin , currency_code = excluded.currency_code , down_payment_percent = excluded.down_payment_percent , zone_preferences = excluded.zone_preferences + , acsi_card = excluded.acsi_card , updated_at = current_timestamp returning * into p @@ -115,16 +127,18 @@ begin , subtotal ) select p.payment_id - , campsite_type_option_id - , units - , case when per_night then sum(cost * units)::integer else max(cost * units)::integer end + , campsite_type_option.campsite_type_option_id + , option.units + , case when per_night then sum(cost * greatest(0, option.units - coalesce(acsi_option.units, 0)))::integer else max(cost * greatest(0, option.units - coalesce(acsi_option.units, 0)))::integer end from generate_series(arrival_date, departure_date - 1, interval '1 day') as date(day) join season_calendar on season_range @> date.day::date join campsite_type_option_cost using (season_id) join campsite_type_option using (campsite_type_option_id) join unnest(options) as option(campsite_type_option_id, units) using (campsite_type_option_id) - group by campsite_type_option_id - , units + left join acsi_calendar on acsi_card and day::date <@ acsi_range + left join acsi_option on acsi_option.campsite_type_id = acsi_calendar.campsite_type_id and acsi_option.campsite_type_option_id = campsite_type_option.campsite_type_option_id + group by campsite_type_option.campsite_type_option_id + , option.units , per_night on conflict (payment_id, campsite_type_option_id) do update set units = excluded.units @@ -161,9 +175,9 @@ $$ language plpgsql ; -revoke execute on function draft_payment(uuid, date, date, uuid, integer, integer, integer, integer, text, option_units[]) from public; -grant execute on function draft_payment(uuid, date, date, uuid, integer, integer, integer, integer, text, option_units[]) to guest; -grant execute on function draft_payment(uuid, date, date, uuid, integer, integer, integer, integer, text, option_units[]) to employee; -grant execute on function draft_payment(uuid, date, date, uuid, integer, integer, integer, integer, text, option_units[]) to admin; +revoke execute on function draft_payment(uuid, date, date, uuid, integer, integer, integer, integer, text, boolean, option_units[]) from public; +grant execute on function draft_payment(uuid, date, date, uuid, integer, integer, integer, integer, text, boolean, option_units[]) to guest; +grant execute on function draft_payment(uuid, date, date, uuid, integer, integer, integer, integer, text, boolean, option_units[]) to employee; +grant execute on function draft_payment(uuid, date, date, uuid, integer, integer, integer, integer, text, boolean, option_units[]) to admin; commit; diff --git a/deploy/draft_payment@v5.sql b/deploy/draft_payment@v5.sql new file mode 100644 index 0000000..894cd94 --- /dev/null +++ b/deploy/draft_payment@v5.sql @@ -0,0 +1,169 @@ +-- Deploy camper:draft_payment to pg +-- requires: roles +-- requires: schema_camper +-- requires: season_calendar +-- requires: season +-- requires: campsite_type +-- requires: campsite_type_pet_cost +-- requires: campsite_type_cost +-- requires: campsite_type_option_cost +-- requires: campsite_type_option +-- requires: payment +-- requires: payment_option +-- requires: company__tourist_tax_max_days + +begin; + +set search_path to camper, public; + +create or replace function draft_payment(payment_slug uuid, arrival_date date, departure_date date, campsite_type_slug uuid, num_adults integer, num_teenagers integer, num_children integer, num_dogs integer, zone_preferences text, options option_units[]) returns payment as +$$ +declare + p payment; +begin + if exists(select 1 from payment where slug = payment_slug and payment_status <> 'draft') then + payment_slug = null; + end if; + insert into payment ( + slug + , company_id + , campsite_type_id + , arrival_date + , departure_date + , subtotal_nights + , number_adults + , subtotal_adults + , number_teenagers + , subtotal_teenagers + , number_children + , subtotal_children + , number_dogs + , subtotal_dogs + , subtotal_tourist_tax + , total + , currency_code + , down_payment_percent + , zone_preferences + ) + select coalesce(payment_slug, gen_random_uuid()) + , company_id + , campsite_type_id + , arrival_date + , departure_date + , sum(cost.cost_per_night * ceiling((num_adults::numeric + num_teenagers::numeric + num_children::numeric) / max_campers::numeric)::integer)::integer + , num_adults + , sum(cost_per_adult * num_adults)::integer + , num_teenagers + , sum(cost_per_teenager * num_teenagers)::integer + , num_children + , sum(cost_per_child * num_children)::integer + , num_dogs + , sum(case when num_dogs > 0 then coalesce(pet.cost_per_night, 0) else 0 end)::integer + , sum(case when day_num <= tourist_tax_max_days then tourist_tax * num_adults else 0 end)::integer + , 0 + , currency_code + , case when arrival_date - current_date >= 7 then 0.3 else 1.0 end + , coalesce(zone_preferences, '') + from generate_series(arrival_date, departure_date - 1, interval '1 day') with ordinality as date(day, day_num) + left join season_calendar on season_range @> date.day::date + left join season using (season_id) + left join campsite_type using (company_id) + left join campsite_type_pet_cost as pet using (campsite_type_id) + left join campsite_type_cost as cost using (campsite_type_id, season_id) + left join company using (company_id) + where campsite_type.slug = campsite_type_slug + group by company_id + , campsite_type_id + , currency_code + on conflict (slug) do update + set company_id = excluded.company_id + , campsite_type_id = excluded.campsite_type_id + , arrival_date = excluded.arrival_date + , departure_date = excluded.departure_date + , subtotal_nights = excluded.subtotal_nights + , number_adults = excluded.number_adults + , subtotal_adults = excluded.subtotal_adults + , number_teenagers = excluded.number_teenagers + , subtotal_teenagers = excluded.subtotal_teenagers + , number_children = excluded.number_children + , subtotal_children = excluded.subtotal_children + , number_dogs = excluded.number_dogs + , subtotal_dogs = excluded.subtotal_dogs + , subtotal_tourist_tax = excluded.subtotal_tourist_tax + , total = excluded.total + , currency_code = excluded.currency_code + , down_payment_percent = excluded.down_payment_percent + , zone_preferences = excluded.zone_preferences + , updated_at = current_timestamp + returning * + into p + ; + + if array_length(coalesce(options, array[]::option_units[]), 1) > 0 then + delete + from payment_option + where payment_id = p.payment_id + and campsite_type_option_id not in ( + select campsite_type_option_id + from unnest(options) as option(campsite_type_option_id, units) + ); + + insert into payment_option ( + payment_id + , campsite_type_option_id + , units + , subtotal + ) + select p.payment_id + , campsite_type_option_id + , units + , case when per_night then sum(cost * units)::integer else max(cost * units)::integer end + from generate_series(arrival_date, departure_date - 1, interval '1 day') as date(day) + join season_calendar on season_range @> date.day::date + join campsite_type_option_cost using (season_id) + join campsite_type_option using (campsite_type_option_id) + join unnest(options) as option(campsite_type_option_id, units) using (campsite_type_option_id) + group by campsite_type_option_id + , units + , per_night + on conflict (payment_id, campsite_type_option_id) do update + set units = excluded.units + , subtotal = excluded.subtotal + ; + + with option as ( + select sum(subtotal)::integer as subtotal + from payment_option + where payment_id = p.payment_id + ) + update payment + set total = subtotal_nights + subtotal_adults + subtotal_teenagers + subtotal_children + subtotal_dogs + subtotal_tourist_tax + coalesce(option.subtotal, 0) + from option + where payment_id = p.payment_id + returning total into p.total + ; + else + delete + from payment_option + where payment_id = p.payment_id; + + update payment + set total = subtotal_nights + subtotal_adults + subtotal_teenagers + subtotal_children + subtotal_dogs + subtotal_tourist_tax + where payment_id = p.payment_id + returning total into p.total + ; + end if; + + + return p; +end; +$$ + language plpgsql +; + +revoke execute on function draft_payment(uuid, date, date, uuid, integer, integer, integer, integer, text, option_units[]) from public; +grant execute on function draft_payment(uuid, date, date, uuid, integer, integer, integer, integer, text, option_units[]) to guest; +grant execute on function draft_payment(uuid, date, date, uuid, integer, integer, integer, integer, text, option_units[]) to employee; +grant execute on function draft_payment(uuid, date, date, uuid, integer, integer, integer, integer, text, option_units[]) to admin; + +commit; diff --git a/deploy/payment__acsi_card.sql b/deploy/payment__acsi_card.sql new file mode 100644 index 0000000..349910d --- /dev/null +++ b/deploy/payment__acsi_card.sql @@ -0,0 +1,22 @@ +-- Deploy camper:payment__acsi_card to pg +-- requires: payment + +begin; + +set search_path to camper, public; + +alter table payment +add column acsi_card boolean not null default false +; + +update payment +set acsi_card = payment_customer.acsi_card +from payment_customer +where payment_customer.payment_id = payment.payment_id +; + +alter table payment +alter column acsi_card drop default +; + +commit; diff --git a/deploy/payment_customer__-acsi_card.sql b/deploy/payment_customer__-acsi_card.sql new file mode 100644 index 0000000..7093b9d --- /dev/null +++ b/deploy/payment_customer__-acsi_card.sql @@ -0,0 +1,10 @@ +-- Deploy camper:payment_customer__-acsi_card to pg +-- requires: payment__acsi_card + +begin; + +alter table camper.payment_customer +drop column if exists acsi_card +; + +commit; diff --git a/deploy/ready_payment.sql b/deploy/ready_payment.sql index ad25355..f0e522e 100644 --- a/deploy/ready_payment.sql +++ b/deploy/ready_payment.sql @@ -6,12 +6,16 @@ -- requires: country_code -- requires: email -- requires: extension_pg_libphonenumber +-- requires: payment__acsi_card +-- requires: payment_customer__-acsi_card begin; set search_path to camper, public; -create or replace function ready_payment(payment_slug uuid, customer_name text, customer_address text, customer_post_code text, customer_city text, customer_country_code country_code, customer_email email, customer_phone text, customer_lang_tag text, customer_acsi_card boolean) returns integer as +drop function if exists ready_payment(uuid, text, text, text, text, country_code, email, text, text, boolean); + +create or replace function ready_payment(payment_slug uuid, customer_name text, customer_address text, customer_post_code text, customer_city text, customer_country_code country_code, customer_email email, customer_phone text, customer_lang_tag text) returns integer as $$ declare pid integer; @@ -28,8 +32,8 @@ begin raise check_violation using message = 'insert or update on table "payment" violates check constraint "payment_is_draft"'; end if; - insert into payment_customer (payment_id, full_name, address, postal_code, city, country_code, email, phone, acsi_card, lang_tag) - values (pid, customer_name, customer_address, customer_post_code, customer_city, customer_country_code, customer_email, parse_packed_phone_number(customer_phone, customer_country_code), customer_acsi_card, customer_lang_tag) + insert into payment_customer (payment_id, full_name, address, postal_code, city, country_code, email, phone, lang_tag) + values (pid, customer_name, customer_address, customer_post_code, customer_city, customer_country_code, customer_email, parse_packed_phone_number(customer_phone, customer_country_code), customer_lang_tag) on conflict (payment_id) do update set full_name = excluded.full_name , address = excluded.address @@ -38,7 +42,6 @@ begin , country_code = excluded.country_code , email = excluded.email , phone = excluded.phone - , acsi_card = excluded.acsi_card , lang_tag = excluded.lang_tag ; @@ -48,9 +51,9 @@ $$ language plpgsql ; -revoke execute on function ready_payment(uuid, text, text, text, text, country_code, email, text, text, boolean) from public; -grant execute on function ready_payment(uuid, text, text, text, text, country_code, email, text, text, boolean) to guest; -grant execute on function ready_payment(uuid, text, text, text, text, country_code, email, text, text, boolean) to employee; -grant execute on function ready_payment(uuid, text, text, text, text, country_code, email, text, text, boolean) to admin; +revoke execute on function ready_payment(uuid, text, text, text, text, country_code, email, text, text) from public; +grant execute on function ready_payment(uuid, text, text, text, text, country_code, email, text, text) to guest; +grant execute on function ready_payment(uuid, text, text, text, text, country_code, email, text, text) to employee; +grant execute on function ready_payment(uuid, text, text, text, text, country_code, email, text, text) to admin; commit; diff --git a/deploy/ready_payment@v5.sql b/deploy/ready_payment@v5.sql new file mode 100644 index 0000000..ad25355 --- /dev/null +++ b/deploy/ready_payment@v5.sql @@ -0,0 +1,56 @@ +-- Deploy camper:ready_payment to pg +-- requires: roles +-- requires: schema_camper +-- requires: payment +-- requires: payment_customer +-- requires: country_code +-- requires: email +-- requires: extension_pg_libphonenumber + +begin; + +set search_path to camper, public; + +create or replace function ready_payment(payment_slug uuid, customer_name text, customer_address text, customer_post_code text, customer_city text, customer_country_code country_code, customer_email email, customer_phone text, customer_lang_tag text, customer_acsi_card boolean) returns integer as +$$ +declare + pid integer; +begin + update payment + set payment_status = 'pending' + , updated_at = current_timestamp + where slug = payment_slug + and payment_status = 'draft' + returning payment_id into pid + ; + + if pid is null then + raise check_violation using message = 'insert or update on table "payment" violates check constraint "payment_is_draft"'; + end if; + + insert into payment_customer (payment_id, full_name, address, postal_code, city, country_code, email, phone, acsi_card, lang_tag) + values (pid, customer_name, customer_address, customer_post_code, customer_city, customer_country_code, customer_email, parse_packed_phone_number(customer_phone, customer_country_code), customer_acsi_card, customer_lang_tag) + on conflict (payment_id) do update + set full_name = excluded.full_name + , address = excluded.address + , postal_code = excluded.postal_code + , city = excluded.city + , country_code = excluded.country_code + , email = excluded.email + , phone = excluded.phone + , acsi_card = excluded.acsi_card + , lang_tag = excluded.lang_tag + ; + + return pid; +end; +$$ + language plpgsql +; + +revoke execute on function ready_payment(uuid, text, text, text, text, country_code, email, text, text, boolean) from public; +grant execute on function ready_payment(uuid, text, text, text, text, country_code, email, text, text, boolean) to guest; +grant execute on function ready_payment(uuid, text, text, text, text, country_code, email, text, text, boolean) to employee; +grant execute on function ready_payment(uuid, text, text, text, text, country_code, email, text, text, boolean) to admin; + +commit; diff --git a/pkg/booking/cart.go b/pkg/booking/cart.go index 15e1760..6f61583 100644 --- a/pkg/booking/cart.go +++ b/pkg/booking/cart.go @@ -66,6 +66,11 @@ func newBookingCart(ctx context.Context, conn *database.Conn, f *bookingForm, ca zonePreferences = f.Options.ZonePreferences.Val } + var ACSICard bool + if f.Guests.ACSICard != nil { + ACSICard = f.Guests.ACSICard.Checked + } + optionMap := make(map[int]*campsiteTypeOption) var typeOptions []*campsiteTypeOption if f.Options != nil { @@ -97,7 +102,7 @@ func newBookingCart(ctx context.Context, conn *database.Conn, f *bookingForm, ca , to_price(total, decimal_digits) , to_price(payment.down_payment, decimal_digits) , (payment.down_payment_percent * 100)::int - from draft_payment($1, $2, $3, $4, $5, $6, $7, $8, $9, $10) as payment + from draft_payment($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11) as payment join currency using (currency_code) `, database.ZeroNullUUID(f.PaymentSlug.Val), @@ -109,6 +114,7 @@ func newBookingCart(ctx context.Context, conn *database.Conn, f *bookingForm, ca numChildren, numDogs, zonePreferences, + ACSICard, database.OptionUnitsArray(optionUnits), ) var paymentID int diff --git a/pkg/booking/payment.go b/pkg/booking/payment.go index fa120df..b662e07 100644 --- a/pkg/booking/payment.go +++ b/pkg/booking/payment.go @@ -43,7 +43,6 @@ func requestPayment(w http.ResponseWriter, r *http.Request, user *auth.User, com f.Customer.Email.Val, f.Customer.Phone.Val, user.Locale.Language, - f.Customer.ACSICard.Checked, ) if err != nil { panic(err) diff --git a/pkg/booking/public.go b/pkg/booking/public.go index be029fd..3f21c98 100644 --- a/pkg/booking/public.go +++ b/pkg/booking/public.go @@ -119,6 +119,7 @@ type bookingGuestFields struct { NumberTeenagers *form.Input NumberChildren *form.Input NumberDogs *form.Input + ACSICard *form.Checkbox Error error } @@ -144,7 +145,6 @@ type bookingCustomerFields struct { Country *form.Select Email *form.Input Phone *form.Input - ACSICard *form.Checkbox Agreement *form.Checkbox } @@ -183,7 +183,7 @@ func newBookingForm(r *http.Request, company *auth.Company, conn *database.Conn, return f, nil } - f.Guests, err = newBookingGuestFields(r.Context(), conn, campsiteType) + f.Guests, err = newBookingGuestFields(r.Context(), conn, campsiteType, f.Dates.ArrivalDate.Val, f.Dates.DepartureDate.Val) if err != nil { return nil, err } @@ -317,7 +317,7 @@ func (f *DateFields) Valid(v *form.Validator, l *locale.Locale) { } } -func newBookingGuestFields(ctx context.Context, conn *database.Conn, campsiteType string) (*bookingGuestFields, error) { +func newBookingGuestFields(ctx context.Context, conn *database.Conn, campsiteType string, arrivalDate string, departureDate string) (*bookingGuestFields, error) { f := &bookingGuestFields{ NumberAdults: &form.Input{Name: "number_adults"}, NumberTeenagers: &form.Input{Name: "number_teenagers"}, @@ -327,17 +327,26 @@ func newBookingGuestFields(ctx context.Context, conn *database.Conn, campsiteTyp select max_campers , overflow_allowed , pet.cost_per_night is not null as dogs_allowed + , exists ( + select 1 from acsi_calendar + where acsi_calendar.campsite_type_id = campsite_type.campsite_type_id + and acsi_range && daterange($2::date, $3::date) + ) as acsi_allowed from campsite_type left join campsite_type_pet_cost as pet using (campsite_type_id) where slug = $1 - `, campsiteType) + `, campsiteType, arrivalDate, departureDate) var dogsAllowed bool - if err := row.Scan(&f.MaxGuests, &f.OverflowAllowed, &dogsAllowed); err != nil { + var ACSIAllowed bool + if err := row.Scan(&f.MaxGuests, &f.OverflowAllowed, &dogsAllowed, &ACSIAllowed); err != nil { return nil, err } if dogsAllowed { f.NumberDogs = &form.Input{Name: "number_dogs"} } + if ACSIAllowed { + f.ACSICard = &form.Checkbox{Name: "acsi_card"} + } return f, nil } @@ -349,6 +358,9 @@ func (f *bookingGuestFields) FillValues(r *http.Request, l *locale.Locale) { if f.NumberDogs != nil { fillNumericField(f.NumberDogs, r, 0) } + if f.ACSICard != nil { + f.ACSICard.FillValue(r) + } if numGuests > f.MaxGuests { if f.OverflowAllowed { f.Overflow = true @@ -495,9 +507,6 @@ func newBookingCustomerFields(ctx context.Context, conn *database.Conn, l *local Phone: &form.Input{ Name: "phone", }, - ACSICard: &form.Checkbox{ - Name: "acsi_card", - }, Agreement: &form.Checkbox{ Name: "agreement", }, @@ -512,7 +521,6 @@ func (f *bookingCustomerFields) FillValues(r *http.Request) { f.Country.FillValue(r) f.Email.FillValue(r) f.Phone.FillValue(r) - f.ACSICard.FillValue(r) f.Agreement.FillValue(r) } diff --git a/pkg/database/funcs.go b/pkg/database/funcs.go index a157095..8846585 100644 --- a/pkg/database/funcs.go +++ b/pkg/database/funcs.go @@ -348,6 +348,6 @@ func (tx *Tx) TranslateHome(ctx context.Context, companyID int, langTag language return err } -func (c *Conn) ReadyPayment(ctx context.Context, paymentSlug string, customerName string, customerAddress string, customerPostCode string, customerCity string, customerCountryCode string, customerEmail string, customerPhone string, customerLangTag language.Tag, acsiCard bool) (int, error) { - return c.GetInt(ctx, "select ready_payment($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)", paymentSlug, customerName, customerAddress, customerPostCode, customerCity, customerCountryCode, customerEmail, customerPhone, customerLangTag, acsiCard) +func (c *Conn) ReadyPayment(ctx context.Context, paymentSlug string, customerName string, customerAddress string, customerPostCode string, customerCity string, customerCountryCode string, customerEmail string, customerPhone string, customerLangTag language.Tag) (int, error) { + return c.GetInt(ctx, "select ready_payment($1, $2, $3, $4, $5, $6, $7, $8, $9)", paymentSlug, customerName, customerAddress, customerPostCode, customerCity, customerCountryCode, customerEmail, customerPhone, customerLangTag) } diff --git a/pkg/payment/admin.go b/pkg/payment/admin.go index de69dfb..fe69d96 100644 --- a/pkg/payment/admin.go +++ b/pkg/payment/admin.go @@ -178,6 +178,7 @@ type paymentDetails struct { DownPaymentPercent int DownPayment string ZonePreferences string + ACSICard bool Status string StatusLabel string CreatedAt time.Time @@ -200,7 +201,6 @@ type paymentCustomer struct { Email string Phone string Language string - ACSICard bool } func fetchPaymentDetails(ctx context.Context, conn *database.Conn, slug string, locale *locale.Locale) (*paymentDetails, error) { @@ -220,6 +220,7 @@ func fetchPaymentDetails(ctx context.Context, conn *database.Conn, slug string, , (down_payment_percent * 100)::integer , to_price(payment.down_payment, decimal_digits) , zone_preferences + , acsi_card , payment.payment_status , coalesce(payment_status_i18n.name, payment_status.name) , created_at @@ -251,6 +252,7 @@ func fetchPaymentDetails(ctx context.Context, conn *database.Conn, slug string, &details.DownPaymentPercent, &details.DownPayment, &details.ZonePreferences, + &details.ACSICard, &details.Status, &details.StatusLabel, &details.CreatedAt, @@ -309,7 +311,6 @@ func fetchPaymentCustomer(ctx context.Context, conn *database.Conn, paymentID in , email , phone::text , language.endonym - , acsi_card from payment_customer join country using (country_code) left join country_i18n on country.country_code = country_i18n.country_code @@ -327,7 +328,6 @@ func fetchPaymentCustomer(ctx context.Context, conn *database.Conn, paymentID in &customer.Email, &customer.Phone, &customer.Language, - &customer.ACSICard, ); err != nil { return nil, err } diff --git a/po/ca.po b/po/ca.po index a95bbb4..3fceeec 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: camper\n" "Report-Msgid-Bugs-To: jordi@tandem.blog\n" -"POT-Creation-Date: 2024-02-29 16:55+0100\n" +"POT-Creation-Date: 2024-03-14 22:05+0100\n" "PO-Revision-Date: 2024-02-06 10:04+0100\n" "Last-Translator: jordi fita masA
', 5, '[1, 7]', true) ; select throws_ok( - $$ insert into payment (company_id, campsite_type_id, arrival_date, departure_date, subtotal_nights, number_adults, subtotal_adults, number_teenagers, subtotal_teenagers, number_children, subtotal_children, number_dogs, subtotal_dogs, subtotal_tourist_tax, total, currency_code, zone_preferences) values (1, 10, '2024-07-07', '2024-07-07', 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'EUR', '') $$, + $$ insert into payment (company_id, campsite_type_id, arrival_date, departure_date, subtotal_nights, number_adults, subtotal_adults, number_teenagers, subtotal_teenagers, number_children, subtotal_children, number_dogs, subtotal_dogs, subtotal_tourist_tax, total, currency_code, zone_preferences, acsi_card) values (1, 10, '2024-07-07', '2024-07-07', 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'EUR', '', false) $$, '23514', 'new row for relation "payment" violates check constraint "departure_after_arrival"', 'Should not be able to insert a payment with a departure date equal or before the arrival date (i.e., at least one night)' ); diff --git a/test/payment_customer.sql b/test/payment_customer.sql index d722344..e1ddef3 100644 --- a/test/payment_customer.sql +++ b/test/payment_customer.sql @@ -5,7 +5,7 @@ reset client_min_messages; begin; -select plan(53); +select plan(49); set search_path to camper, public; @@ -61,11 +61,6 @@ select col_type_is('payment_customer', 'phone', 'packed_phone_number'); select col_not_null('payment_customer', 'phone'); select col_hasnt_default('payment_customer', 'phone'); -select has_column('payment_customer', 'acsi_card'); -select col_type_is('payment_customer', 'acsi_card', 'boolean'); -select col_not_null('payment_customer', 'acsi_card'); -select col_hasnt_default('payment_customer', 'acsi_card'); - select has_column('payment_customer', 'lang_tag'); select col_is_fk('payment_customer', 'lang_tag'); select fk_ok('payment_customer', 'lang_tag', 'language', 'lang_tag'); diff --git a/test/payment_reference.sql b/test/payment_reference.sql index 279d0a5..2eaa63c 100644 --- a/test/payment_reference.sql +++ b/test/payment_reference.sql @@ -44,14 +44,14 @@ insert into campsite_type (campsite_type_id, slug, company_id, name, media_id, m values (12, 'c1b6f4fc-32c1-4cd5-b796-0c5059152a52', 2, 'Plots', 10, 6, '[1, 7]', true) ; -insert into payment (payment_id, slug, company_id, campsite_type_id, arrival_date, departure_date, subtotal_nights, number_adults, subtotal_adults, number_teenagers, subtotal_teenagers, number_children, subtotal_children, number_dogs, subtotal_dogs, subtotal_tourist_tax, total, currency_code, zone_preferences) -values (22, '4ef35e2f-ef98-42d6-a724-913bd761ca8c', 2, 12, '2024-08-29', '2024-09-03', 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'EUR', '') - , (23, '6d1b8e4c-c3c6-4fe4-92c1-2cbf94526693', 2, 12, '2024-08-29', '2024-09-03', 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'EUR', '') - , (24, '8d38a482-8a25-4d85-9929-e5f425fcac04', 2, 12, '2024-08-29', '2024-09-03', 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'EUR', '') - , (25, 'b770f8b7-f148-4ab4-a786-aa070af598e5', 2, 12, '2024-08-29', '2024-09-03', 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'EUR', '') - , (26, '31910d73-d343-44b7-8a29-f7e075b64933', 2, 12, '2024-08-29', '2024-09-03', 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'EUR', '') - , (27, 'c9488490-ac09-4402-90cd-f6f0546f04c0', 2, 12, '2024-08-29', '2024-09-03', 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'EUR', '') - , (28, '5819823e-c0ac-4baa-a3ae-515fbb70e909', 2, 12, '2024-08-29', '2024-09-03', 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'EUR', '') +insert into payment (payment_id, slug, company_id, campsite_type_id, arrival_date, departure_date, subtotal_nights, number_adults, subtotal_adults, number_teenagers, subtotal_teenagers, number_children, subtotal_children, number_dogs, subtotal_dogs, subtotal_tourist_tax, total, currency_code, zone_preferences, acsi_card) +values (22, '4ef35e2f-ef98-42d6-a724-913bd761ca8c', 2, 12, '2024-08-29', '2024-09-03', 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'EUR', '', false) + , (23, '6d1b8e4c-c3c6-4fe4-92c1-2cbf94526693', 2, 12, '2024-08-29', '2024-09-03', 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'EUR', '', false) + , (24, '8d38a482-8a25-4d85-9929-e5f425fcac04', 2, 12, '2024-08-29', '2024-09-03', 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'EUR', '', false) + , (25, 'b770f8b7-f148-4ab4-a786-aa070af598e5', 2, 12, '2024-08-29', '2024-09-03', 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'EUR', '', false) + , (26, '31910d73-d343-44b7-8a29-f7e075b64933', 2, 12, '2024-08-29', '2024-09-03', 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'EUR', '', false) + , (27, 'c9488490-ac09-4402-90cd-f6f0546f04c0', 2, 12, '2024-08-29', '2024-09-03', 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'EUR', '', false) + , (28, '5819823e-c0ac-4baa-a3ae-515fbb70e909', 2, 12, '2024-08-29', '2024-09-03', 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'EUR', '', false) ; select bag_eq( diff --git a/test/process_payment_response.sql b/test/process_payment_response.sql index dcb1c4d..e949d57 100644 --- a/test/process_payment_response.sql +++ b/test/process_payment_response.sql @@ -44,17 +44,17 @@ insert into campsite_type (campsite_type_id, slug, company_id, name, media_id, m values (12, 'c1b6f4fc-32c1-4cd5-b796-0c5059152a52', 2, 'Plots', 10, 6, '[1, 7]', true) ; -insert into payment (payment_id, slug, company_id, campsite_type_id, arrival_date, departure_date, subtotal_nights, number_adults, subtotal_adults, number_teenagers, subtotal_teenagers, number_children, subtotal_children, number_dogs, subtotal_dogs, subtotal_tourist_tax, total, currency_code, zone_preferences, payment_status, created_at, updated_at) -values (22, '4ef35e2f-ef98-42d6-a724-913bd761ca8c', 2, 12, '2024-08-28', '2024-09-04', 3200, 2, 10420, 4, 20840, 6, 25080, 3, 2450, 4900, 79160, 'EUR', 'pref I before E', 'draft', '2024-01-01 01:01:01', '2024-01-01 01:01:01') - , (24, '6d1b8e4c-c3c6-4fe4-92c1-2cbf94526693', 2, 12, '2024-08-29', '2024-09-03', 71000, 1, 0, 2, 0, 3, 0, 0, 0, 1750, 72750, 'EUR', '', 'pending', '2024-01-02 02:02:02', '2024-01-02 02:02:02') - , (26, '8d38a482-8a25-4d85-9929-e5f425fcac04', 2, 12, '2024-08-29', '2024-09-03', 71000, 1, 0, 2, 0, 3, 0, 0, 0, 1750, 72750, 'EUR', '', 'completed', '2024-01-03 03:03:03', '2024-01-03 03:03:03') - , (28, 'b770f8b7-f148-4ab4-a786-aa070af598e5', 2, 12, '2024-08-29', '2024-09-03', 71000, 1, 0, 2, 0, 3, 0, 0, 0, 1750, 72750, 'EUR', '', 'failed', '2024-01-04 04:04:04', '2024-01-04 04:04:04') - , (30, '31910d73-d343-44b7-8a29-f7e075b64933', 2, 12, '2024-08-29', '2024-09-03', 71000, 1, 0, 2, 0, 3, 0, 0, 0, 1750, 72750, 'EUR', '', 'refunded', '2024-01-05 05:05:05', '2024-01-05 05:05:05') - , (32, 'c9488490-ac09-4402-90cd-f6f0546f04c0', 2, 12, '2024-08-29', '2024-09-03', 71000, 1, 0, 2, 0, 3, 0, 0, 0, 1750, 72750, 'EUR', '', 'pending', '2024-01-05 05:05:05', '2024-01-05 05:05:05') - , (34, '5819823e-c0ac-4baa-a3ae-515fbb70e909', 2, 12, '2024-08-29', '2024-09-03', 71000, 1, 0, 2, 0, 3, 0, 0, 0, 1750, 72750, 'EUR', '', 'pending', '2024-01-05 05:05:05', '2024-01-06 06:06:06') - , (36, 'f2871c2d-e11a-41e8-b264-0a8605c77dc1', 2, 12, '2024-08-29', '2024-09-03', 71000, 1, 0, 2, 0, 3, 0, 0, 0, 1750, 72750, 'EUR', '', 'pending', '2024-01-05 05:05:05', '2024-01-06 06:06:06') - , (38, '01505d14-6f4d-48a2-9a98-3a2099ab7eef', 2, 12, '2024-08-29', '2024-09-03', 71000, 1, 0, 2, 0, 3, 0, 0, 0, 1750, 72750, 'EUR', '', 'preauth', '2024-01-05 05:05:05', '2024-01-06 06:06:06') - , (40, '7cae7d1c-d626-41e0-b1c5-48359e515579', 2, 12, '2024-08-29', '2024-09-03', 71000, 1, 0, 2, 0, 3, 0, 0, 0, 1750, 72750, 'EUR', '', 'preauth', '2024-01-05 05:05:05', '2024-01-06 06:06:06') +insert into payment (payment_id, slug, company_id, campsite_type_id, arrival_date, departure_date, subtotal_nights, number_adults, subtotal_adults, number_teenagers, subtotal_teenagers, number_children, subtotal_children, number_dogs, subtotal_dogs, subtotal_tourist_tax, total, currency_code, zone_preferences, acsi_card, payment_status, created_at, updated_at) +values (22, '4ef35e2f-ef98-42d6-a724-913bd761ca8c', 2, 12, '2024-08-28', '2024-09-04', 3200, 2, 10420, 4, 20840, 6, 25080, 3, 2450, 4900, 79160, 'EUR', 'pref I before E', false, 'draft', '2024-01-01 01:01:01', '2024-01-01 01:01:01') + , (24, '6d1b8e4c-c3c6-4fe4-92c1-2cbf94526693', 2, 12, '2024-08-29', '2024-09-03', 71000, 1, 0, 2, 0, 3, 0, 0, 0, 1750, 72750, 'EUR', '', false, 'pending', '2024-01-02 02:02:02', '2024-01-02 02:02:02') + , (26, '8d38a482-8a25-4d85-9929-e5f425fcac04', 2, 12, '2024-08-29', '2024-09-03', 71000, 1, 0, 2, 0, 3, 0, 0, 0, 1750, 72750, 'EUR', '', false, 'completed', '2024-01-03 03:03:03', '2024-01-03 03:03:03') + , (28, 'b770f8b7-f148-4ab4-a786-aa070af598e5', 2, 12, '2024-08-29', '2024-09-03', 71000, 1, 0, 2, 0, 3, 0, 0, 0, 1750, 72750, 'EUR', '', false, 'failed', '2024-01-04 04:04:04', '2024-01-04 04:04:04') + , (30, '31910d73-d343-44b7-8a29-f7e075b64933', 2, 12, '2024-08-29', '2024-09-03', 71000, 1, 0, 2, 0, 3, 0, 0, 0, 1750, 72750, 'EUR', '', false, 'refunded', '2024-01-05 05:05:05', '2024-01-05 05:05:05') + , (32, 'c9488490-ac09-4402-90cd-f6f0546f04c0', 2, 12, '2024-08-29', '2024-09-03', 71000, 1, 0, 2, 0, 3, 0, 0, 0, 1750, 72750, 'EUR', '', false, 'pending', '2024-01-05 05:05:05', '2024-01-05 05:05:05') + , (34, '5819823e-c0ac-4baa-a3ae-515fbb70e909', 2, 12, '2024-08-29', '2024-09-03', 71000, 1, 0, 2, 0, 3, 0, 0, 0, 1750, 72750, 'EUR', '', false, 'pending', '2024-01-05 05:05:05', '2024-01-06 06:06:06') + , (36, 'f2871c2d-e11a-41e8-b264-0a8605c77dc1', 2, 12, '2024-08-29', '2024-09-03', 71000, 1, 0, 2, 0, 3, 0, 0, 0, 1750, 72750, 'EUR', '', false, 'pending', '2024-01-05 05:05:05', '2024-01-06 06:06:06') + , (38, '01505d14-6f4d-48a2-9a98-3a2099ab7eef', 2, 12, '2024-08-29', '2024-09-03', 71000, 1, 0, 2, 0, 3, 0, 0, 0, 1750, 72750, 'EUR', '', false, 'preauth', '2024-01-05 05:05:05', '2024-01-06 06:06:06') + , (40, '7cae7d1c-d626-41e0-b1c5-48359e515579', 2, 12, '2024-08-29', '2024-09-03', 71000, 1, 0, 2, 0, 3, 0, 0, 0, 1750, 72750, 'EUR', '', false, 'preauth', '2024-01-05 05:05:05', '2024-01-06 06:06:06') ; insert into payment_redsys_response (payment_id, response_code, date_time, secure_payment, transaction_type, amount, currency_code, order_number, authorization_code, merchant_code, terminal_number, error_code) diff --git a/test/ready_payment.sql b/test/ready_payment.sql index ae488de..a83f95a 100644 --- a/test/ready_payment.sql +++ b/test/ready_payment.sql @@ -9,15 +9,15 @@ select plan(15); set search_path to camper, public; -select has_function('camper', 'ready_payment', array['uuid', 'text', 'text', 'text', 'text', 'country_code', 'email', 'text', 'text', 'boolean']); -select function_lang_is('camper', 'ready_payment', array['uuid', 'text', 'text', 'text', 'text', 'country_code', 'email', 'text', 'text', 'boolean'], 'plpgsql'); -select function_returns('camper', 'ready_payment', array['uuid', 'text', 'text', 'text', 'text', 'country_code', 'email', 'text', 'text', 'boolean'], 'integer'); -select isnt_definer('camper', 'ready_payment', array['uuid', 'text', 'text', 'text', 'text', 'country_code', 'email', 'text', 'text', 'boolean']); -select volatility_is('camper', 'ready_payment', array['uuid', 'text', 'text', 'text', 'text', 'country_code', 'email', 'text', 'text', 'boolean'], 'volatile'); -select function_privs_are('camper', 'ready_payment', array ['uuid', 'text', 'text', 'text', 'text', 'country_code', 'email', 'text', 'text', 'boolean'], 'guest', array['EXECUTE']); -select function_privs_are('camper', 'ready_payment', array ['uuid', 'text', 'text', 'text', 'text', 'country_code', 'email', 'text', 'text', 'boolean'], 'employee', array['EXECUTE']); -select function_privs_are('camper', 'ready_payment', array ['uuid', 'text', 'text', 'text', 'text', 'country_code', 'email', 'text', 'text', 'boolean'], 'admin', array['EXECUTE']); -select function_privs_are('camper', 'ready_payment', array ['uuid', 'text', 'text', 'text', 'text', 'country_code', 'email', 'text', 'text', 'boolean'], 'authenticator', array[]::text[]); +select has_function('camper', 'ready_payment', array['uuid', 'text', 'text', 'text', 'text', 'country_code', 'email', 'text', 'text']); +select function_lang_is('camper', 'ready_payment', array['uuid', 'text', 'text', 'text', 'text', 'country_code', 'email', 'text', 'text'], 'plpgsql'); +select function_returns('camper', 'ready_payment', array['uuid', 'text', 'text', 'text', 'text', 'country_code', 'email', 'text', 'text'], 'integer'); +select isnt_definer('camper', 'ready_payment', array['uuid', 'text', 'text', 'text', 'text', 'country_code', 'email', 'text', 'text']); +select volatility_is('camper', 'ready_payment', array['uuid', 'text', 'text', 'text', 'text', 'country_code', 'email', 'text', 'text'], 'volatile'); +select function_privs_are('camper', 'ready_payment', array ['uuid', 'text', 'text', 'text', 'text', 'country_code', 'email', 'text', 'text'], 'guest', array['EXECUTE']); +select function_privs_are('camper', 'ready_payment', array ['uuid', 'text', 'text', 'text', 'text', 'country_code', 'email', 'text', 'text'], 'employee', array['EXECUTE']); +select function_privs_are('camper', 'ready_payment', array ['uuid', 'text', 'text', 'text', 'text', 'country_code', 'email', 'text', 'text'], 'admin', array['EXECUTE']); +select function_privs_are('camper', 'ready_payment', array ['uuid', 'text', 'text', 'text', 'text', 'country_code', 'email', 'text', 'text'], 'authenticator', array[]::text[]); set client_min_messages to warning; @@ -45,51 +45,51 @@ insert into campsite_type (campsite_type_id, slug, company_id, name, media_id, m values (12, 'c1b6f4fc-32c1-4cd5-b796-0c5059152a52', 2, 'Plots', 10, 6, '[1, 7]', true) ; -insert into payment (payment_id, slug, company_id, campsite_type_id, arrival_date, departure_date, subtotal_nights, number_adults, subtotal_adults, number_teenagers, subtotal_teenagers, number_children, subtotal_children, number_dogs, subtotal_dogs, subtotal_tourist_tax, total, currency_code, zone_preferences, payment_status, created_at, updated_at) -values (22, '4ef35e2f-ef98-42d6-a724-913bd761ca8c', 2, 12, '2024-08-28', '2024-09-04', 3200, 2, 10420, 4, 20840, 6, 25080, 3, 2450, 4900, 79160, 'EUR', 'pref I before E', 'draft', '2024-01-01 01:01:01', '2024-01-01') - , (24, '6d1b8e4c-c3c6-4fe4-92c1-2cbf94526693', 2, 12, '2024-08-29', '2024-09-03', 71000, 1, 0, 2, 0, 3, 0, 0, 0, 1750, 72750, 'EUR', '', 'draft', current_timestamp, current_timestamp) +insert into payment (payment_id, slug, company_id, campsite_type_id, arrival_date, departure_date, subtotal_nights, number_adults, subtotal_adults, number_teenagers, subtotal_teenagers, number_children, subtotal_children, number_dogs, subtotal_dogs, subtotal_tourist_tax, total, currency_code, zone_preferences, acsi_card, payment_status, created_at, updated_at) +values (22, '4ef35e2f-ef98-42d6-a724-913bd761ca8c', 2, 12, '2024-08-28', '2024-09-04', 3200, 2, 10420, 4, 20840, 6, 25080, 3, 2450, 4900, 79160, 'EUR', 'pref I before E', true, 'draft', '2024-01-01 01:01:01', '2024-01-01') + , (24, '6d1b8e4c-c3c6-4fe4-92c1-2cbf94526693', 2, 12, '2024-08-29', '2024-09-03', 71000, 1, 0, 2, 0, 3, 0, 0, 0, 1750, 72750, 'EUR', '', false, 'draft', current_timestamp, current_timestamp) ; -insert into payment_customer (payment_id, full_name, address, postal_code, city, country_code, email, phone, acsi_card, lang_tag) -values (24, '', '', '', '', 'FR', 'a@a.com', '555-555-555', true, 'es') +insert into payment_customer (payment_id, full_name, address, postal_code, city, country_code, email, phone, lang_tag) +values (24, '', '', '', '', 'FR', 'a@a.com', '555-555-555', 'es') ; select is( - ready_payment('4ef35e2f-ef98-42d6-a724-913bd761ca8c', 'Juli Verd', 'C/ Fals, 123', '17486', 'Castelló d’Empúries', 'ES', 'juli@verd.cat', '972486 160', 'ca', true), + ready_payment('4ef35e2f-ef98-42d6-a724-913bd761ca8c', 'Juli Verd', 'C/ Fals, 123', '17486', 'Castelló d’Empúries', 'ES', 'juli@verd.cat', '972486 160', 'ca'), 22, 'Should be able to ready the first draft payment' ); select is( - ready_payment('6d1b8e4c-c3c6-4fe4-92c1-2cbf94526693', 'Pere Gil', 'Gutenbergstr. 9-13', '82178', 'Puchheim', 'DE', 'pere@gil.de', '8980902-0', 'en', false), + ready_payment('6d1b8e4c-c3c6-4fe4-92c1-2cbf94526693', 'Pere Gil', 'Gutenbergstr. 9-13', '82178', 'Puchheim', 'DE', 'pere@gil.de', '8980902-0', 'en'), 24, 'Should be able to ready the second draft payment, and update customer details' ); select throws_ok( - $$ select ready_payment('7ba7f0a5-d73d-4d6e-a9c4-3b88f2b2a357', 'Juli Verd', 'C/ Fals, 123', '17486', 'Castelló d’Empúries', 'ES', 'juli@verd.cat', '972 486 160', 'ca', true) $$, + $$ select ready_payment('7ba7f0a5-d73d-4d6e-a9c4-3b88f2b2a357', 'Juli Verd', 'C/ Fals, 123', '17486', 'Castelló d’Empúries', 'ES', 'juli@verd.cat', '972 486 160', 'ca') $$, '23514', 'insert or update on table "payment" violates check constraint "payment_is_draft"', 'Should not be able to ready an inexistent payment' ); select throws_ok( - $$ select ready_payment('4ef35e2f-ef98-42d6-a724-913bd761ca8c', 'Juli Verd', 'C/ Fals, 123', '17486', 'Castelló d’Empúries', 'ES', 'juli@verd.cat', '972 486 160', 'ca', true) $$, + $$ select ready_payment('4ef35e2f-ef98-42d6-a724-913bd761ca8c', 'Juli Verd', 'C/ Fals, 123', '17486', 'Castelló d’Empúries', 'ES', 'juli@verd.cat', '972 486 160', 'ca') $$, '23514', 'insert or update on table "payment" violates check constraint "payment_is_draft"', 'Should not be able to ready an already processed payment' ); select bag_eq( - $$ select payment_id, slug::text, company_id, campsite_type_id, arrival_date::text, departure_date::text, subtotal_nights, number_adults, subtotal_adults, number_teenagers, subtotal_teenagers, number_children, subtotal_children, number_dogs, subtotal_dogs, subtotal_tourist_tax, total, zone_preferences, payment_status, created_at, updated_at from payment $$, - $$ values (22, '4ef35e2f-ef98-42d6-a724-913bd761ca8c', 2, 12, '2024-08-28', '2024-09-04', 3200, 2, 10420, 4, 20840, 6, 25080, 3, 2450, 4900, 79160, 'pref I before E', 'pending', '2024-01-01 01:01:01', current_timestamp) - , (24, '6d1b8e4c-c3c6-4fe4-92c1-2cbf94526693', 2, 12, '2024-08-29', '2024-09-03', 71000, 1, 0, 2, 0, 3, 0, 0, 0, 1750, 72750, '', 'pending', current_timestamp, current_timestamp) + $$ select payment_id, slug::text, company_id, campsite_type_id, arrival_date::text, departure_date::text, subtotal_nights, number_adults, subtotal_adults, number_teenagers, subtotal_teenagers, number_children, subtotal_children, number_dogs, subtotal_dogs, subtotal_tourist_tax, total, zone_preferences, acsi_card, payment_status, created_at, updated_at from payment $$, + $$ values (22, '4ef35e2f-ef98-42d6-a724-913bd761ca8c', 2, 12, '2024-08-28', '2024-09-04', 3200, 2, 10420, 4, 20840, 6, 25080, 3, 2450, 4900, 79160, 'pref I before E', true, 'pending', '2024-01-01 01:01:01', current_timestamp) + , (24, '6d1b8e4c-c3c6-4fe4-92c1-2cbf94526693', 2, 12, '2024-08-29', '2024-09-03', 71000, 1, 0, 2, 0, 3, 0, 0, 0, 1750, 72750, '', false, 'pending', current_timestamp, current_timestamp) $$, 'Should have updated payments' ); select bag_eq( - $$ select payment_id, full_name, address, postal_code, city, country_code::text, email::text, phone::text, acsi_card, lang_tag from payment_customer $$, - $$ values (22, 'Juli Verd', 'C/ Fals, 123', '17486', 'Castelló d’Empúries', 'ES', 'juli@verd.cat', '+34 972 48 61 60', true, 'ca') - , (24, 'Pere Gil', 'Gutenbergstr. 9-13', '82178', 'Puchheim', 'DE', 'pere@gil.de', '+49 89 809020', false, 'en') + $$ select payment_id, full_name, address, postal_code, city, country_code::text, email::text, phone::text, lang_tag from payment_customer $$, + $$ values (22, 'Juli Verd', 'C/ Fals, 123', '17486', 'Castelló d’Empúries', 'ES', 'juli@verd.cat', '+34 972 48 61 60', 'ca') + , (24, 'Pere Gil', 'Gutenbergstr. 9-13', '82178', 'Puchheim', 'DE', 'pere@gil.de', '+49 89 809020', 'en') $$, 'Should have added and updated customer details' ); diff --git a/verify/acsi.sql b/verify/acsi.sql new file mode 100644 index 0000000..03e6975 --- /dev/null +++ b/verify/acsi.sql @@ -0,0 +1,14 @@ +-- Verify camper:acsi on pg + +begin; + +select campsite_type_id + , number_adults + , number_teenagers + , number_children + , number_dogs + , cost_per_night +from camper.acsi +where false; + +rollback; diff --git a/verify/acsi_calendar.sql b/verify/acsi_calendar.sql new file mode 100644 index 0000000..8b2e761 --- /dev/null +++ b/verify/acsi_calendar.sql @@ -0,0 +1,10 @@ +-- Verify camper:acsi_calendar on pg + +begin; + +select campsite_type_id + , acsi_range +from camper.acsi_calendar +where false; + +rollback; diff --git a/verify/acsi_option.sql b/verify/acsi_option.sql new file mode 100644 index 0000000..9e5362f --- /dev/null +++ b/verify/acsi_option.sql @@ -0,0 +1,11 @@ +-- Verify camper:acsi_option on pg + +begin; + +select campsite_type_id + , campsite_type_option_id + , units +from camper.acsi_option +where false; + +rollback; diff --git a/verify/draft_payment.sql b/verify/draft_payment.sql index 653df13..139cc03 100644 --- a/verify/draft_payment.sql +++ b/verify/draft_payment.sql @@ -2,6 +2,6 @@ begin; -select has_function_privilege('camper.draft_payment(uuid, date, date, uuid, integer, integer, integer, integer, text, camper.option_units[])', 'execute'); +select has_function_privilege('camper.draft_payment(uuid, date, date, uuid, integer, integer, integer, integer, text, boolean, camper.option_units[])', 'execute'); rollback; diff --git a/verify/draft_payment@v5.sql b/verify/draft_payment@v5.sql new file mode 100644 index 0000000..653df13 --- /dev/null +++ b/verify/draft_payment@v5.sql @@ -0,0 +1,7 @@ +-- Verify camper:draft_payment on pg + +begin; + +select has_function_privilege('camper.draft_payment(uuid, date, date, uuid, integer, integer, integer, integer, text, camper.option_units[])', 'execute'); + +rollback; diff --git a/verify/payment__acsi_card.sql b/verify/payment__acsi_card.sql new file mode 100644 index 0000000..8b3e357 --- /dev/null +++ b/verify/payment__acsi_card.sql @@ -0,0 +1,10 @@ +-- Verify camper:payment__acsi_card on pg + +begin; + +select acsi_card +from camper.payment +where false +; + +rollback; diff --git a/verify/payment_customer__-acsi_card.sql b/verify/payment_customer__-acsi_card.sql new file mode 100644 index 0000000..c9bb4c0 --- /dev/null +++ b/verify/payment_customer__-acsi_card.sql @@ -0,0 +1,11 @@ +-- Verify camper:payment_customer__-acsi_card on pg + +begin; + +select 1 / (1 - count(*)) +from pg_attribute +where attrelid = 'camper.payment_customer'::regclass + and attname = 'acsi_card' +; + +rollback; diff --git a/verify/ready_payment.sql b/verify/ready_payment.sql index dc23475..ae9d603 100644 --- a/verify/ready_payment.sql +++ b/verify/ready_payment.sql @@ -2,6 +2,6 @@ begin; -select has_function_privilege('camper.ready_payment(uuid, text, text, text, text, camper.country_code, camper.email, text, text, boolean)', 'execute'); +select has_function_privilege('camper.ready_payment(uuid, text, text, text, text, camper.country_code, camper.email, text, text)', 'execute'); rollback; diff --git a/verify/ready_payment@v5.sql b/verify/ready_payment@v5.sql new file mode 100644 index 0000000..dc23475 --- /dev/null +++ b/verify/ready_payment@v5.sql @@ -0,0 +1,7 @@ +-- Verify camper:ready_payment on pg + +begin; + +select has_function_privilege('camper.ready_payment(uuid, text, text, text, text, camper.country_code, camper.email, text, text, boolean)', 'execute'); + +rollback; diff --git a/web/static/public.css b/web/static/public.css index 47b968d..cd5da8d 100644 --- a/web/static/public.css +++ b/web/static/public.css @@ -1399,6 +1399,12 @@ input[type="checkbox"]:focus { top: 13rem; } +#booking > footer fieldset { + flex-direction: column; + gap: 1em; + margin: 1em 0; +} + #booking br { display: none; } diff --git a/web/templates/admin/payment/details.gohtml b/web/templates/admin/payment/details.gohtml index bacc0da..1f7af12 100644 --- a/web/templates/admin/payment/details.gohtml +++ b/web/templates/admin/payment/details.gohtml @@ -48,6 +48,10 @@{{- if lt .DownPaymentPercent 100 -}} {{ printf (gettext "By down paying the %d %% of the total, you are pre-booking your preferences. We will respond within 24 hours and this percentage will be charged if accepted.") .DownPaymentPercent }} @@ -266,6 +263,13 @@
{{ ( printf ( gettext "See <%s>our conditions for more information.") (printf "a target=\"_blank\" href=\"/%s/%s\"" currentLocale "legal/reservation") "a") | raw }}
+