Commit Graph

377 Commits

Author SHA1 Message Date
jordi fita mas 6c14973076 Open port 8069 for camper.tandem.ws
This way i can expose that port when testing webhooks and stuff.
2024-02-15 16:36:31 +01:00
jordi fita mas a159bc75f0 Show a disclaimer on top of book button that it is in fact a prebooking 2024-02-15 15:54:22 +01:00
jordi fita mas 3bc4175580 Add authorization holding for payments
This is the mode they want to work with, but i could not test it because
they do not have it enabled in Redsys.  For now, just add the status and
the code to handle the responses.

Now i store all responses, if they are for a valid payment, just in case
i fucked something up. I also needed it because an authorization hold
needs at least two responses: one to accept the hold, and another for
the settlement.
2024-02-15 15:17:21 +01:00
jordi fita mas f2143cd0e6 Add the admin page to see payments
Had to do a couple of changes to the database: add the currency_code to
the payment relation, to format the price according to the payment’s
currency instead of the company’s; and the reference SQL function, to
replace the equivalent golang function, so that i can use it to index
payments.

The rest is mostly the same as any other page, except that the
individual payment’s page is not a form, but a regular info dump.

I also moved the payment settings as a sub-route of payments, as i
believe this makes more sense than an additional user menu item.
2024-02-14 04:54:42 +01:00
jordi fita mas bd84df8169 Add down payment
Customer wants to require a down payment of 30 % for bookings made
one week or more before the actual date, and to make the full payment
otherwise.

This would require yet another relation to keep these values. Fuck it;
i added them to the function, as they are very unlikely to change.

That forced me to change the test for draft_payment to use relative
dates, otherwise there is no way i can have stable results in the
future.
2024-02-13 23:45:25 +01:00
jordi fita mas af31daba8a Add positive_integer and nonnegative_integer domains
This is easier to read and requires less unit tests, but i only used
them in the new relations and fields for HEAD, because i do not see any
point on creating migrations just for that.
2024-02-13 22:12:30 +01:00
jordi fita mas 7e39e5f549 Create new drafts if trying to modify an already pending payment
This can happen when the customer reaches the payment page, but then
returns back to the booking form via the back button: the browser
remembers the URI with the cart slug, trying to make it ready, and then
it fails because it is already pending.

I did not like the idea of modifying a payment that is already not
a draft, because it seems to me that can lead to errors if we receive
Redsys notifications of payments that are being changed back to draft.
In fact, i believe that draft payments maybe should go to a different
relation altogether, so that i can prevent UPDATE on payment by guests,
but maybe i am going overboard now.
2024-02-13 20:16:12 +01:00
jordi fita mas 990a614897 Change draft_payment return type to row of payment
This way i can use the function in the from clause of the query that
i already had to do to get the totals formatted with to_price.  In this
case, i believe it is better to leave out Go’s function because it would
force me to perform two queries.

Instead of binding a nullable string pointer with the payment’s slug,
i wanted to use pgtype’s zeronull.Text type, but it can not work in this
case because it encodes the value as a text, while the parameters is
uuid.  I can not use zero.UUID, because it is a [16]byte array, while i
have it in a string.

Thus, had to create my own ZeroNullUUID type that use a string as a base
but encodes it as a UUID.
2024-02-13 19:51:39 +01:00
jordi fita mas 77a3f78176 Fixed null pointer access on validating booking without dogs or options 2024-02-13 17:05:19 +01:00
jordi fita mas 0f76351ae9 Move down HTMx attributes for booking form
Otherwise, it reloads the form while customers are writing their
details, removing the focus from the form; **very** annoying.

On the plus side, there is nothing to compute when entering these
fields, thus no redundant work is done now.
2024-02-13 05:59:07 +01:00
jordi fita mas 95ae50c1c3 Include details.gohtml when rendering payments/request.gohtml 2024-02-13 05:53:11 +01:00
jordi fita mas 4a7b0112ef Send an email on notification of success payment
To send the actual mail with sendmail, i have stolen the code from
go-mail[0] and removed everything i did not need.  This is because there
is no Go package to send email in Debian 12, and this was easier than
to build the DEB for go-mail.

Once i have the time….

[0]: https://go-mail.dev/
2024-02-13 05:20:35 +01:00
jordi fita mas 1179ba9c9a Add a missing reset client_min_messages 2024-02-13 02:40:02 +01:00
jordi fita mas ff6750fbea Handle payment notifications from Redsys
I have to basically do the reverse of signing the request to verify that
the notification comes from them.  Lots of code just for that.

I return the changed status from the PL/pgSQL function because i will
need to email customers when a payment is completed, and i need to know
when.
2024-02-13 02:38:38 +01:00
jordi fita mas 15dde3f491 Add ready_payment function and use their slug as URL
Now that the payments have slug, i can use them in the URL to show the
actual data of a payment, and kickstart the payment process with Redsys.
2024-02-12 18:06:17 +01:00
jordi fita mas 148d9075da Refactor base URL for the payment success, failure, and notification 2024-02-12 05:21:30 +01:00
jordi fita mas e4636592c5 Add payment relation and use it to compute the booking’s cart
I had to add the payment concept separate from the booking, unlike other
eCommerce solutions that subsume the two into a single “order”, like
WooCommerce, because bookings should be done in a separate Camper
instance that will sync to the public instance, but the payment is done
by the public instance.  There will be a queue or something between
the public and the private instance to pass along the booking
information once the payment is complete, but the public instance still
needs to keep track of payments without creating bookings.

To compute the total for that payment i had to do the same as was doing
until now for the cart.  To prevent duplications, or having functions
with complex return types, i now create a “draft” payment while the
user is filling in the form, and compute the cart there; from Go i only
have to retrieve the data from the relation, that simplifies the work,
actually.

Since the payment is computed way before customers enter their details,
i can not have that data in the same payment relation, unless i allow
NULL values.  Allowing NULL values means that i can create a payment
without customer, thus i moved all customer details to a separate
relation.  It still allows payment without customer, but at least there
are no NULL values.

Draft payments should be removed after a time, but i believe this needs
to be done in a cronjob or similar, not in the Go application.

To update the same payment while filling the same booking form, i now
have a hidden field with the payment slug.  A competent developer would
have used a cookie or something like that; i am not competent.
2024-02-12 05:21:00 +01:00
jordi fita mas d22fe39c80 Add a small note to the booking form when there is overflow
Customer wants to warn customers that plots are not guaranteed to be
next to each other.
2024-02-11 22:06:00 +01:00
jordi fita mas ea997a4154 Allow campsite type option to be just per unit, not per unit per night
Customer told us that there are some options, such as towels, that have
a fixed price for the whole stay, not a per night price.  Thus, had to
add a boolean to know whether to use sum or max when computing the
cart’s total for each option.
2024-02-11 21:45:00 +01:00
jordi fita mas 92dba96b29 Add campsite_type_pet_cost relation to hold price of dogs in campsites
It is a separate relation, instead of having a field in campsite_type,
because not all campsite types allow dogs.  I could have added a new
field to campsite_type, but then its values it would be meaningless for
campsites that do not allow dogs, and a nullable field is not a valid
solution because NULL means “unknown”, but we **do** know the price —
none.

A separate relation encodes the same information without ambiguities nor
null values, and, in fact, removed the dogs_allowed field from
campsite_type to prevent erroneous status, such as a campsite type that
allows dogs without having a cost — even if the cost is zero, it has to
be added to the new relation.
2024-02-10 06:18:30 +01:00
jordi fita mas e5023a2a41 Handle the booking cart entirely with HTMx
Besides the dynamic final cart, that was already handled by HTMx, i had
to check the maximum number of guests, whether the accommodation allows
“overflow”, whether dogs are allowed, and that the booking dates were
within the campground’s opening and closing dates.

I could do all of this with AlpineJS, but then i would have to add the
same validation to the backend, prior to accept the payment.  Would not
make more sense to have them in a single place, namely the backend? With
HTMx i can do that.

However, i now have to create the form “piecemeal”, because i may not
have the whole information when the visitor arrives to the booking page,
and i still had the same problem as in commit d2858302efa—parsing the
whole form as is would leave guests and options field empty, rather than
at their minimum values.

One of the fieldsets in that booking form are the arrival and departure
dates, that are the sames we use in the campsite type’s page to
“preselect” these values.  Since now are in a separate struct, i can
reuse the same type and validation logic for both pages, making my
JavaScript code useless, but requiring HTMx.  I think this is a good
tradeoff, in fact.
2024-02-10 03:49:44 +01:00
oriol carbonell pujolàs b915ba1559 Change “Discover the environment” to “Discover” 2024-02-06 10:55:29 +01:00
oriol carbonell pujolàs d2560e8748 Reduce padding of footer’s highlighted section 2024-02-06 10:06:15 +01:00
oriol carbonell pujolàs 771f5077d4 Add bottom padding to campsite type’s title
This is to avoid having the carousel’s arrows overlap the title
2024-02-06 10:04:44 +01:00
oriol carbonell pujolàs 373a6e5b6d Increase font size of home’s links and all arrows 2024-02-06 10:04:12 +01:00
jordi fita mas cc26eddc7c Remove MethodPost from two URI handlers in payment that only accept GET 2024-02-04 06:37:56 +01:00
jordi fita mas 2c36e45663 Compute and show the “cart” for the booking form
I have to ask number and age ranges of hosts of guests for all campsite
types, not only those that have price options for adults, children, etc.
because i must compute the tourist tax for adults.  These numbers will
be used to generate de rows for guests when actually creating the
booking, which is not done already.

To satisfy the campsite types that do have a price per guest, not only
per night, i had to add the prices for each range in the
campsite_type_cost relation.  If a campsite type does not have price
per person, then that should be zero; the website then does not display
the price.

The minimal price for any campsite type is one adult for one night,
thus to compute the price i need at least the campsite type, the dates,
and the number of adults, that has a minimum of one.  I changed the
order of the form to ask for these values first, so i can compute the
initial price as soon as possible.  To help further, i show the
<fieldset>s progressively when visitors select options.
2024-02-04 06:37:25 +01:00
jordi fita mas ebcc2a017f Show zones in campground map by default if requested by query parameters
This is to be able to link from the booking form, with a link under the
area preferences, and show the zones layer, that is what customers most
certainly want to see at that point.
2024-02-04 03:43:00 +01:00
jordi fita mas 2a5b6df8cf Emit the input event when changing departure date
It is necessary to detect the change using AlpineJS, for instance.
2024-02-03 03:22:25 +01:00
jordi fita mas cabab93aa9 Remove redundant overflow-x from body 2024-02-03 01:51:36 +01:00
jordi fita mas 8d08a78d4c Add titles to credit card logos in booking page
No need to translated them: they are proper names.
2024-02-03 01:41:44 +01:00
jordi fita mas 1491e975c2 Better control of scroll snap for calendar months on mobile
It is not a problem in desktop, because there is no scroll bar, but in
mobile you can scroll with touch, and i need the months to snap to the
start for the next and previous buttons to work.
2024-02-03 01:32:07 +01:00
jordi fita mas 244cbeddac Avoid horizontal scroll due to slick’s right margin
I can use overflow for that in most sizes, but on mobile the buttons
are outside the overflow and are not visible, thus have to revert it
and then remove the right margin to avoid the extra space.  Since on
mobile we only show a single slide at a time, the lack of margin is not
noticeable.
2024-02-03 01:11:21 +01:00
jordi fita mas de03443c25 Replace + with 00 to the address in the bottom, too
Customer requested it
2024-02-03 01:04:25 +01:00
jordi fita mas daf6326652 Change the footer to a single column in table, rather than on mobile
Otherwise, the four columns are very difficult to read, and cause
horizontal overflow.
2024-02-03 01:03:08 +01:00
jordi fita mas 593004d0c9 Remove redundant right margin form slick list on mobile 2024-02-03 00:33:24 +01:00
jordi fita mas 63e33fa253 Fix booking field inside campsite’s page on mobile 2024-02-03 00:29:37 +01:00
jordi fita mas 4c4b9d8d02 Make submenus collapsible on mobile too
Had to change the link to the current language version of the page by a
button, to prevent following a link when trying to expand the submenu.

At first i did this with an `onclick="return false"` bullshit, but the
link was the wrong thing to do here, and it was there only to satisfy
Google et al. They will have to with the links in head.

Also made the link and buttons larger to make it easier to hit them with
finger.
2024-02-03 00:16:29 +01:00
jordi fita mas 313e5aa6c5 Use company trade name variable in copyright statement 2024-02-02 21:58:18 +01:00
jordi fita mas 64d94b5f35 Align text in surroundings on mobile 2024-02-02 21:40:41 +01:00
jordi fita mas 43505fecbd Reduce outside activities’ h3 bottom margin on mobile 2024-02-02 21:37:56 +01:00
jordi fita mas b6044a7d4a Advance min dates of departure and arrival one day
Apparently, expecting people to book at least one day in advance is
being “too optimistic”.
2024-02-02 02:59:41 +01:00
jordi fita mas 97fb88cc02 Guard against departure date not having min and max night attributes 2024-02-02 02:55:09 +01:00
jordi fita mas 33a1f0f4e2 Use Date.getTime instead of relaying on implicit conversion
Otherwise, fucking IntelliJ does not shut up about imaginary problems.
2024-02-02 02:51:38 +01:00
jordi fita mas 28adeb38fc Half Leaflet’s zoom delta
With a map the size of ours, it always seemed like things were either
too zoomed out or too zoomed in.
2024-02-02 02:46:59 +01:00
jordi fita mas 70eb007ddd Revert Leaflet’s maxBounds and its viscosity
They were commented out by error: when changing the SVG handling code,
had to “look for” a stray polygon that was outside the image’s bounded
area.
2024-02-02 02:45:47 +01:00
oriol carbonell pujolàs fcbbc5c22a Fix sizes of the campground map and its legend 2024-02-02 02:39:55 +01:00
oriol carbonell pujolàs 5e053034a5 Move carousel arrows out of the way on mobile
Carrousels have a first slide that is mostly text without any background color,
and on mobile the arrows looked like where “erasing” the text.
2024-02-02 02:38:31 +01:00
oriol carbonell pujolàs 0b93a4c989 Remove order from slick-list
It was there from when the carousel was a flex; no longer used
2024-02-02 02:37:53 +01:00
oriol carbonell pujolàs 91339bec8b Leave direction for home slides on mobile and increase bottom padding
The change to column was from when the button and the text were both on the slide,
but now it only made the text stick to the top, which is the reverse of what we
wanted, but had to increase the space between the text and the booking button.
2024-02-02 02:30:54 +01:00