diff --git a/.python-version b/.python-version index 1e334568..d20cc2bf 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.11.2 +3.8.10 diff --git a/.ruby-version b/.ruby-version index 1f7da99d..9c25013d 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.7 +3.3.6 diff --git a/Gemfile b/Gemfile index eb8a24f0..762af097 100644 --- a/Gemfile +++ b/Gemfile @@ -13,6 +13,7 @@ gem "nokogiri" gem 'uglifier' gem "sass" gem 'nanoc-sprockets3' -gem "bootstrap-bookingsync-sass" +gem "bootstrap-bookingsync-sass", "0.0.13" gem "rake" gem "github_changelog_generator" +gem "puma" diff --git a/Gemfile.lock b/Gemfile.lock index 8bdf9576..22edc88a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,137 +1,289 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.2.10) - i18n (~> 0.7) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - adsf (1.2.0) - rack (>= 1.0.0) - autoprefixer-rails (9.7.4) - execjs + activesupport (8.0.1) + base64 + benchmark (>= 0.3) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + logger (>= 1.4.2) + minitest (>= 5.1) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + uri (>= 0.13.1) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + adsf (1.4.6) + rack (>= 1.0.0, < 3.0.0) + async (2.21.1) + console (~> 1.29) + fiber-annotation + io-event (~> 1.6, >= 1.6.5) + async-http (0.86.0) + async (>= 2.10.2) + async-pool (~> 0.9) + io-endpoint (~> 0.14) + io-stream (~> 0.6) + metrics (~> 0.12) + protocol-http (~> 0.43) + protocol-http1 (>= 0.28.1) + protocol-http2 (~> 0.22) + traces (~> 0.10) + async-http-faraday (0.19.0) + async-http (~> 0.42) + faraday + async-pool (0.10.2) + async (>= 1.25) + traces + autoprefixer-rails (10.4.19.0) + execjs (~> 2) + base64 (0.2.0) + benchmark (0.4.0) + bigdecimal (3.1.9) bootstrap-bookingsync-sass (0.0.13) bootstrap-sass (>= 3.3.5) bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) - celluloid (0.15.2) - timers (~> 1.1.0) - celluloid-io (0.15.0) - celluloid (>= 0.15.0) - nio4r (>= 0.5.0) - coderay (1.1.0) + coderay (1.1.3) colored (1.2) - concurrent-ruby (1.0.5) - cri (2.7.0) - colored (~> 1.2) - em-websocket (0.5.0) + concurrent-ruby (1.3.5) + connection_pool (2.5.0) + console (1.29.2) + fiber-annotation + fiber-local (~> 1.1) + json + cri (2.15.12) + ddmetrics (1.1.0) + ddplugin (1.0.3) + diff-lcs (1.5.1) + drb (2.2.1) + em-websocket (0.5.3) eventmachine (>= 0.12.9) - http_parser.rb (~> 0.5.3) - eventmachine (1.2.0.1) - execjs (2.7.0) - faraday (0.17.5) - multipart-post (>= 1.2, < 3) - faraday-http-cache (2.0.0) - faraday (~> 0.8) - ffi (1.15.5) - formatador (0.2.4) - github_changelog_generator (1.14.3) + http_parser.rb (~> 0) + eventmachine (1.2.7) + execjs (2.10.0) + faraday (2.12.2) + faraday-net_http (>= 2.0, < 3.5) + json + logger + faraday-http-cache (2.5.1) + faraday (>= 0.8) + faraday-net_http (3.4.0) + net-http (>= 0.5.0) + ffi (1.17.1-aarch64-linux-gnu) + ffi (1.17.1-aarch64-linux-musl) + ffi (1.17.1-arm-linux-gnu) + ffi (1.17.1-arm-linux-musl) + ffi (1.17.1-arm64-darwin) + ffi (1.17.1-x86_64-darwin) + ffi (1.17.1-x86_64-linux-gnu) + ffi (1.17.1-x86_64-linux-musl) + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) + formatador (1.1.0) + github_changelog_generator (1.16.4) activesupport + async (>= 1.25.0) + async-http-faraday faraday-http-cache multi_json octokit (~> 4.6) - rainbow (>= 2.1) + rainbow (>= 2.2.1) rake (>= 10.0) - retriable (~> 2.1) - guard (2.5.1) + guard (2.19.1) formatador (>= 0.2.4) - listen (~> 2.6) - lumberjack (~> 1.0) - pry (>= 0.9.12) + listen (>= 2.7, < 4.0) + logger (~> 1.6) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + ostruct (~> 0.6) + pry (>= 0.13.0) + shellany (~> 0.0) thor (>= 0.18.1) - guard-bundler (2.0.0) - bundler (~> 1.0) + guard-bundler (3.0.1) + bundler (>= 2.1, < 3) guard (~> 2.2) - guard-livereload (2.1.1) + guard-compat (~> 1.1) + guard-compat (1.2.1) + guard-livereload (2.5.2) em-websocket (~> 0.5) - guard (~> 2.0) + guard (~> 2.8) + guard-compat (~> 1.0) multi_json (~> 1.8) - guard-nanoc (1.0.2) - guard (>= 1.8.0) - nanoc (>= 3.6.3) + guard-nanoc (2.1.9) + guard (~> 2.8) + guard-compat (~> 1.0) + nanoc-cli (~> 4.11, >= 4.11.14) + nanoc-core (~> 4.11, >= 4.11.14) guard-pow (2.0.0) guard (~> 2.0) - http_parser.rb (0.5.3) - i18n (0.9.1) + http_parser.rb (0.8.0) + i18n (1.14.7) concurrent-ruby (~> 1.0) - json (2.3.0) - kramdown (2.4.0) - rexml - listen (2.7.0) - celluloid (>= 0.15.2) - celluloid-io (>= 0.15.0) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - lumberjack (1.0.4) - method_source (0.8.2) - mini_portile2 (2.8.1) - minitest (5.11.1) + immutable-ruby (0.2.0) + concurrent-ruby (~> 1.1) + sorted_set (~> 1.0) + io-endpoint (0.14.0) + io-event (1.7.5) + io-stream (0.6.1) + json (2.9.1) + json_schema (0.21.0) + kramdown (2.5.1) + rexml (>= 3.3.9) + listen (3.9.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + logger (1.6.5) + lumberjack (1.2.10) + memo_wise (1.10.0) + method_source (1.1.0) + metrics (0.12.1) + minitest (5.25.4) multi_json (1.15.0) - multipart-post (2.1.1) - nanoc (3.8.0) - cri (~> 2.3) + nanoc (4.13.3) + addressable (~> 2.5) + colored (~> 1.2) + nanoc-checking (~> 1.0, >= 1.0.2) + nanoc-cli (= 4.13.3) + nanoc-core (= 4.13.3) + nanoc-deploying (~> 1.0) + parallel (~> 1.12) + tty-command (~> 0.8) + tty-which (~> 0.4) + nanoc-checking (1.0.5) + nanoc-cli (~> 4.12, >= 4.12.5) + nanoc-core (~> 4.12, >= 4.12.5) + nanoc-cli (4.13.3) + cri (~> 2.15) + diff-lcs (~> 1.3) + nanoc-core (= 4.13.3) + pry + zeitwerk (~> 2.1) + nanoc-core (4.13.3) + base64 (~> 0.2) + concurrent-ruby (~> 1.1) + ddmetrics (~> 1.0) + ddplugin (~> 1.0) + immutable-ruby (~> 0.1) + json_schema (~> 0.19) + memo_wise (~> 1.5) + slow_enumerator_tools (~> 1.0) + tty-platform (~> 0.2) + zeitwerk (~> 2.1) + nanoc-deploying (1.0.2) + nanoc-checking (~> 1.0) + nanoc-cli (~> 4.11, >= 4.11.15) + nanoc-core (~> 4.11, >= 4.11.15) nanoc-sprockets3 (1.0.5) sprockets (~> 3.2, >= 3.0.0) - nio4r (2.5.8) - nokogiri (1.14.3) - mini_portile2 (~> 2.8.0) + nenv (0.3.0) + net-http (0.6.0) + uri + nio4r (2.7.4) + nokogiri (1.18.2-aarch64-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.2-aarch64-linux-musl) + racc (~> 1.4) + nokogiri (1.18.2-arm-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.2-arm-linux-musl) racc (~> 1.4) - octokit (4.22.0) - faraday (>= 0.9) - sawyer (~> 0.8.0, >= 0.5.3) - pry (0.9.12.6) - coderay (~> 1.0) - method_source (~> 0.8) - slop (~> 3.4) - public_suffix (4.0.7) - pygments.rb (2.3.1) - racc (1.6.2) - rack (2.2.8) - rainbow (3.0.0) - rake (12.3.3) - rb-fsevent (0.9.4) - rb-inotify (0.9.3) - ffi (>= 0.5.0) - retriable (2.1.0) - rexml (3.2.5) - sass (3.4.25) + nokogiri (1.18.2-arm64-darwin) + racc (~> 1.4) + nokogiri (1.18.2-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.18.2-x86_64-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.2-x86_64-linux-musl) + racc (~> 1.4) + notiffany (0.1.3) + nenv (~> 0.1) + shellany (~> 0.0) + octokit (4.25.1) + faraday (>= 1, < 3) + sawyer (~> 0.9) + ostruct (0.6.1) + parallel (1.26.3) + pastel (0.8.0) + tty-color (~> 0.5) + protocol-hpack (1.5.1) + protocol-http (0.47.1) + protocol-http1 (0.28.1) + protocol-http (~> 0.22) + protocol-http2 (0.22.0) + protocol-hpack (~> 1.4) + protocol-http (~> 0.18) + pry (0.15.2) + coderay (~> 1.1) + method_source (~> 1.0) + public_suffix (6.0.1) + puma (6.5.0) + nio4r (~> 2.0) + pygments.rb (3.0.0) + racc (1.8.1) + rack (2.2.10) + rainbow (3.1.1) + rake (13.2.1) + rb-fsevent (0.11.2) + rb-inotify (0.11.1) + ffi (~> 1.0) + rbtree (0.4.6) + rexml (3.4.0) + sass (3.7.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) sassc (2.4.0) ffi (~> 1.9) - sawyer (0.8.2) + sawyer (0.9.2) addressable (>= 2.3.5) - faraday (> 0.8, < 2.0) - slop (3.4.7) - sprockets (3.7.2) + faraday (>= 0.17.3, < 3) + securerandom (0.4.1) + set (1.1.1) + shellany (0.0.1) + slow_enumerator_tools (1.1.0) + sorted_set (1.0.3) + rbtree + set (~> 1.0) + sprockets (3.7.5) + base64 concurrent-ruby (~> 1.0) rack (> 1, < 3) - thor (0.18.1) - thread_safe (0.3.6) - timers (1.1.0) - tzinfo (1.2.4) - thread_safe (~> 0.1) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) + thor (1.3.2) + traces (0.14.1) + tty-color (0.6.0) + tty-command (0.10.1) + pastel (~> 0.8) + tty-platform (0.3.0) + tty-which (0.5.0) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + uglifier (4.2.1) + execjs (>= 0.3.0, < 3) + uri (1.0.2) + zeitwerk (2.7.1) PLATFORMS - ruby + aarch64-linux-gnu + aarch64-linux-musl + arm-linux-gnu + arm-linux-musl + arm64-darwin + x86_64-darwin + x86_64-linux-gnu + x86_64-linux-musl DEPENDENCIES adsf - bootstrap-bookingsync-sass + bootstrap-bookingsync-sass (= 0.0.13) coderay github_changelog_generator guard-bundler @@ -142,10 +294,11 @@ DEPENDENCIES nanoc nanoc-sprockets3 nokogiri + puma pygments.rb rake sass uglifier BUNDLED WITH - 1.17.3 + 2.6.3 diff --git a/Rakefile b/Rakefile index 4b61de04..cf898535 100644 --- a/Rakefile +++ b/Rakefile @@ -1,4 +1,4 @@ -require 'nanoc3/tasks' +require 'nanoc/tasks' require 'fileutils' desc "Compile the site" diff --git a/Rules b/Rules index 2dd608a3..5e2fd5de 100644 --- a/Rules +++ b/Rules @@ -15,8 +15,7 @@ ignore '/assets/stylesheets/_*' -compile '/static/*' do -end +passthrough '/assets/images/**/*' compile '/CNAME/' do end @@ -53,17 +52,16 @@ compile '*' do layout item[:layout] || 'default' end -route '/assets/*/' do +route '/assets/stylesheets/*/' do Nanoc::Sprockets::Helper.asset_path(item) end -route '/CNAME' do - '/CNAME' +route '/assets/javascripts/*/' do + Nanoc::Sprockets::Helper.asset_path(item) end -route '/static/*' do - # /static/foo.html/ → /foo.html - item.identifier[7..-2] +route '/CNAME' do + '/CNAME' end route '/highlight' do diff --git a/api_calls/reference/bookings/bookings_read-bookings_write-scope-response.json b/api_calls/reference/bookings/bookings_read-bookings_write-scope-response.json index c6d8d90e..cded525b 100644 --- a/api_calls/reference/bookings/bookings_read-bookings_write-scope-response.json +++ b/api_calls/reference/bookings/bookings_read-bookings_write-scope-response.json @@ -37,6 +37,7 @@ "id": 80, "start_at": "START_AT", "end_at": "END_AT", + "booked_at": "BOOKED_AT", "status": "Booked", "updated_at": "UPDATED_AT", "reference": "0000EG", @@ -64,6 +65,7 @@ "canceled_at": null, "expected_checkin_time": "14:45", "expected_checkout_time": "11:30", + "checkin_type": "lockbox", "payment_url": null, "balance_due_at": "BALANCE_DUE_AT", "rental_payback_to_owner": null, diff --git a/static/images/bookingsync.svg b/content/assets/images/bookingsync.svg similarity index 100% rename from static/images/bookingsync.svg rename to content/assets/images/bookingsync.svg diff --git a/static/images/understanding-los/complex-example-1-1.png b/content/assets/images/understanding-los/complex-example-1-1.png similarity index 100% rename from static/images/understanding-los/complex-example-1-1.png rename to content/assets/images/understanding-los/complex-example-1-1.png diff --git a/static/images/understanding-los/complex-example-1-2.png b/content/assets/images/understanding-los/complex-example-1-2.png similarity index 100% rename from static/images/understanding-los/complex-example-1-2.png rename to content/assets/images/understanding-los/complex-example-1-2.png diff --git a/static/images/webhook-subscriptions/webhooks-form.png b/content/assets/images/webhook-subscriptions/webhooks-form.png similarity index 100% rename from static/images/webhook-subscriptions/webhooks-form.png rename to content/assets/images/webhook-subscriptions/webhooks-form.png diff --git a/static/images/webhook-subscriptions/webhooks-tab.png b/content/assets/images/webhook-subscriptions/webhooks-tab.png similarity index 100% rename from static/images/webhook-subscriptions/webhooks-tab.png rename to content/assets/images/webhook-subscriptions/webhooks-tab.png diff --git a/content/guides/understanding-los-records.md b/content/guides/understanding-los-records.md index 08111dd6..b0fbaa7c 100644 --- a/content/guides/understanding-los-records.md +++ b/content/guides/understanding-los-records.md @@ -135,7 +135,7 @@ Because of rule 4, the second Sunday is all zeroes - no check-in. Because of rule 5, you can see zero when length of stay is 17 and the day is Wed or Sat. -
+ If today is Tuesday the 2nd: @@ -143,4 +143,4 @@ Monday's record is in the past, it's obsolete. Because of rule 1, today (Tue) and tomorrow (Wed) check-in becomes not possible. - + diff --git a/content/guides/webhook-subscriptions.md b/content/guides/webhook-subscriptions.md index 9fb10858..6aa3ab37 100644 --- a/content/guides/webhook-subscriptions.md +++ b/content/guides/webhook-subscriptions.md @@ -25,13 +25,13 @@ Once you are logged in, locate the application where you want to subscribe to we You should see a "Webhooks" tab - + Now, go to the "Webhook" section and click "New Webhook" to access the webhook subscriptions form. ### Webhook subscription form - + ### URL diff --git a/content/reference/endpoints/bookings.md b/content/reference/endpoints/bookings.md index 96a10a32..9ce208c9 100644 --- a/content/reference/endpoints/bookings.md +++ b/content/reference/endpoints/bookings.md @@ -78,6 +78,7 @@ door_key_code | String | Read/Write | Boo downpayment | [Decimal](/reference/enums#formats) | Read/Write | Booking's downpayment. | Requires `final_price` to be present expected_checkin_time | String | Read/Write | Expected guest's checkin time. | must be blank or represent a time value (e.g. 12, 12:30) expected_checkout_time | String | Read/Write | Expected guest's checkout time. | must be blank or represent a time value (e.g. 12, 12:30) +checkin_type | String | Read/Write | Chosen checkin method | List of values described in [enums section](/reference/enums#rental-checkin-types) final_payback_to_owner | [Decimal](/reference/enums#formats) | Read/Write | Final payback to rental owner. | Must be lower than `final_price` final_price | [Decimal](/reference/enums#formats) | Read/Write | Booking's final price. (after discount) | initial_price | [Decimal](/reference/enums#formats) | Read/Write | Booking's initial price. | @@ -97,12 +98,14 @@ reconciliation | [Decimal](/reference/enums#form authorized_amount | [Decimal](/reference/enums#formats) | Read | Booking's authorized amount | paid_or_authorized_amount | [Decimal](/reference/enums#formats) | Read | Booking's paid or authorized amount | ------------------------|---------|------------|------------| +balance_due_at | [Time](/reference/enums#formats) | Read | Booking's payment deadline. updated_at | [Time](/reference/enums#formats) | Read | Booking's update time. | start_at | [Time](/reference/enums#formats) | Read/Write | Booking's start time. | **Required**, must be before `end_at` end_at | [Time](/reference/enums#formats) | Read/Write | Booking's end time. | **Required**, must be after `start_at` canceled_at | [Time](/reference/enums#formats) | Write | Booking's cancel time. | tentative_expires_at | [Time](/reference/enums#formats) | Write | Booking's tentative expiry time, null by default. When set, it will mark the period as "on hold" until the given date. Once this date is passed, the period will automatically become available again. | Must be in the future -booked_at | [Time](/reference/enums#formats) | Write | Exact timestamp when a booking was booked | +contract_updated_at | [Time](/reference/enums#formats) | Read | Booking's contract update time. | +booked_at | [Time](/reference/enums#formats) | Read/Write | Exact timestamp when a booking was booked | {: class="table table-bordered"}