quicktravel_client 3.6.1 → 3.7.0

data/lib/quick_travel/resource_category.rb

@@ -4,5 +4,9 @@ module QuickTravel
   class ResourceCategory < Adapter
     self.api_base = '/api/resource_categories'
     self.lookup = true
-  end
+
+    def product_type
+      QuickTravel::ProductType.find(product_type_id)
+    end
+ end
 end

data/lib/quick_travel/resource_group.rb

@@ -0,0 +1,9 @@
+module QuickTravel
+  class ResourceGroup
+    include QuickTravel::InitFromHash
+
+    def product_type
+      ProductType.find(product_type_id)
+    end
+  end
+end

data/lib/quick_travel/room_facility.rb

@@ -1,6 +1,7 @@
-require 'quick_travel/adapter'
+require 'quick_travel/init_from_hash'
 
 module QuickTravel
-  class RoomFacility < Adapter
+  class RoomFacility
+    include QuickTravel::InitFromHash
   end
 end

data/lib/quick_travel/route_stop.rb

@@ -1,6 +1,15 @@
-require 'quick_travel/adapter'
+require 'quick_travel/init_from_hash'
 
 module QuickTravel
-  class RouteStop < Adapter
+  class RouteStop
+    include QuickTravel::InitFromHash
+
+    def stop
+      Stop.new({ id: stop_id, name: name, code: code, address: address })
+    end
+  end
+
+  class Stop
+    include QuickTravel::InitFromHash
   end
 end

data/lib/quick_travel/service.rb

@@ -1,6 +1,7 @@
-require 'quick_travel/adapter'
+require 'quick_travel/init_from_hash'
 
 module QuickTravel
-  class Service < Adapter
+  class Service
+    include QuickTravel::InitFromHash
   end
 end

data/lib/quick_travel/version.rb

@@ -1,3 +1,3 @@
 module QuickTravel
-  VERSION = '3.6.1'
+  VERSION = '3.7.0'
 end

data/quicktravel_client.gemspec

@@ -16,11 +16,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'httparty', '~> 0.14'
+  spec.add_dependency 'httparty', '0.15.7' # Bug in >16 relating to nested parameters
   spec.add_dependency 'json'
   spec.add_dependency 'activesupport', '>= 2.0.0'
   spec.add_dependency 'facets'
   spec.add_dependency 'money', '>= 3.0', '< 6.0' # 6.0 starts to deprecate/split
+  spec.add_dependency 'will_paginate'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake'

data/spec/adapter_spec.rb

@@ -37,7 +37,7 @@ describe QuickTravel::Adapter do
   end
 
   context 'when response non standard' do
-    let(:url) { 'http://www.google.com' }
+    let(:url) { 'https://httpstat.us/418' }
 
     let(:adapter_response) {
       VCR.use_cassette 'wrong_url' do
@@ -48,7 +48,7 @@ describe QuickTravel::Adapter do
     specify do
       expect { adapter_response }.to raise_error(
         QuickTravel::AdapterError,
-        /That’s all we know/
+        /418 I'm a teapot/
       )
     end
   end

data/spec/booking_spec.rb

@@ -65,7 +65,7 @@ describe QuickTravel::Booking do
     VCR.use_cassette('booking_show') do
       b = QuickTravel::Booking.find(@booking.id)
       expect(b.payment_types).to be_an_instance_of Array
-      expect(b.payment_types.size).to eq 3
+      expect(b.payment_types.size).to eq 4
       expect(b.payment_types.first).to be_an_instance_of QuickTravel::PaymentType
       expect(b.payments).to be_an_instance_of Array
       expect(b.payments.size).to eq 0
@@ -144,10 +144,12 @@ end
 
 describe QuickTravel::Booking, 'when booking accommodation' do
   let(:booking) {
-    VCR.use_cassette('booking_with_documents') {
-      QuickTravel::Booking.find(1)
-    }
+    VCR.use_cassette('booking_create_accommodation') do
+      QuickTravel.config.version = 4
+      QuickTravel::Booking.create
+    end
   }
+
   let(:reservation) {
     VCR.use_cassette('accommodation_reserve') do
       booking.accommodation_reserve(
@@ -157,14 +159,20 @@ describe QuickTravel::Booking, 'when booking accommodation' do
         first_travel_date: '01/03/2016',
         last_travel_date: '02/03/2016'
       )
-      booking.reservations.detect { |reservation| reservation.resource.name == 'Executive Room' }
+      QuickTravel::Booking.find(booking.id).reservations.detect { |reservation| reservation.resource.name == 'Executive Room' }
+    end
+  }
+
+  let(:resource) {
+    VCR.use_cassette('reservation_resource') do
+      QuickTravel::Resource.find(reservation.resource_id)
     end
   }
 
   it 'should create acommodation reservation' do
     expect(reservation.first_travel_date).to eq '2016-03-01'.to_date
     expect(reservation.last_travel_date).to eq '2016-03-02'.to_date
-    expect(reservation.resource.name).to eq 'Executive Room'
+    expect(resource.name).to eq 'Executive Room'
     expect(reservation.passenger_ids).to eq booking.passenger_ids
   end
 end

data/spec/checkout_spec.rb

@@ -12,4 +12,186 @@ describe QuickTravel::Checkout do
     expect(token.keys).to eq [:client_token]
     expect(token[:client_token]).to match /^[0-9A-Za-z\=]+$/
   end
+
+  context 'Modern Opal Pay' do
+    context 'failed payment' do
+      let!(:booking) {
+        VCR.use_cassette('opal_modern_pay_failed_booking') do
+          QuickTravel.config.version = 4
+          QuickTravel::Booking.create
+        end
+      }
+      let(:create_payment_request) {
+        {
+          booking_id: booking.id,
+          payment: {
+            payment_type_id: 10,
+            amount_in_cents: 10,
+            uid: 'modern-opal-failed-uid',
+            comment: 'Test Opal Payment'
+          }
+        }
+      }
+
+      let!(:create_payment_response) {
+        VCR.use_cassette('opal_modern_pay_failed_create') do
+          QuickTravel::Checkout.create(create_payment_request)
+        end
+      }
+
+      let(:update_payment_request) {
+        {
+          gateway_response: {
+            raw_response: '{
+              "CardNumber": 3085227007682330,
+              "CardBalance": 6546,
+              "CardSequenceNumber": 55,
+              "CILAmount": 0,
+              "AuthorizedAmount": 890,
+              "SalesReferenceNumber": 53183943,
+              "TransactionDTM": "2018-01-04T09:00:43.106",
+              "VoidTransactionReferenceNumber": 1271099697,
+              "CardBlockState": false,
+              "AutoloadAmount": 0
+              }',
+            meta_data: {
+              applicationInstanceId: 101166,
+              operatorId: 'an_operator'
+            },
+            success: false
+          }
+        }
+      }
+
+      let(:update_payment_response) {
+        VCR.use_cassette('opal_modern_pay_failed_update') do
+          QuickTravel::Checkout.update(create_payment_response.id, update_payment_request)
+        end
+      }
+
+      let(:expected_create_attributes) { { completable: false } }
+      let(:expected_update_attributes) { { successful: false } }
+      it 'should update correctly' do
+        expect(create_payment_response).to have_attributes(expected_create_attributes)
+        expect(update_payment_response).to have_attributes(expected_update_attributes)
+      end
+    end
+
+    context 'successful payment' do
+      let!(:booking) {
+        VCR.use_cassette('opal_modern_pay_successful_booking') do
+          QuickTravel.config.version = 4
+          QuickTravel::Booking.create
+        end
+      }
+      let(:payment_create_request) {
+        {
+          booking_id: booking.id,
+          payment: {
+            payment_type_id: 10,
+            amount_in_cents: 10,
+            uid: 'modern-opal-uid',
+            comment: 'Test Opal Payment'
+          }
+        }
+      }
+
+      let!(:create_payment_response) {
+        VCR.use_cassette('opal_modern_pay_successful_response') do
+          QuickTravel::Checkout.create(payment_create_request)
+        end
+      }
+
+      let(:update_payment_request) {
+        {
+          gateway_response: {
+            raw_response: '{
+              "CardNumber": 3085227007682330,
+              "CardBalance": 6546,
+              "CardSequenceNumber": 55,
+              "CILAmount": 0,
+              "AuthorizedAmount": 890,
+              "SalesReferenceNumber": 53183943,
+              "TransactionDTM": "2018-01-04T09:00:43.106",
+              "TransactionReferenceNumber": 1271099697,
+              "CardBlockState": false,
+              "AutoloadAmount": 0
+              }',
+            meta_data: {
+              applicationInstanceId: 101166,
+              operatorId: 'an_operator'
+            },
+            success: true
+          }
+        }
+      }
+
+      let(:update_payment_response) {
+        VCR.use_cassette('opal_modern_pay_successful_update_response') do
+          QuickTravel::Checkout.update(create_payment_response.id, update_payment_request)
+        end
+      }
+
+      let(:expected_create_attributes) { { completable: false } }
+      let(:expected_update_attributes) { { successful: true } }
+      it 'should update correctly' do
+        expect(create_payment_response).to have_attributes(expected_create_attributes)
+        expect(update_payment_response).to have_attributes(expected_update_attributes)
+      end
+    end
+  end
+
+  context 'Opal Pay' do
+    let(:booking) {
+      VCR.use_cassette('opal_pay_booking') do
+        QuickTravel.config.version = 4
+        QuickTravel::Booking.create
+      end
+    }
+
+    let(:payment_create_request) {
+      {
+        booking_id: booking.id,
+        payment: {
+          gateway_response: '{
+            "CardNumber": 3085227007682330,
+            "CardBalance": 6546,
+            "CardSequenceNumber": 55,
+            "CILAmount": 0,
+            "AuthorizedAmount": 890,
+            "SalesReferenceNumber": 53183943,
+            "TransactionDTM": "2018-01-04T09:00:43.106",
+            "TransactionReferenceNumber": 1271099697,
+            "CardBlockState": false,
+            "AutoloadAmount": 0
+            }',
+          meta_data: {
+            applicationInstanceId: 101166,
+            operatorId: 'an_operator'
+          },
+          payment_type_id: 10,
+          amount_in_cents: 10,
+          uid: 'opal-uid',
+          comment: 'Test Opal Payment'
+        }
+      }
+    }
+
+    subject(:response) {
+      VCR.use_cassette('opal_pay') do
+        QuickTravel::Checkout.create(payment_create_request)
+      end
+    }
+
+    let(:expected_attributes) {
+      {
+        completable: true,
+        completed: true,
+        progress: 'completed',
+        successful: true
+      }
+    }
+
+    it { is_expected.to have_attributes(expected_attributes) }
+  end
 end

data/spec/product_spec.rb

@@ -99,13 +99,13 @@ describe QuickTravel::Product do
         it { should eq expected_price } # $200 for 2 pax, $50 for extra passenger
       end
 
-      context 'adjustments' do
-        subject(:adjustments)   { pricing_details.adjustments_to_apply }
+      context 'applied rules' do
+        subject(:rules)   { pricing_details.applied_rules }
         it { should be_an_instance_of Array }
 
-        context 'first adjustment' do
-          subject(:adjustment) { adjustments.first }
-          it { should be_an_instance_of Hash }
+        context 'first rule' do
+          subject(:rule) { rules.first }
+          it { should be_an_instance_of String }
         end
       end
     end

data/spec/region_spec.rb

@@ -8,10 +8,10 @@ describe QuickTravel::Region do
     it 'should find a first instance of region from QuickTravel' do
       VCR.use_cassette('region_show') do
         expect(subject).to be_an_instance_of QuickTravel::Region
-        expect(subject.id).to be_an_instance_of Fixnum
+        expect(subject.id).to be_a_kind_of Integer
         expect(subject.name).to be_an_instance_of String
         expect(subject.location_ids).to be_an_instance_of Array
-        expect(subject.location_ids[0]).to be_an_instance_of Fixnum
+        expect(subject.location_ids[0]).to be_a_kind_of Integer
       end
     end
   end

data/spec/reservation_spec.rb

@@ -10,11 +10,7 @@ describe QuickTravel::Reservation do
         first_travel_date: '2016-03-01',
         passenger_types_numbers: { '1' => '2', '2' => '1' }
       )
-      expect(reservation.booking_id).to eq 4 # based on running ALL specs
-                                             # from a fresh bootstrap.sql
-                                             # bootstrap.sql has 2 bookings
-                                             # Plus 3rd booking created in booking_spec
-                                             # Plus 4th booking created here
+      expect(reservation.booking_id).not_to eq 0
     end
   end
 
@@ -35,7 +31,7 @@ describe QuickTravel::Reservation do
     resource_names = nil
     VCR.use_cassette('reservation_with_extra_picks') do
       @booking = QuickTravel::Booking.find(1)
-      @reservation = @booking.reservations.first
+      @reservation = @booking.reservations.last
       sub_reservations = @reservation.sub_reservations
       resource_names = sub_reservations.map(&:resource).map(&:name)
     end

data/spec/support/cassettes/accommodation_reserve.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: http://test.qt.sealink.com.au:8080/reservation_for/accommodations/create_or_update.json
     body:
       encoding: UTF-8
-      string: reservations[passenger_ids][]=1&reservations[passenger_ids][]=2&reservations[resource_id]=6&reservations[bed_configuration_id]=1&reservations[first_travel_date]=01%2F03%2F2016&reservations[last_travel_date]=02%2F03%2F2016&booking_id=1&access_key=<QT_KEY>
+      string: reservations[resource_id]=6&reservations[bed_configuration_id]=1&reservations[first_travel_date]=01%2F03%2F2016&reservations[last_travel_date]=02%2F03%2F2016&booking_id=4&access_key=<QT_KEY>
     headers:
       Content-Length:
       - '0'
@@ -17,23 +17,19 @@ http_interactions:
       P3p:
       - CP="IDC DSP CAO COR ADM DEVi TAIi PSA PSD IVAi IVDi CONi HIS OUR IND CNT"
       Content-Type:
-      - application/json; charset=utf-8
-      X-Ua-Compatible:
-      - IE=Edge,chrome=1
-      Etag:
-      - '"7215ee9c7d9dc229d2921a40e899ec5f"'
+      - application/json
       Cache-Control:
-      - max-age=0, private, must-revalidate
+      - no-cache
       X-Request-Id:
-      - 8483181abc52a31a2826eb6ff745cd65
+      - c6f65171-2281-4438-b378-06608bb5251c
       X-Runtime:
-      - '0.583677'
-      Vary:
-      - Origin
+      - '1.192269'
       Date:
-      - Fri, 01 Jan 2016 04:38:24 GMT
+      - Fri, 01 Jan 2016 02:32:13 GMT
       X-Rack-Cache:
       - invalidate, pass
+      Vary:
+      - Origin
       X-Content-Type-Options:
       - nosniff
       X-Download-Options:
@@ -47,20 +43,20 @@ http_interactions:
       Server:
       - WEBrick/1.3.1 (Ruby/2.2.5/2016-04-26)
       Content-Length:
-      - '1'
+      - '0'
       Connection:
       - Keep-Alive
       Set-Cookie:
-      - _session_id=BAh7B0kiD3Nlc3Npb25faWQGOgZFVEkiJTZhYjQyOTVjMGExNTJkZTM3MThhODk2YmY0MDQ1NDQ0BjsAVEkiCXVzZXIGOwBGaQY%3D--d7a6c585df1323901ec4d571ae9e7b92a3623e1f;
+      - _session_id=dUVxdWo3cFFXeWFReWJoaGFPM2JQcmpVL0RqVFVvWUlkZjZ5Wm5aSkZhT0dyWWFDSVJZUWVWL0NXUkRaZGU5c2h0TEl6allubWhhQk05NzFwMFNHRmpySTdPUHZPdkNBKzk3cU9DcjNsNnM9LS12YmxYcjJmYml4aVlnL3F3ZEZFUXp3PT0%3D--f2e2ac7d49461e937a4c5caa8713046af63442c2;
         path=/; HttpOnly
     body:
       encoding: UTF-8
-      string: " "
+      string: ''
     http_version: 
-  recorded_at: Wed, 08 Feb 2017 00:35:12 GMT
+  recorded_at: Wed, 21 Mar 2018 04:40:20 GMT
 - request:
     method: get
-    uri: http://test.qt.sealink.com.au:8080/api/bookings/1.json
+    uri: http://test.qt.sealink.com.au:8080/api/bookings/4.json
     body:
       encoding: UTF-8
       string: access_key=<QT_KEY>
@@ -76,22 +72,20 @@ http_interactions:
       - CP="IDC DSP CAO COR ADM DEVi TAIi PSA PSD IVAi IVDi CONi HIS OUR IND CNT"
       Content-Type:
       - application/json; charset=utf-8
-      X-Ua-Compatible:
-      - IE=Edge,chrome=1
       Etag:
-      - '"ea2f8a56e770a78eec327ba979588850"'
+      - W/"aa50e1d763ad0b4a59803613427e6867"
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - 7d3bf632051d184e80724dc59dba8b34
+      - daf1bf42-c376-4700-91a2-25a029fd9b2f
       X-Runtime:
-      - '0.155058'
-      Vary:
-      - Origin
+      - '0.738630'
       Date:
-      - Fri, 01 Jan 2016 04:38:25 GMT
+      - Fri, 01 Jan 2016 02:32:14 GMT
       X-Rack-Cache:
       - miss
+      Vary:
+      - Origin
       X-Content-Type-Options:
       - nosniff
       X-Download-Options:
@@ -105,28 +99,29 @@ http_interactions:
       Server:
       - WEBrick/1.3.1 (Ruby/2.2.5/2016-04-26)
       Content-Length:
-      - '6280'
+      - '5932'
       Connection:
       - Keep-Alive
       Set-Cookie:
-      - _session_id=BAh7B0kiD3Nlc3Npb25faWQGOgZFVEkiJWFmZWIxNmZkYjBjOTc0ZDQ3YzgxYmE3N2UyMTdlZTMzBjsAVEkiCXVzZXIGOwBGaQY%3D--b1bc261a811a392ee20584effaf23a3db290b279;
+      - _session_id=NVVTZG8xNE00bVZUUlV2Y3JMakdxeG9KbkI4MGljd2wwNGpQWTM2QU5iR0l6NWtsSnNoVHJRT2EwNkQyYzFtZ0JKa00zQlNqcXR2N0RiZXNLb0dkd29oNm1NMUJIWUJIeFhlT1VSSnRYR1E9LS0yV0F5UXBreVJIY1A0aUFoVndUZDhBPT0%3D--97882a9490c73e7d8d3f1e77f679bc614aee81bd;
         path=/; HttpOnly
     body:
       encoding: UTF-8
-      string: '{"id":1,"state":"active","reference":"222223","public_comments":null,"internal_comments":null,"customer_contact_name":null,"customer_contact_phone":null,"customer_contact_mobile":null,"customer_contact_email":null,"currency_iso_code":"AUD","country_id":3,"post_code":"","referral_code_id":1,"external_identifier":null,"created_at":"2013-03-01T00:05:46+10:30","updated_at":"2016-01-01T15:08:24+10:30","promo_code":null,"promo_code_id":null,"insurance_offered":false,"total_adjustments_in_cents":0,"pre_adjusted_gross_in_cents":20000,"nett_in_cents":20000,"gross_in_cents":20000,"commission_in_cents":0,"balance_in_cents":20000,"paid_in_cents":0,"surcharge_in_cents":0,"deposit_in_cents":0,"web_site_name":null,"deposit_relevant":false,"deposit_due_on":{"_type":"Date","_value":"2016-03-01T00:00:00+10:30"},"balance_due_on":{"_type":"Date","_value":"2016-03-01T00:00:00+10:30"},"first_travel_date":{"_type":"Date","_value":"2016-03-01"},"last_travel_date":{"_type":"Date","_value":"2016-03-02"},"complete":true,"reason_not_complete":"","first_reason_not_complete":"","discardable_in":60,"inactivatable_in":10,"notices":{},"client":null,"passenger_ids":[1,2],"vehicle_ids":[],"reservation_ids":[13],"adjustment_ids":[],"todo_items":[],"confirmation_requests":[],"passengers_attributes":[{"id":1,"title":null,"first_name":null,"last_name":null,"passenger_type_id":1,"age":30,"gender":null,"position":1},{"id":2,"title":null,"first_name":null,"last_name":null,"passenger_type_id":1,"age":30,"gender":null,"position":2}],"vehicles_attributes":[],"reservations_attributes":[{"id":13,"booking_id":1,"description":"A
-        basic studio room","comment":null,"active":true,"service_ids":[3,4],"resource_id":6,"quantity":null,"adjustments_attributes":[{"id":12,"gross_in_cents":-20000,"creator":{"active":true,"age":null,"business_number":null,"business_number_type":null,"created_at":"2013-03-01T00:00:02+10:30","creator_id":null,"currency_iso_code":"AUD","first_name":"administrator","gender":null,"id":1,"internal_staff":true,"internal_subdivision":false,"last_name":"administrator","name":"Administrator
-        Administrator","notes":null,"remember_token":null,"remember_token_expires_at":null,"salt":null,"title":null,"updated_at":"2013-03-01T00:00:03+10:30","updator_id":null},"created_at":"2016-01-01T15:08:24+10:30","description":"50%
-        Off","adjustable_item_type":"Reservation","adjustable_item_id":13,"adjustment_definition_id":1,"adjustment_category_id":1,"automatic":true}],"complete":true,"reason_not_complete":"","first_reason_not_complete":"","enough_time_before_travel_to_edit":true,"bed_configuration":"1
-        x Double and 1 x Single","product_type_id":2,"itinerary_footer":false,"fare_basis_set_id":12,"manually_priced":false,"manually_assigned_fare_basis_set":false,"has_fare_basis":true,"fare_basis_season_name":"","fare_basis_pointer_id":6,"pick_up_info":null,"drop_off_info":null,"selection_name":"Hilton
-        Hotel:  Executive Room","product_name_underscore":"accommodation","resource_class_name_underscore":"accommodation","resource_class_name":"Accommodation","has_ticket_template":false,"first_travel_date":{"_type":"Date","_value":"2016-03-01"},"last_travel_date":{"_type":"Date","_value":"2016-03-02"},"durational":true,"duration":2,"checkout_date":{"_type":"Date","_value":"2016-03-03"},"duration_units":"Nights","date_start_label":"In:","date_end_label":"Out:","accommodation_extra_picks":false,"expires":false,"expiry":"*NA*","has_skipped_reservation_groups":false,"editable_reservation_groups":[],"tariff_level_name":"Auto
+      string: '{"id":4,"state":"new","reference":"222227","public_comments":null,"internal_comments":null,"customer_contact_name":null,"customer_contact_phone":null,"customer_contact_mobile":null,"customer_contact_email":null,"currency_iso_code":"AUD","country_id":14,"drop_off_option_id":null,"drop_off_location_id":null,"post_code":null,"referral_code_id":1,"external_identifier":null,"created_at":"2016-01-01T13:02:12.000+10:30","updated_at":"2016-01-01T13:02:13.000+10:30","promo_code":null,"promo_code_id":null,"insurance_offered":false,"total_adjustments_in_cents":0,"pre_adjusted_gross_in_cents":20000,"nett_in_cents":20000,"gross_in_cents":20000,"commission_in_cents":0,"balance_in_cents":20000,"paid_in_cents":0,"surcharge_in_cents":0,"deposit_in_cents":0,"web_site_name":"SeaLink","deposit_relevant":false,"deposit_due_on":{"_type":"Date","_value":"2016-03-01T00:00:00.000+10:30"},"balance_due_on":{"_type":"Date","_value":"2016-03-01T00:00:00.000+10:30"},"due":false,"first_travel_date":{"_type":"Date","_value":"2016-03-01"},"last_travel_date":{"_type":"Date","_value":"2016-03-02"},"complete":true,"reason_not_complete":"","first_reason_not_complete":"","unprintable_luggage_tags":false,"discardable_in":60,"inactivatable_in":10,"notices":{},"client":null,"passenger_ids":[],"vehicle_ids":[],"reservation_ids":[6],"adjustment_ids":[],"todo_items":[],"confirmation_requests":[],"passengers_attributes":[],"vehicles_attributes":[],"reservations_attributes":[{"id":6,"booking_id":4,"description":"A
+        basic studio room","comment":null,"active":true,"service_ids":[3,4],"resource_id":6,"quantity":null,"adjustments_attributes":[{"id":7,"gross_in_cents":-20000,"creator":{"id":1,"name":"Administrator
+        Administrator","age":null,"first_name":"administrator","last_name":"administrator","title":null,"gender":null,"created_at":null,"updated_at":null,"notes":null,"updator_id":null,"creator_id":null,"active":true,"internal_subdivision":false,"business_number":null,"business_number_type":null,"currency_iso_code":"AUD","access_type":2},"created_at":"2016-01-01T13:02:13.000+10:30","description":"50%
+        Off","adjustable_item_type":"Reservation","adjustable_item_id":6,"adjustment_definition_id":1,"adjustment_category_id":1,"automatic":true}],"complete":true,"reason_not_complete":"","first_reason_not_complete":"","enough_time_before_travel_to_edit":true,"bed_configuration":"1
+        x Double and 1 x Single","product_type_id":2,"itinerary_footer":false,"fare_basis_set_id":12,"manually_priced":false,"manually_assigned_fare_basis_set":false,"has_fare_basis":true,"fare_basis_season_name":null,"fare_basis_pointer_id":6,"pick_up_info":null,"drop_off_info":null,"selection_name":"Hilton
+        Hotel:  Executive Room","product_name_underscore":"accommodation","resource_class_name_underscore":"accommodation","resource_class_name":"Accommodation","has_ticket_template":false,"first_travel_date":{"_type":"Date","_value":"2016-03-01"},"last_travel_date":{"_type":"Date","_value":"2016-03-02"},"durational":true,"duration":2,"span":2,"checkout_date":{"_type":"Date","_value":"2016-03-03"},"duration_units":"Nights","date_start_label":"In:","date_end_label":"Out:","accommodation_extra_picks":false,"expires":false,"expiry":"*NA*","has_skipped_reservation_groups":false,"editable_reservation_groups":[],"tariff_level_name":"Auto
         Priced as: Rack Rate","gross_including_packaged_item_in_cents":20000,"pre_adjusted_gross_including_packaged_item_in_cents":40000,"gross_in_cents":20000,"pre_adjusted_gross_in_cents":40000,"pre_adjusted_commission_in_cents":0,"cost_in_cents":20000,"rules":[{"unique_name":"Test
-        Discount Hilton","description":"","display_name":"Test Discount Hilton"}],"package":false,"sub_reservation_depth":0,"extra_pick":null,"child_resource":null,"pending_confirmation":false,"confirmation_request_fields":[],"report_reservation_changes":false,"vendor_pnr":null,"pick_up_information":null,"drop_off_information":null,"vendor_staff":null,"notes_for_vendor":null,"passenger_ids":[1,2],"passenger_splits":[{"commission_in_cents":0,"commission_percentage":"0.0","consumer_id":1,"consumer_splittable_id":13,"consumer_splittable_type":"Reservation","created_at":"2016-01-01T15:08:24+10:30","gross_in_cents":0,"id":23,"updated_at":"2016-01-01T15:08:24+10:30"},{"commission_in_cents":0,"commission_percentage":"0.0","consumer_id":2,"consumer_splittable_id":13,"consumer_splittable_type":"Reservation","created_at":"2016-01-01T15:08:24+10:30","gross_in_cents":0,"id":24,"updated_at":"2016-01-01T15:08:24+10:30"}],"vehicle_ids":[],"vehicle_splits":[],"consumer_grosses":{"1":0,"2":0}}],"adjustments_attributes":[],"payments_attributes":[],"payment_types_attributes":[{"id":5,"name":"master","description":"master","transaction_fee":"0.0","active":true,"position":2,"for_frequent_traveller_redemption":false,"comment_required":false,"created_at":null,"updated_at":null,"credit_card_brand":"MasterCard","payment_method":"credit_card","gateway":"braintree","on_account":false,"ticket_holding":false,"requires_staff":false,"internal":false,"redirect":false,"background":true,"creditlink":false,"surchargeable":false},{"id":4,"name":"visa","description":"visa","transaction_fee":"0.0","active":true,"position":3,"for_frequent_traveller_redemption":false,"comment_required":false,"created_at":null,"updated_at":null,"credit_card_brand":"Visa","payment_method":"credit_card","gateway":"braintree","on_account":false,"ticket_holding":false,"requires_staff":false,"internal":false,"redirect":false,"background":true,"creditlink":false,"surchargeable":false},{"id":7,"name":"PayPal","description":"Payments
-        made via PayPal account","transaction_fee":"0.0","active":true,"position":6,"for_frequent_traveller_redemption":false,"comment_required":false,"created_at":"2013-03-01T00:00:03+10:30","updated_at":"2013-03-01T00:00:03+10:30","credit_card_brand":null,"payment_method":"paypal","gateway":"braintree","on_account":false,"ticket_holding":false,"requires_staff":false,"internal":false,"redirect":false,"background":true,"creditlink":false,"surchargeable":false}],"issued_tickets_attributes":[]}'
+        Discount Hilton","description":"","display_name":"Test Discount Hilton"}],"package":false,"sub_reservation_depth":0,"extra_pick":null,"child_resource":null,"pending_confirmation":false,"confirmation_request_fields":[],"report_reservation_changes":false,"vendor_pnr":null,"pick_up_information":null,"drop_off_information":null,"vendor_staff":null,"notes_for_vendor":null,"passenger_ids":[],"passenger_splits":[],"vehicle_ids":[],"vehicle_splits":[],"consumer_grosses":{}}],"adjustments_attributes":[],"payments_attributes":[],"payment_types_attributes":[{"id":4,"name":"visa","description":"visa","transaction_fee":"0.0","active":true,"position":3,"for_frequent_traveller_redemption":false,"comment_required":false,"created_at":null,"updated_at":null,"credit_card_brand":"Visa","payment_method":"credit_card","gateway":"braintree","on_account":false,"ticket_holding":false,"requires_staff":false,"internal":false,"redirect":false,"background":true,"creditlink":false,"surchargeable":false},{"id":5,"name":"master","description":"master","transaction_fee":"0.0","active":true,"position":4,"for_frequent_traveller_redemption":false,"comment_required":false,"created_at":null,"updated_at":null,"credit_card_brand":null,"payment_method":"credit_card","gateway":"braintree","on_account":false,"ticket_holding":false,"requires_staff":false,"internal":false,"redirect":false,"background":true,"creditlink":false,"surchargeable":false},{"id":7,"name":"PayPal","description":"Payments
+        made via PayPal account","transaction_fee":"0.0","active":true,"position":6,"for_frequent_traveller_redemption":false,"comment_required":false,"created_at":null,"updated_at":null,"credit_card_brand":null,"payment_method":"paypal","gateway":"braintree","on_account":false,"ticket_holding":false,"requires_staff":false,"internal":false,"redirect":false,"background":true,"creditlink":false,"surchargeable":false},{"id":10,"name":"Opal
+        Pay","description":"Opal Payments","transaction_fee":"0.0","active":true,"position":9,"for_frequent_traveller_redemption":false,"comment_required":false,"created_at":null,"updated_at":null,"credit_card_brand":null,"payment_method":"opal_pay","gateway":null,"on_account":false,"ticket_holding":false,"requires_staff":false,"internal":false,"redirect":false,"background":false,"creditlink":false,"surchargeable":false}],"issued_tickets_attributes":[]}'
     http_version: 
-  recorded_at: Wed, 08 Feb 2017 00:35:12 GMT
+  recorded_at: Wed, 21 Mar 2018 04:40:21 GMT
 - request:
     method: get
-    uri: http://test.qt.sealink.com.au:8080/resources/6.json
+    uri: http://test.qt.sealink.com.au:8080/api/bookings/4.json
     body:
       encoding: UTF-8
       string: access_key=<QT_KEY>
@@ -142,22 +137,85 @@ http_interactions:
       - CP="IDC DSP CAO COR ADM DEVi TAIi PSA PSD IVAi IVDi CONi HIS OUR IND CNT"
       Content-Type:
       - application/json; charset=utf-8
-      X-Ua-Compatible:
-      - IE=Edge,chrome=1
       Etag:
-      - '"4d660ebe1fce6dba8cfe89a924383b21"'
+      - W/"aa50e1d763ad0b4a59803613427e6867"
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - befb6299b8e9da3e8c7c2be5741aa0ee
+      - 00bd9364-b63e-4cea-af27-0fe0688e24da
       X-Runtime:
-      - '0.065444'
+      - '0.353520'
+      Date:
+      - Fri, 01 Jan 2016 02:32:14 GMT
+      X-Rack-Cache:
+      - miss
       Vary:
       - Origin
+      X-Content-Type-Options:
+      - nosniff
+      X-Download-Options:
+      - noopen
+      X-Frame-Options:
+      - sameorigin
+      X-Permitted-Cross-Domain-Policies:
+      - none
+      X-Xss-Protection:
+      - 1; mode=block
+      Server:
+      - WEBrick/1.3.1 (Ruby/2.2.5/2016-04-26)
+      Content-Length:
+      - '5932'
+      Connection:
+      - Keep-Alive
+      Set-Cookie:
+      - _session_id=ZUErbjdUa3VaRW9Cd1o4bkwvSi9rOVhSTTRYcmI4NEZGb25SSXZOeTU2YjB5WkR2L0lPTVhQUDR4MW1hODdEZHpwNzVQNFc3QWtZb1J6UFdCaHZsUWJZdVF4TWNySDRIeXYrOUZURlJtZTA9LS1kNTB6VVdncU5CSE85NS91MEtzMVNBPT0%3D--9a48c9f9b4262a5a21f47dd71ec25d97eb4a9395;
+        path=/; HttpOnly
+    body:
+      encoding: UTF-8
+      string: '{"id":4,"state":"new","reference":"222227","public_comments":null,"internal_comments":null,"customer_contact_name":null,"customer_contact_phone":null,"customer_contact_mobile":null,"customer_contact_email":null,"currency_iso_code":"AUD","country_id":14,"drop_off_option_id":null,"drop_off_location_id":null,"post_code":null,"referral_code_id":1,"external_identifier":null,"created_at":"2016-01-01T13:02:12.000+10:30","updated_at":"2016-01-01T13:02:13.000+10:30","promo_code":null,"promo_code_id":null,"insurance_offered":false,"total_adjustments_in_cents":0,"pre_adjusted_gross_in_cents":20000,"nett_in_cents":20000,"gross_in_cents":20000,"commission_in_cents":0,"balance_in_cents":20000,"paid_in_cents":0,"surcharge_in_cents":0,"deposit_in_cents":0,"web_site_name":"SeaLink","deposit_relevant":false,"deposit_due_on":{"_type":"Date","_value":"2016-03-01T00:00:00.000+10:30"},"balance_due_on":{"_type":"Date","_value":"2016-03-01T00:00:00.000+10:30"},"due":false,"first_travel_date":{"_type":"Date","_value":"2016-03-01"},"last_travel_date":{"_type":"Date","_value":"2016-03-02"},"complete":true,"reason_not_complete":"","first_reason_not_complete":"","unprintable_luggage_tags":false,"discardable_in":60,"inactivatable_in":10,"notices":{},"client":null,"passenger_ids":[],"vehicle_ids":[],"reservation_ids":[6],"adjustment_ids":[],"todo_items":[],"confirmation_requests":[],"passengers_attributes":[],"vehicles_attributes":[],"reservations_attributes":[{"id":6,"booking_id":4,"description":"A
+        basic studio room","comment":null,"active":true,"service_ids":[3,4],"resource_id":6,"quantity":null,"adjustments_attributes":[{"id":7,"gross_in_cents":-20000,"creator":{"id":1,"name":"Administrator
+        Administrator","age":null,"first_name":"administrator","last_name":"administrator","title":null,"gender":null,"created_at":null,"updated_at":null,"notes":null,"updator_id":null,"creator_id":null,"active":true,"internal_subdivision":false,"business_number":null,"business_number_type":null,"currency_iso_code":"AUD","access_type":2},"created_at":"2016-01-01T13:02:13.000+10:30","description":"50%
+        Off","adjustable_item_type":"Reservation","adjustable_item_id":6,"adjustment_definition_id":1,"adjustment_category_id":1,"automatic":true}],"complete":true,"reason_not_complete":"","first_reason_not_complete":"","enough_time_before_travel_to_edit":true,"bed_configuration":"1
+        x Double and 1 x Single","product_type_id":2,"itinerary_footer":false,"fare_basis_set_id":12,"manually_priced":false,"manually_assigned_fare_basis_set":false,"has_fare_basis":true,"fare_basis_season_name":null,"fare_basis_pointer_id":6,"pick_up_info":null,"drop_off_info":null,"selection_name":"Hilton
+        Hotel:  Executive Room","product_name_underscore":"accommodation","resource_class_name_underscore":"accommodation","resource_class_name":"Accommodation","has_ticket_template":false,"first_travel_date":{"_type":"Date","_value":"2016-03-01"},"last_travel_date":{"_type":"Date","_value":"2016-03-02"},"durational":true,"duration":2,"span":2,"checkout_date":{"_type":"Date","_value":"2016-03-03"},"duration_units":"Nights","date_start_label":"In:","date_end_label":"Out:","accommodation_extra_picks":false,"expires":false,"expiry":"*NA*","has_skipped_reservation_groups":false,"editable_reservation_groups":[],"tariff_level_name":"Auto
+        Priced as: Rack Rate","gross_including_packaged_item_in_cents":20000,"pre_adjusted_gross_including_packaged_item_in_cents":40000,"gross_in_cents":20000,"pre_adjusted_gross_in_cents":40000,"pre_adjusted_commission_in_cents":0,"cost_in_cents":20000,"rules":[{"unique_name":"Test
+        Discount Hilton","description":"","display_name":"Test Discount Hilton"}],"package":false,"sub_reservation_depth":0,"extra_pick":null,"child_resource":null,"pending_confirmation":false,"confirmation_request_fields":[],"report_reservation_changes":false,"vendor_pnr":null,"pick_up_information":null,"drop_off_information":null,"vendor_staff":null,"notes_for_vendor":null,"passenger_ids":[],"passenger_splits":[],"vehicle_ids":[],"vehicle_splits":[],"consumer_grosses":{}}],"adjustments_attributes":[],"payments_attributes":[],"payment_types_attributes":[{"id":4,"name":"visa","description":"visa","transaction_fee":"0.0","active":true,"position":3,"for_frequent_traveller_redemption":false,"comment_required":false,"created_at":null,"updated_at":null,"credit_card_brand":"Visa","payment_method":"credit_card","gateway":"braintree","on_account":false,"ticket_holding":false,"requires_staff":false,"internal":false,"redirect":false,"background":true,"creditlink":false,"surchargeable":false},{"id":5,"name":"master","description":"master","transaction_fee":"0.0","active":true,"position":4,"for_frequent_traveller_redemption":false,"comment_required":false,"created_at":null,"updated_at":null,"credit_card_brand":null,"payment_method":"credit_card","gateway":"braintree","on_account":false,"ticket_holding":false,"requires_staff":false,"internal":false,"redirect":false,"background":true,"creditlink":false,"surchargeable":false},{"id":7,"name":"PayPal","description":"Payments
+        made via PayPal account","transaction_fee":"0.0","active":true,"position":6,"for_frequent_traveller_redemption":false,"comment_required":false,"created_at":null,"updated_at":null,"credit_card_brand":null,"payment_method":"paypal","gateway":"braintree","on_account":false,"ticket_holding":false,"requires_staff":false,"internal":false,"redirect":false,"background":true,"creditlink":false,"surchargeable":false},{"id":10,"name":"Opal
+        Pay","description":"Opal Payments","transaction_fee":"0.0","active":true,"position":9,"for_frequent_traveller_redemption":false,"comment_required":false,"created_at":null,"updated_at":null,"credit_card_brand":null,"payment_method":"opal_pay","gateway":null,"on_account":false,"ticket_holding":false,"requires_staff":false,"internal":false,"redirect":false,"background":false,"creditlink":false,"surchargeable":false}],"issued_tickets_attributes":[]}'
+    http_version: 
+  recorded_at: Wed, 21 Mar 2018 04:40:21 GMT
+- request:
+    method: get
+    uri: http://test.qt.sealink.com.au:8080/api/resources/6.json
+    body:
+      encoding: UTF-8
+      string: access_key=<QT_KEY>
+    headers:
+      Content-Length:
+      - '0'
+  response:
+    status:
+      code: 200
+      message: 'OK '
+    headers:
+      P3p:
+      - CP="IDC DSP CAO COR ADM DEVi TAIi PSA PSD IVAi IVDi CONi HIS OUR IND CNT"
+      Content-Type:
+      - application/json; charset=utf-8
+      Etag:
+      - W/"641461e04c30167b268dd9059d420764"
+      Cache-Control:
+      - max-age=0, private, must-revalidate
+      X-Request-Id:
+      - 8b2145a1-6e67-423e-9f40-547544d64ca0
+      X-Runtime:
+      - '0.188828'
       Date:
-      - Fri, 01 Jan 2016 04:38:25 GMT
+      - Fri, 01 Jan 2016 02:32:15 GMT
       X-Rack-Cache:
       - miss
+      Vary:
+      - Origin
       X-Content-Type-Options:
       - nosniff
       X-Download-Options:
@@ -171,18 +229,18 @@ http_interactions:
       Server:
       - WEBrick/1.3.1 (Ruby/2.2.5/2016-04-26)
       Content-Length:
-      - '1444'
+      - '1437'
       Connection:
       - Keep-Alive
       Set-Cookie:
-      - _session_id=BAh7B0kiD3Nlc3Npb25faWQGOgZFVEkiJWJkNmVhMDgwMDNjNzlhZGFkY2Y0YjM3NDEyYjRkMmFjBjsAVEkiCXVzZXIGOwBGaQY%3D--d7a54eab8057174197ebacf5b21a47b876feade9;
+      - _session_id=K3YwQzJqQTRUQVg5Z21zQTBtY09CMGxRUU0rRFM5Ukx5dEE5aGhGaGFRSWpOSEhpczRsTyt4dld6SUtKUnNScWs1cm5JRGYyOWZraExiK1FkY3VXZENNQURqK0d0YUs0NTB3SHd3cHFOSVU9LS1UMlF1bXFXSUQxb0lTTUxMdERtWVpnPT0%3D--a8f069368bac2bf3c131daccbe44f8b0776d020e;
         path=/; HttpOnly
     body:
       encoding: UTF-8
-      string: '{"id":6,"name":"Executive Room","product_type_id":2,"default_capacity":2,"type":"Accommodation","inventory_type":0,"maximum_occupancy":2,"location_id":1,"property_id":1,"fare_basis_pointer_id":6,"disclaimer_id":null,"deposit_rule_id":null,"vendor_id":null,"maximum_weight":null,"days_before_inventory_expires":null,"property_type_id":1,"star_rating":null,"inline_price_in_cents":null,"inline_cost_in_cents":null,"reason_required":false,"resource_category_id":null,"created_at":"2013-03-01T00:08:49+10:30","updated_at":"2013-03-01T00:55:56+10:30","code":"","restrict_to_client_types":false,"minimum_age":null,"guardian_minimum_age":null,"book_before_level":null,"book_before_units":"seconds","maximum_passengers_online":null,"active":true,"report_changes":false,"inline_pricing":false,"bookable_individually":true,"minimum_passengers":null,"maximum_passengers":null,"required_number_of_vehicles":null,"frequent_traveller_points_multiplier":null,"commissionable":true,"masterpoint_resource_id":null,"print_tickets":false,"individual_tickets":null,"frequent_traveller_redemption_rate":null,"position":null,"ticket_template_id":null,"generate_tickets_by_quantity":true,"to_s":"Hilton
-        Hotel - Executive Room","client_type_ids":[],"category":null,"location":"Adelaide
-        CBD","current_description":"\u003Cp\u003EA basic studio room\u003C/p\u003E","graphics":[],"graphic_names":[],"property_name":"Hilton
-        Hotel","ticket_template":null,"expiry_days":null}'
+      string: '[{"id":6,"name":"Executive Room","product_type_id":2,"default_capacity":2,"type":"Accommodation","inventory_type":0,"maximum_occupancy":2,"property_id":1,"fare_basis_pointer_id":6,"disclaimer_id":null,"deposit_rule_id":null,"vendor_id":null,"maximum_weight":null,"days_before_inventory_expires":null,"property_type_id":1,"star_rating":null,"inline_price_in_cents":null,"inline_cost_in_cents":null,"resource_category_id":null,"created_at":"2018-03-21T11:24:01.000+10:30","updated_at":"2018-03-21T11:24:01.000+10:30","code":"","restrict_to_client_types":false,"minimum_age":null,"guardian_minimum_age":null,"book_before_level":null,"book_before_units":"seconds","maximum_passengers_online":null,"active":true,"report_changes":false,"inline_pricing":false,"bookable_individually":true,"minimum_passengers":null,"maximum_passengers":null,"required_number_of_vehicles":null,"frequent_traveller_points_multiplier":null,"commissionable":true,"masterpoint_resource_id":null,"print_tickets":false,"individual_tickets":null,"frequent_traveller_redemption_rate":null,"position":null,"ticket_template_id":null,"generate_tickets_by_quantity":true,"inventory_release_hour":null,"to_s":"Hilton
+        Hotel - Executive Room","client_type_ids":[],"category":null,"location_ids":[5],"current_description":"\u003cp\u003eA
+        basic studio room\u003c/p\u003e","graphics":[],"graphic_names":[],"property_name":"Hilton
+        Hotel","ticket_template":null,"expiry_days":null}]'
     http_version: 
-  recorded_at: Wed, 08 Feb 2017 00:35:12 GMT
-recorded_with: VCR 3.0.3
+  recorded_at: Wed, 21 Mar 2018 04:40:22 GMT
+recorded_with: VCR 4.0.0