Skip to content

Commit

Permalink
Merge pull request #239 from diegosteiner/develop
Browse files Browse the repository at this point in the history
Release 23.8.2
  • Loading branch information
diegosteiner authored Aug 22, 2023
2 parents 6a28aac + 61b348d commit abf0b6e
Show file tree
Hide file tree
Showing 45 changed files with 741 additions and 458 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

## Unreleased

## Version 23.8.2

Released on 22.08.2023

- Bugfixes
- Updates

## Version 23.8.1

Released on 15.08.2023
Expand Down
140 changes: 71 additions & 69 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,69 +1,69 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (7.0.6)
actionpack (= 7.0.6)
activesupport (= 7.0.6)
actioncable (7.0.7)
actionpack (= 7.0.7)
activesupport (= 7.0.7)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (7.0.6)
actionpack (= 7.0.6)
activejob (= 7.0.6)
activerecord (= 7.0.6)
activestorage (= 7.0.6)
activesupport (= 7.0.6)
actionmailbox (7.0.7)
actionpack (= 7.0.7)
activejob (= 7.0.7)
activerecord (= 7.0.7)
activestorage (= 7.0.7)
activesupport (= 7.0.7)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.0.6)
actionpack (= 7.0.6)
actionview (= 7.0.6)
activejob (= 7.0.6)
activesupport (= 7.0.6)
actionmailer (7.0.7)
actionpack (= 7.0.7)
actionview (= 7.0.7)
activejob (= 7.0.7)
activesupport (= 7.0.7)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (7.0.6)
actionview (= 7.0.6)
activesupport (= 7.0.6)
actionpack (7.0.7)
actionview (= 7.0.7)
activesupport (= 7.0.7)
rack (~> 2.0, >= 2.2.4)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (7.0.6)
actionpack (= 7.0.6)
activerecord (= 7.0.6)
activestorage (= 7.0.6)
activesupport (= 7.0.6)
actiontext (7.0.7)
actionpack (= 7.0.7)
activerecord (= 7.0.7)
activestorage (= 7.0.7)
activesupport (= 7.0.7)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.0.6)
activesupport (= 7.0.6)
actionview (7.0.7)
activesupport (= 7.0.7)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
active_flag (1.6.0)
activerecord (>= 5)
activejob (7.0.6)
activesupport (= 7.0.6)
activejob (7.0.7)
activesupport (= 7.0.7)
globalid (>= 0.3.6)
activemodel (7.0.6)
activesupport (= 7.0.6)
activerecord (7.0.6)
activemodel (= 7.0.6)
activesupport (= 7.0.6)
activestorage (7.0.6)
actionpack (= 7.0.6)
activejob (= 7.0.6)
activerecord (= 7.0.6)
activesupport (= 7.0.6)
activemodel (7.0.7)
activesupport (= 7.0.7)
activerecord (7.0.7)
activemodel (= 7.0.7)
activesupport (= 7.0.7)
activestorage (7.0.7)
actionpack (= 7.0.7)
activejob (= 7.0.7)
activerecord (= 7.0.7)
activesupport (= 7.0.7)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (7.0.6)
activesupport (7.0.7)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand All @@ -75,16 +75,16 @@ GEM
rake (>= 10.4, < 14.0)
ast (2.4.2)
aws-eventstream (1.2.0)
aws-partitions (1.799.0)
aws-sdk-core (3.180.2)
aws-partitions (1.806.0)
aws-sdk-core (3.180.3)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.71.0)
aws-sdk-core (~> 3, >= 3.177.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.132.0)
aws-sdk-s3 (1.132.1)
aws-sdk-core (~> 3, >= 3.179.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.6)
Expand All @@ -97,6 +97,7 @@ GEM
barnes (0.0.9)
multi_json (~> 1)
statsd-ruby (~> 1.1)
base64 (0.1.1)
bcrypt (3.1.19)
blueprinter (0.25.3)
bootsnap (1.16.0)
Expand Down Expand Up @@ -153,7 +154,7 @@ GEM
actionmailer (>= 5.0)
devise (>= 4.6)
diff-lcs (1.5.0)
discard (1.2.1)
discard (1.3.0)
activerecord (>= 4.2, < 8)
dotenv (2.8.1)
dotenv-rails (2.8.1)
Expand All @@ -171,7 +172,7 @@ GEM
factory_bot_rails (6.2.0)
factory_bot (~> 6.2.0)
railties (>= 5.0.0)
faker (3.2.0)
faker (3.2.1)
i18n (>= 1.8.11, < 2)
faraday (2.7.10)
faraday-net_http (>= 2.0, < 3.1)
Expand Down Expand Up @@ -208,7 +209,7 @@ GEM
i18n-tasks (~> 0.9)
i18n_data (0.16.0)
simple_po_parser (~> 1.1)
icalendar (2.8.0)
icalendar (2.9.0)
ice_cube (~> 0.16)
ice_cube (0.16.4)
inline_svg (1.9.0)
Expand Down Expand Up @@ -258,7 +259,7 @@ GEM
net-smtp (0.3.3)
net-protocol
nio4r (2.5.9)
nokogiri (1.15.3-x86_64-linux)
nokogiri (1.15.4-x86_64-linux)
racc (~> 1.4)
orm_adapter (0.5.0)
parallel (1.23.0)
Expand Down Expand Up @@ -288,7 +289,7 @@ GEM
interception (>= 0.5)
pry (>= 0.12.0)
public_suffix (5.0.3)
puma (6.3.0)
puma (6.3.1)
nio4r (~> 2.0)
raabro (1.4.0)
racc (1.7.1)
Expand All @@ -299,33 +300,33 @@ GEM
rack
rack-test (2.1.0)
rack (>= 1.3)
rails (7.0.6)
actioncable (= 7.0.6)
actionmailbox (= 7.0.6)
actionmailer (= 7.0.6)
actionpack (= 7.0.6)
actiontext (= 7.0.6)
actionview (= 7.0.6)
activejob (= 7.0.6)
activemodel (= 7.0.6)
activerecord (= 7.0.6)
activestorage (= 7.0.6)
activesupport (= 7.0.6)
rails (7.0.7)
actioncable (= 7.0.7)
actionmailbox (= 7.0.7)
actionmailer (= 7.0.7)
actionpack (= 7.0.7)
actiontext (= 7.0.7)
actionview (= 7.0.7)
activejob (= 7.0.7)
activemodel (= 7.0.7)
activerecord (= 7.0.7)
activestorage (= 7.0.7)
activesupport (= 7.0.7)
bundler (>= 1.15.0)
railties (= 7.0.6)
railties (= 7.0.7)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
rails-i18n (7.0.7)
rails-i18n (7.0.8)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8)
railties (7.0.6)
actionpack (= 7.0.6)
activesupport (= 7.0.6)
railties (7.0.7)
actionpack (= 7.0.7)
activesupport (= 7.0.7)
method_source
rake (>= 12.2)
thor (~> 1.0)
Expand All @@ -337,15 +338,15 @@ GEM
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
react-rails (2.7.1)
react-rails (3.1.1)
babel-transpiler (>= 0.7.0)
connection_pool
execjs
railties (>= 3.2)
tilt
redis (5.0.6)
redis (5.0.7)
redis-client (>= 0.9.0)
redis-client (0.15.0)
redis-client (0.16.0)
connection_pool
regexp_parser (2.8.1)
request_store (1.5.1)
Expand Down Expand Up @@ -375,7 +376,8 @@ GEM
rspec-mocks (~> 3.12)
rspec-support (~> 3.12)
rspec-support (3.12.1)
rubocop (1.55.1)
rubocop (1.56.0)
base64 (~> 0.1.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
Expand All @@ -392,14 +394,14 @@ GEM
rubocop (~> 1.41)
rubocop-factory_bot (2.23.1)
rubocop (~> 1.33)
rubocop-performance (1.18.0)
rubocop-performance (1.19.0)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
rubocop-rails (2.20.2)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
rubocop-rspec (2.23.1)
rubocop-rspec (2.23.2)
rubocop (~> 1.33)
rubocop-capybara (~> 2.17)
rubocop-factory_bot (~> 2.22)
Expand All @@ -416,7 +418,7 @@ GEM
sentry-ruby (~> 5.10.0)
sentry-ruby (5.10.0)
concurrent-ruby (~> 1.0, >= 1.0.2)
shakapacker (7.0.2)
shakapacker (7.0.3)
activesupport (>= 5.2)
rack-proxy (>= 0.6.1)
railties (>= 5.2)
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
V23.8.1
V23.8.2
43 changes: 0 additions & 43 deletions app/controllers/manage/bookable_extras_controller.rb

This file was deleted.

2 changes: 1 addition & 1 deletion app/controllers/manage/bookings/contracts_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def index
def show
respond_to do |format|
format.pdf do
reditect_to url_for(@contract.pdf)
redirect_to url_for(@contract.pdf)
end
end
end
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/manage/bookings_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ def show
def new
@booking.assign_attributes(organisation: current_organisation, notifications_enabled: true)
@booking.build_tenant
BookingQuestionResponse.prepare_booking(@booking)
BookingQuestion.prepare_booking(@booking)

respond_with :manage, @booking
end

def edit
BookingQuestionResponse.prepare_booking(@booking)
BookingQuestion.prepare_booking(@booking)
end

def new_import
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/public/bookings_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ def show

def new
@booking = preparation_service.prepare_new(create_params)
BookingQuestionResponse.prepare_booking(@booking)
BookingQuestion.prepare_booking(@booking)

respond_with :public, @booking
end

def edit
@booking.committed_request ||= @booking.agent_booking&.committed_request if @booking.agent_booking.present?
BookingQuestionResponse.prepare_booking(@booking)
BookingQuestion.prepare_booking(@booking)

respond_with :public, @booking
end
Expand Down
Loading

0 comments on commit abf0b6e

Please sign in to comment.