apidae 0.9.33 → 0.9.35
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/models/apidae/obj.rb +7 -5
- data/lib/apidae/version.rb +1 -1
- data/test/dummy/log/development.log +4739 -1
- data/test/dummy/log/test.log +5592 -501
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 554f08fb2b68d51b91e7439500fc93bbfa392cc010597072a4ca263b3d3e6929
|
4
|
+
data.tar.gz: 8f92912b6d90880f7241398182cc46060bdef9ffb719e241edca1e6dd4da608f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: bc5d8c7acdcce8af01ae63bef167e859b40474dca7ff9406a2b18c19747ab119d189d05404f0cbbaf9c81b86148baca14dfde59f7a520383fe41ff93cc4f9388
|
7
|
+
data.tar.gz: c4935867c70676048c8f66a39d088cd8f803b6cb44def3d8adff9718aa8c2df496d3c71a753617bd58b6363134586428ed43b1b7524a8f7152227eb013bff07c
|
data/app/models/apidae/obj.rb
CHANGED
@@ -14,12 +14,12 @@ module Apidae
|
|
14
14
|
store_accessor :pictures_data, :pictures
|
15
15
|
store_accessor :attachments_data, :attachments
|
16
16
|
store_accessor :type_data, :categories, :themes, :capacity, :classification, :labels, :chains, :area, :track,
|
17
|
-
:products, :audience, :animals, :extra, :duration, :certifications, :business
|
17
|
+
:products, :audience, :animals, :extra, :duration, :certifications, :business, :complement
|
18
18
|
store_accessor :entity_data, :entity_id, :entity_name, :service_provider_id
|
19
19
|
store_accessor :contact, :telephone, :email, :website
|
20
20
|
store_accessor :location_data, :address, :place, :latitude, :longitude, :access, :territories, :environments
|
21
21
|
store_accessor :openings_data, :openings_desc, :openings_desc_mode, :openings, :time_periods, :openings_extra
|
22
|
-
store_accessor :rates_data, :rates_desc, :rates_desc_mode, :rates, :payment_methods, :includes, :excludes
|
22
|
+
store_accessor :rates_data, :rates_desc, :rates_desc_mode, :rates, :payment_methods, :includes, :excludes, :rates_complement
|
23
23
|
store_accessor :service_data, :services, :equipments, :comfort, :activities, :challenged, :languages
|
24
24
|
store_accessor :booking_data, :booking_desc, :booking_entities
|
25
25
|
store_accessor :tags_data, :promo, :internal, :linked
|
@@ -366,7 +366,8 @@ module Apidae
|
|
366
366
|
rates_desc: desc, rates: values, payment_methods: methods,
|
367
367
|
rates_desc_mode: rates_hash[:tarifsEnClairGenerationMode] == 'AUTOMATIQUE' ? MODE_AUTO : MODE_MANUAL,
|
368
368
|
includes: node_value(rates_hash, :leTarifComprend, *locales),
|
369
|
-
excludes: node_value(rates_hash, :leTarifNeComprendPas, *locales)
|
369
|
+
excludes: node_value(rates_hash, :leTarifNeComprendPas, *locales),
|
370
|
+
rates_complement: node_value(rates_hash, :complement, *locales)
|
370
371
|
}
|
371
372
|
end
|
372
373
|
end
|
@@ -381,7 +382,7 @@ module Apidae
|
|
381
382
|
categories: lists_ids(data_hash[:categories], data_hash[:typesDetailles], data_hash[:activiteCategories]),
|
382
383
|
themes: lists_ids(data_hash[:themes]),
|
383
384
|
capacity: (data_hash[:capacite] || {})
|
384
|
-
.merge(presta_hash ? {group_min: presta_hash[:tailleGroupeMin], group_max: presta_hash[:tailleGroupeMax],
|
385
|
+
.merge(presta_hash ? {group_min: (presta_hash[:nombrePersonnesMinimum] || presta_hash[:tailleGroupeMin]), group_max: presta_hash[:tailleGroupeMax],
|
385
386
|
age_min: presta_hash[:ageMin], age_max: presta_hash[:ageMax]} : {}),
|
386
387
|
classification: nodes_ids(data_hash[:classement], data_hash[:classementPrefectoral], data_hash[:classification]) +
|
387
388
|
lists_ids(data_hash[:classementsGuides]) + lists_ids(data_hash[:classements]),
|
@@ -396,7 +397,8 @@ module Apidae
|
|
396
397
|
extra: apidae_obj.apidae_type == SPA ? node_value(data_hash, :formuleHebergement, *locales) : node_value(prestations_hash, :complementAccueil, *locales),
|
397
398
|
duration: apidae_obj.apidae_type == SPA ? {days: data_hash[:nombreJours], nights: data_hash[:nombreNuits]} : data_hash[:dureeSeance],
|
398
399
|
certifications: data_hash[:agrements].blank? ? [] : data_hash[:agrements].map {|a| {id: a[:type][:id], identifier: a[:numero]}},
|
399
|
-
business: business_hash
|
400
|
+
business: business_hash,
|
401
|
+
complement: apidae_obj.apidae_type == SPA ? node_value(prestations_hash, :complementAccueil, *locales) : {},
|
400
402
|
}
|
401
403
|
end
|
402
404
|
|
data/lib/apidae/version.rb
CHANGED