booker_ruby 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf1b0e4f9b1d7f0b3250be40be58769ff0685c71
-  data.tar.gz: 5b993b3c662c18cab4c534ceb7cc7f11f280e07f
+  metadata.gz: a41904660d50498b1a4eba410f842522180933db
+  data.tar.gz: ea7db0185a466abb73a20d6f74164fb266d8c31c
 SHA512:
-  metadata.gz: bbf218ae097fa2111f0cfc16dc80e1dd2f5216a3d26a961979b99a1ef135bc9c689998cbef62301e2b90d00fa337035e5673c1e9ff940acbd03a3f8c288de812
-  data.tar.gz: b6085d119216ab6991140d3b98130b203f7e463b4a4ab4924540efab6846125aef2256b1dec7cb4aa86c88c2e1951bd45573268e570e0d92f83c81e05e84f086
+  metadata.gz: 78062d0567ad6c64e59f40512c8f20166c48696c9d2f699287136c84df82ab769b9c88b7e01044c7fc78a4f65c34fe35f33cfd9a7f21f38573bb842d66992276
+  data.tar.gz: 39368562f861510e8a9a9a453a9baf097306b66f6e2f366ebc757df30e23560cdabfc53eb3ec609fab5e4b7be8039f81dad1bd987ca8606a9b6e4d74be96eb9a

data/lib/booker/v4.1/merchant.rb

@@ -119,8 +119,12 @@ module Booker
         )
       end
 
-      def customer(id:)
-        response = get("#{V41_PREFIX}/customer/#{id}", build_params)
+      def customer(id:, params: {})
+        additional_params = {
+          LoadUnpaidAppointments: false,
+          includeFieldValues: false
+        }
+        response = get("#{V41_PREFIX}/customer/#{id}", build_params(additional_params, params))
         Booker::V4::Models::Customer.from_hash(response)
       end
 

data/lib/booker/version.rb

@@ -1,3 +1,3 @@
 module Booker
-  VERSION = '3.0.5'
+  VERSION = '3.0.6'
 end

data/lib/booker_ruby.rb

@@ -95,16 +95,11 @@ require 'booker/client'
 
 # V4 Rest
 require 'booker/v4/request_helper'
-require 'booker/v4/common_rest'
-require 'booker/v4/business_rest'
-require 'booker/v4/customer_rest'
 
 # Token Store
 require 'booker/generic_token_store'
 
 # Client Subclasses
-require 'booker/v4/business_client'
-require 'booker/v4/customer_client'
 require 'booker/v4.1/customer'
 require 'booker/v4.1/merchant'
 require 'booker/v5/availability'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: booker_ruby
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
 platform: ruby
 authors:
 - Frederick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-18 00:00:00.000000000 Z
+date: 2017-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -153,11 +153,6 @@ files:
 - lib/booker/model.rb
 - lib/booker/v4.1/customer.rb
 - lib/booker/v4.1/merchant.rb
-- lib/booker/v4/business_client.rb
-- lib/booker/v4/business_rest.rb
-- lib/booker/v4/common_rest.rb
-- lib/booker/v4/customer_client.rb
-- lib/booker/v4/customer_rest.rb
 - lib/booker/v4/models/address.rb
 - lib/booker/v4/models/appointment.rb
 - lib/booker/v4/models/appointment_treatment.rb

data/lib/booker/v4/business_client.rb

@@ -1,9 +0,0 @@
-module Booker
-  module V4
-    class BusinessClient < Booker::Client
-      include Booker::V4::BusinessREST
-      ENV_BASE_URL_KEY = 'BOOKER_BUSINESS_SERVICE_URL'.freeze
-      DEFAULT_BASE_URL = 'https://apicurrent-app.booker.ninja/webservice4/json/BusinessService.svc'.freeze
-    end
-  end
-end

data/lib/booker/v4/business_rest.rb

@@ -1,88 +0,0 @@
-module Booker
-  module V4
-    module BusinessREST
-      include Booker::V4::CommonREST
-
-      def get_logged_in_user
-        response = get('/user', build_params)
-        result = Booker::V4::Models::User.from_hash(response['User'])
-        result.LocationID = response['LocationID']
-        result.BrandID = response['BrandID']
-        result
-      end
-
-      def get_location_day_schedules(booker_location_id:, params: {})
-        # Booker requires fromDate and toDate for JSON API, but does not use them when getDefaultDaySchedule is true
-        # So datetime used for these fields does not matter
-        random_datetime = Booker::V4::Models::Model.time_to_booker_datetime(Time.now)
-
-        additional_params = {getDefaultDaySchedule: true, fromDate: random_datetime, toDate: random_datetime}
-        response = get("/location/#{booker_location_id}/schedule", build_params(additional_params, params))
-        response['LocationDaySchedules'].map { |sched| Booker::V4::Models::LocationDaySchedule.from_hash(sched) }
-      end
-
-      def find_locations(options: {})
-        paginated_request(
-            method: :post,
-            path: '/locations',
-            params: build_params({}, options, true),
-            model: Booker::V4::Models::Location
-        )
-      end
-
-      def find_employees(booker_location_id:, fetch_all: true, options: {})
-        paginated_request(
-            method: :post,
-            path: '/employees',
-            params: build_params({LocationID: booker_location_id}, options, true),
-            model: Booker::V4::Models::Employee,
-            fetch_all: fetch_all
-        )
-      end
-
-      def find_treatments(booker_location_id:, fetch_all: true, options: {})
-        paginated_request(
-            method: :post,
-            path: '/treatments',
-            params: build_params({LocationID: booker_location_id}, options, true),
-            model: Booker::V4::Models::Treatment,
-            fetch_all: fetch_all
-        )
-      end
-
-      def find_appointments_partial(booker_location_id:, start_date:, end_date:, fetch_all: true, options: {})
-        additional_params = {
-          LocationID: booker_location_id,
-          FromStartDate: start_date.to_date,
-          ToStartDate: end_date.to_date
-        }
-
-        paginated_request(
-          method: :post,
-          path: '/appointments/partial',
-          params: build_params(additional_params, options, true),
-          model: Booker::V4::Models::Appointment,
-          fetch_all: fetch_all
-        )
-      end
-
-      def get_location_notification_settings(booker_location_id:)
-        response = get "/location/#{booker_location_id}/notification_settings", build_params
-        Booker::V4::Models::NotificationSettings.from_hash response['NotificationSettings']
-      end
-
-      def update_location_notification_settings(booker_location_id:, send_appointment_reminders:)
-        put "/location/#{booker_location_id}/notification_settings", build_params({
-          NotificationSettings: {
-            SendAppointmentReminders: send_appointment_reminders
-          }
-        })
-      end
-
-      def get_location_feature_settings(booker_location_id:)
-        response = get "/location/#{booker_location_id}/feature_settings", build_params
-        Booker::V4::Models::FeatureSettings.from_hash response['FeatureSettings']
-      end
-    end
-  end
-end

data/lib/booker/v4/common_rest.rb

@@ -1,21 +0,0 @@
-module Booker
-  module V4
-    module CommonREST
-      include Booker::V4::RequestHelper
-
-      def get_online_booking_settings(booker_location_id:)
-        response = get("/location/#{booker_location_id}/online_booking_settings", build_params)
-        Booker::V4::Models::OnlineBookingSettings.from_hash(response['OnlineBookingSettings'])
-      end
-
-      def confirm_appointment(appointment_id:)
-        put '/appointment/confirm', build_params(ID: appointment_id), Booker::V4::Models::Appointment
-      end
-
-      def get_location(booker_location_id:)
-        response = get("/location/#{booker_location_id}", build_params)
-        Booker::V4::Models::Location.from_hash(response)
-      end
-    end
-  end
-end

data/lib/booker/v4/customer_client.rb

@@ -1,15 +0,0 @@
-module Booker
-  module V4
-    class CustomerClient < Client
-      include Booker::V4::CustomerREST
-      ENV_BASE_URL_KEY = 'BOOKER_CUSTOMER_SERVICE_URL'.freeze
-      DEFAULT_BASE_URL = 'https://apicurrent-app.booker.ninja/webservice4/json/CustomerService.svc'.freeze
-
-      def initialize(options={})
-        super
-        self.token_store ||= GenericTokenStore
-        self.token_store_callback_method ||= :update_booker_access_token!
-      end
-    end
-  end
-end

data/lib/booker/v4/customer_rest.rb

@@ -1,15 +0,0 @@
-module Booker
-  module V4
-    module CustomerREST
-      include Booker::V4::CommonREST
-
-      def create_class_appointment(booker_location_id:, class_instance_id:, customer:, options: {})
-        post '/class_appointment/create', build_params({
-          LocationID: booker_location_id,
-          ClassInstanceID: class_instance_id,
-          Customer: customer
-        }, options), Booker::V4::Models::Appointment
-      end
-    end
-  end
-end