Skip to content

Commit

Permalink
MOB-4219 release 1.6.3 (MASTER) (#158)
Browse files Browse the repository at this point in the history
* [MOB-2976] Quote model update for Polling (#80)

* Update quote models

* Update tests

* Update cart file (#81)

* Call follow endpoint for guest checkout booking fee retrieval (#83)

* [MOB-3176] Cancellation SLA to booking (#84)

* New models

* Update tripinfo object

* Update JSON

* Remove package.resolved file

* Update tests

* Ignore this (#85)

* {MOB-3181] Quotes cancellation SLA (#86)

* Update quote model

* Update tests

* MOB-3144 - Add decimal formatting to CancellationFeePrice (#87)

* Add decimal formatting to CancellationFeePrice

* Update to use global const

* Remove URL suffix (#88)

* Add BrowserInfo to Adyen DropIn Payload (#89)

* Bump nokogiri from 1.10.7 to 1.11.1 (#76)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.11.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.11.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* MOB-3205 Add SupplyPartnerID to the AdyenPayments request (#90)

* Add SupplyPartnerId field to the payments API

* Update tests and add supplyPartnerId

* Add Fleet model to be used in Quote model (#91)

* Make service cancellation type an enum (#92)

* Make service cancellation type an enum

* Retain other service cancellation type values.

* Bump kramdown from 2.3.0 to 2.3.1 (#93)

Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use the Keychain to store user credentials. (#94)

* Add fastlane update command (#95)

* Add fastlane update command

* Add fastlane update as a separate command

* Update Gemfile.lock

* [MOB-3216] Release 1.4.0 (#96)

* Bump version

* Update pod spec (Need this to be published)

* Bump nokogiri from 1.11.2 to 1.11.5 (#98)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.2 to 1.11.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.2...v1.11.5)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use date data type for dateBooked (#99)

* Bump version number to 1.5.0 (#100)

* [MOB-3438] login with credentials (#104)

* Make first small changes to auth service.

* Create auth credentials swift files and update authservice

* Init auth credentials interactor

* Credentials finally works as public

* Almost finished

* Swap credentials with authToken

* Finish interactor + rename token interactor

* Remove requestsender

* Test pass

* Release 1.5.1 (#106)

* versiob bump to 1_5_1-rc1

* updated version to 1_5_1

* changed readme (#108)

* MOB-3445 change AuthToken init access level from internal to public (#109)

* MOB-3488 Release 1.5.2 (develop) (#110)

* Release 1.5.2

* Update marketting project version

* MOB-3405 fix coding key for fleet capabilties (#112)

Co-authored-by: Anca Feurdean <[email protected]>

* fix refresh token call headers (#114)

* MOB-3528: Release 1.5.3 (develop) (#115)

* Release 1.5.3

* test circleci

* undo circleci test

* Add new error codes (#117)

* Add loyalty nonce to booking api (#118)

* Modify LoyaltyProgramme to be an Object vs an Array (#120)

* Mob xxxx circleci fix (#124)

* Update config.yml

* Update config.yml

* Revert

* Avoid deleting the SSH private key

* use separate commends

* use xlarge resource

* use cache for bundle

* update xcode version to 12.2.0

* a bit cleanup

* revert back to working version

* update bundler version

* use large resource

* use xlarge resource

* update xcode version, decrease resource_class to medium to fit our price plan

* revert Xcode to 12.0, revert resource_class to xlarge, and change bundler version to 2.2.7 - working UISDK config

* try solution proposed by Mikolaj

* going back to xcode 12.2 and large resource_class

* using medium resource_class

* update fastlane

* update fastlane take 2

* circleci sanity check

* test removing ssh key

* reverting last commit

* adjust bundler version

* test circleci

* update to xcode 13

* update fastlane

* remove fastline update, run bundle install before installing specific gem

* Use xcode 12.5.1

* Minor change

Co-authored-by: EdwardW2 <[email protected]>
Co-authored-by: Diana Petrea <[email protected]>

* [MOB-3633] Add Loyalty API (#119)

* Add endpoints

* LoyaltyStatus API Added

* Add LoyaltyPoints model

* Fix up the API endpoints

* LoyaltyStatus Interactor

* Edit APIEndpoint again

* Update LoyaltyService

* LoyaltyBurn interactor

* Loyaltyearn Interactor

* Update LoyaltyService

* PreAuth interactor

* Update service

* Add mocks

* Preauth mock

* Add tests

* Add remaining tests

* Update PreAuth interactor

* Remove Integration Tests (Not ready)

* Fix loyaltyservice for preauth

* Fix tests

* Make requested changes to LoyaltyPreAuth

* points to burnPoints

* Guard currency

* Fix broken test

* Add new status test to make sure request is setup correctly

* Fix loyaltyStatus?

* cicleci test commit

* test circleci commit

* Add errors

* Mob 3656 (#123)

* get and persist loyalty status after payment provider response

* minor change

* add get current status method to loyalty service

* refresh current loyalty status

* add unit tests

* Fix for paymemt provider model

* resolve PR comments

Co-authored-by: Mostafa Hadian <[email protected]>

Co-authored-by: Diana Petrea <[email protected]>
Co-authored-by: Mostafa Hadian <[email protected]>
Co-authored-by: dianakarh <[email protected]>

* Mob 3650 (#125)

* update loyalty nonce model

* fix unit test

* fix loyalty preauth interactor

* redo execute implementation in loyalty preauth interactor

* Mob 3785 (#126)

* add slug to KarhooError

* use slug, add new error type

* add new errot type

* bump version (#127)

* MOB-3819 add shopper locale to adyen payment request (#129)

* add shopper locale to adyen payment request

* add minor tweak

* Feature/MOB-3883 add basic analytics events to track the conversion steps (#130)

* New event names added according to requirements in https://karhoo.atlassian.net/browse/MOB-3868

* cleanup

* cleanup

* Renaming

* bump version (#131)

* change vehicle class to vehicle type in quote categories (#134)

* change vehicle class to vehicle type in quote categories
* fix tests

* Feature/4021 add client key endpoint (#137)

* add Adyen client key call

* Mob 4024 post release 1.6 [DEVELOP] (#141)

* [MOB-3216] Update master (#97)

* [MOB-2976] Quote model update for Polling (#80)

* Update quote models

* Update tests

* Update cart file (#81)

* Call follow endpoint for guest checkout booking fee retrieval (#83)

* [MOB-3176] Cancellation SLA to booking (#84)

* New models

* Update tripinfo object

* Update JSON

* Remove package.resolved file

* Update tests

* Ignore this (#85)

* {MOB-3181] Quotes cancellation SLA (#86)

* Update quote model

* Update tests

* MOB-3144 - Add decimal formatting to CancellationFeePrice (#87)

* Add decimal formatting to CancellationFeePrice

* Update to use global const

* Remove URL suffix (#88)

* Add BrowserInfo to Adyen DropIn Payload (#89)

* Bump nokogiri from 1.10.7 to 1.11.1 (#76)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.11.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.11.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* MOB-3205 Add SupplyPartnerID to the AdyenPayments request (#90)

* Add SupplyPartnerId field to the payments API

* Update tests and add supplyPartnerId

* Add Fleet model to be used in Quote model (#91)

* Make service cancellation type an enum (#92)

* Make service cancellation type an enum

* Retain other service cancellation type values.

* Bump kramdown from 2.3.0 to 2.3.1 (#93)

Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use the Keychain to store user credentials. (#94)

* Add fastlane update command (#95)

* Add fastlane update command

* Add fastlane update as a separate command

* Update Gemfile.lock

* [MOB-3216] Release 1.4.0 (#96)

* Bump version

* Update pod spec (Need this to be published)

Co-authored-by: Jo Santa Maria <[email protected]>
Co-authored-by: Mostafa Hadian <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: cornelkar <[email protected]>

* MOB-3387 Final release 1.5.0 (#102)

* [MOB-2976] Quote model update for Polling (#80)

* Update quote models

* Update tests

* Update cart file (#81)

* Call follow endpoint for guest checkout booking fee retrieval (#83)

* [MOB-3176] Cancellation SLA to booking (#84)

* New models

* Update tripinfo object

* Update JSON

* Remove package.resolved file

* Update tests

* Ignore this (#85)

* {MOB-3181] Quotes cancellation SLA (#86)

* Update quote model

* Update tests

* MOB-3144 - Add decimal formatting to CancellationFeePrice (#87)

* Add decimal formatting to CancellationFeePrice

* Update to use global const

* Remove URL suffix (#88)

* Add BrowserInfo to Adyen DropIn Payload (#89)

* Bump nokogiri from 1.10.7 to 1.11.1 (#76)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.11.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.11.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* MOB-3205 Add SupplyPartnerID to the AdyenPayments request (#90)

* Add SupplyPartnerId field to the payments API

* Update tests and add supplyPartnerId

* Add Fleet model to be used in Quote model (#91)

* Make service cancellation type an enum (#92)

* Make service cancellation type an enum

* Retain other service cancellation type values.

* Bump kramdown from 2.3.0 to 2.3.1 (#93)

Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use the Keychain to store user credentials. (#94)

* Add fastlane update command (#95)

* Add fastlane update command

* Add fastlane update as a separate command

* Update Gemfile.lock

* [MOB-3216] Release 1.4.0 (#96)

* Bump version

* Update pod spec (Need this to be published)

* Bump nokogiri from 1.11.2 to 1.11.5 (#98)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.2 to 1.11.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.2...v1.11.5)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use date data type for dateBooked (#99)

* Bump version number to 1.5.0

Co-authored-by: EdwardW2 <[email protected]>
Co-authored-by: Jo Santa Maria <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: cornelkar <[email protected]>

* Post release 1 5 1 (#107)

* [MOB-2976] Quote model update for Polling (#80)

* Update quote models

* Update tests

* Update cart file (#81)

* Call follow endpoint for guest checkout booking fee retrieval (#83)

* [MOB-3176] Cancellation SLA to booking (#84)

* New models

* Update tripinfo object

* Update JSON

* Remove package.resolved file

* Update tests

* Ignore this (#85)

* {MOB-3181] Quotes cancellation SLA (#86)

* Update quote model

* Update tests

* MOB-3144 - Add decimal formatting to CancellationFeePrice (#87)

* Add decimal formatting to CancellationFeePrice

* Update to use global const

* Remove URL suffix (#88)

* Add BrowserInfo to Adyen DropIn Payload (#89)

* Bump nokogiri from 1.10.7 to 1.11.1 (#76)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.11.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.11.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* MOB-3205 Add SupplyPartnerID to the AdyenPayments request (#90)

* Add SupplyPartnerId field to the payments API

* Update tests and add supplyPartnerId

* Add Fleet model to be used in Quote model (#91)

* Make service cancellation type an enum (#92)

* Make service cancellation type an enum

* Retain other service cancellation type values.

* Bump kramdown from 2.3.0 to 2.3.1 (#93)

Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use the Keychain to store user credentials. (#94)

* Add fastlane update command (#95)

* Add fastlane update command

* Add fastlane update as a separate command

* Update Gemfile.lock

* [MOB-3216] Release 1.4.0 (#96)

* Bump version

* Update pod spec (Need this to be published)

* Bump nokogiri from 1.11.2 to 1.11.5 (#98)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.2 to 1.11.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.2...v1.11.5)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use date data type for dateBooked (#99)

* Bump version number to 1.5.0 (#100)

* [MOB-3438] login with credentials (#104)

* Make first small changes to auth service.

* Create auth credentials swift files and update authservice

* Init auth credentials interactor

* Credentials finally works as public

* Almost finished

* Swap credentials with authToken

* Finish interactor + rename token interactor

* Remove requestsender

* Test pass

* versiob bump to 1_5_1-rc1

* updated version to 1_5_1

Co-authored-by: EdwardW2 <[email protected]>
Co-authored-by: Jo Santa Maria <[email protected]>
Co-authored-by: Mostafa Hadian <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: cornelkar <[email protected]>

* MOB-3488 Post release 1.5.2 (master) (#111)

* [MOB-2976] Quote model update for Polling (#80)

* Update quote models

* Update tests

* Update cart file (#81)

* Call follow endpoint for guest checkout booking fee retrieval (#83)

* [MOB-3176] Cancellation SLA to booking (#84)

* New models

* Update tripinfo object

* Update JSON

* Remove package.resolved file

* Update tests

* Ignore this (#85)

* {MOB-3181] Quotes cancellation SLA (#86)

* Update quote model

* Update tests

* MOB-3144 - Add decimal formatting to CancellationFeePrice (#87)

* Add decimal formatting to CancellationFeePrice

* Update to use global const

* Remove URL suffix (#88)

* Add BrowserInfo to Adyen DropIn Payload (#89)

* Bump nokogiri from 1.10.7 to 1.11.1 (#76)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.11.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.11.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* MOB-3205 Add SupplyPartnerID to the AdyenPayments request (#90)

* Add SupplyPartnerId field to the payments API

* Update tests and add supplyPartnerId

* Add Fleet model to be used in Quote model (#91)

* Make service cancellation type an enum (#92)

* Make service cancellation type an enum

* Retain other service cancellation type values.

* Bump kramdown from 2.3.0 to 2.3.1 (#93)

Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use the Keychain to store user credentials. (#94)

* Add fastlane update command (#95)

* Add fastlane update command

* Add fastlane update as a separate command

* Update Gemfile.lock

* [MOB-3216] Release 1.4.0 (#96)

* Bump version

* Update pod spec (Need this to be published)

* Bump nokogiri from 1.11.2 to 1.11.5 (#98)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.2 to 1.11.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.2...v1.11.5)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use date data type for dateBooked (#99)

* Bump version number to 1.5.0 (#100)

* [MOB-3438] login with credentials (#104)

* Make first small changes to auth service.

* Create auth credentials swift files and update authservice

* Init auth credentials interactor

* Credentials finally works as public

* Almost finished

* Swap credentials with authToken

* Finish interactor + rename token interactor

* Remove requestsender

* Test pass

* Release 1.5.1 (#106)

* versiob bump to 1_5_1-rc1

* updated version to 1_5_1

* changed readme (#108)

* MOB-3445 change AuthToken init access level from internal to public (#109)

* Release 1.5.2

* Update marketting project version

Co-authored-by: EdwardW2 <[email protected]>
Co-authored-by: Jo Santa Maria <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: cornelkar <[email protected]>
Co-authored-by: cosminBadulescu <[email protected]>
Co-authored-by: dianakarh <[email protected]>

* MOB-3528: Post Release 1.5.3 (master) (#116)

* [MOB-2976] Quote model update for Polling (#80)

* Update quote models

* Update tests

* Update cart file (#81)

* Call follow endpoint for guest checkout booking fee retrieval (#83)

* [MOB-3176] Cancellation SLA to booking (#84)

* New models

* Update tripinfo object

* Update JSON

* Remove package.resolved file

* Update tests

* Ignore this (#85)

* {MOB-3181] Quotes cancellation SLA (#86)

* Update quote model

* Update tests

* MOB-3144 - Add decimal formatting to CancellationFeePrice (#87)

* Add decimal formatting to CancellationFeePrice

* Update to use global const

* Remove URL suffix (#88)

* Add BrowserInfo to Adyen DropIn Payload (#89)

* Bump nokogiri from 1.10.7 to 1.11.1 (#76)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.11.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.11.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* MOB-3205 Add SupplyPartnerID to the AdyenPayments request (#90)

* Add SupplyPartnerId field to the payments API

* Update tests and add supplyPartnerId

* Add Fleet model to be used in Quote model (#91)

* Make service cancellation type an enum (#92)

* Make service cancellation type an enum

* Retain other service cancellation type values.

* Bump kramdown from 2.3.0 to 2.3.1 (#93)

Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use the Keychain to store user credentials. (#94)

* Add fastlane update command (#95)

* Add fastlane update command

* Add fastlane update as a separate command

* Update Gemfile.lock

* [MOB-3216] Release 1.4.0 (#96)

* Bump version

* Update pod spec (Need this to be published)

* Bump nokogiri from 1.11.2 to 1.11.5 (#98)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.2 to 1.11.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.2...v1.11.5)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use date data type for dateBooked (#99)

* Bump version number to 1.5.0 (#100)

* [MOB-3438] login with credentials (#104)

* Make first small changes to auth service.

* Create auth credentials swift files and update authservice

* Init auth credentials interactor

* Credentials finally works as public

* Almost finished

* Swap credentials with authToken

* Finish interactor + rename token interactor

* Remove requestsender

* Test pass

* Release 1.5.1 (#106)

* versiob bump to 1_5_1-rc1

* updated version to 1_5_1

* changed readme (#108)

* MOB-3445 change AuthToken init access level from internal to public (#109)

* MOB-3488 Release 1.5.2 (develop) (#110)

* Release 1.5.2

* Update marketting project version

* MOB-3405 fix coding key for fleet capabilties (#112)

Co-authored-by: Anca Feurdean <[email protected]>

* fix refresh token call headers (#114)

* Release 1.5.3

* test circleci fix

* undo circleci test

Co-authored-by: EdwardW2 <[email protected]>
Co-authored-by: Jo Santa Maria <[email protected]>
Co-authored-by: Mostafa Hadian <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: cornelkar <[email protected]>
Co-authored-by: cosminBadulescu <[email protected]>
Co-authored-by: ancafeurdean09 <[email protected]>

* Mob-3749_post_release_1_5_4 (#128)

* [MOB-2976] Quote model update for Polling (#80)

* Update quote models

* Update tests

* Update cart file (#81)

* Call follow endpoint for guest checkout booking fee retrieval (#83)

* [MOB-3176] Cancellation SLA to booking (#84)

* New models

* Update tripinfo object

* Update JSON

* Remove package.resolved file

* Update tests

* Ignore this (#85)

* {MOB-3181] Quotes cancellation SLA (#86)

* Update quote model

* Update tests

* MOB-3144 - Add decimal formatting to CancellationFeePrice (#87)

* Add decimal formatting to CancellationFeePrice

* Update to use global const

* Remove URL suffix (#88)

* Add BrowserInfo to Adyen DropIn Payload (#89)

* Bump nokogiri from 1.10.7 to 1.11.1 (#76)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.11.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.11.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* MOB-3205 Add SupplyPartnerID to the AdyenPayments request (#90)

* Add SupplyPartnerId field to the payments API

* Update tests and add supplyPartnerId

* Add Fleet model to be used in Quote model (#91)

* Make service cancellation type an enum (#92)

* Make service cancellation type an enum

* Retain other service cancellation type values.

* Bump kramdown from 2.3.0 to 2.3.1 (#93)

Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use the Keychain to store user credentials. (#94)

* Add fastlane update command (#95)

* Add fastlane update command

* Add fastlane update as a separate command

* Update Gemfile.lock

* [MOB-3216] Release 1.4.0 (#96)

* Bump version

* Update pod spec (Need this to be published)

* Bump nokogiri from 1.11.2 to 1.11.5 (#98)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.2 to 1.11.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.2...v1.11.5)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use date data type for dateBooked (#99)

* Bump version number to 1.5.0 (#100)

* [MOB-3438] login with credentials (#104)

* Make first small changes to auth service.

* Create auth credentials swift files and update authservice

* Init auth credentials interactor

* Credentials finally works as public

* Almost finished

* Swap credentials with authToken

* Finish interactor + rename token interactor

* Remove requestsender

* Test pass

* Release 1.5.1 (#106)

* versiob bump to 1_5_1-rc1

* updated version to 1_5_1

* changed readme (#108)

* MOB-3445 change AuthToken init access level from internal to public (#109)

* MOB-3488 Release 1.5.2 (develop) (#110)

* Release 1.5.2

* Update marketting project version

* MOB-3405 fix coding key for fleet capabilties (#112)

Co-authored-by: Anca Feurdean <[email protected]>

* fix refresh token call headers (#114)

* MOB-3528: Release 1.5.3 (develop) (#115)

* Release 1.5.3

* test circleci

* undo circleci test

* Add new error codes (#117)

* Add loyalty nonce to booking api (#118)

* Modify LoyaltyProgramme to be an Object vs an Array (#120)

* Mob xxxx circleci fix (#124)

* Update config.yml

* Update config.yml

* Revert

* Avoid deleting the SSH private key

* use separate commends

* use xlarge resource

* use cache for bundle

* update xcode version to 12.2.0

* a bit cleanup

* revert back to working version

* update bundler version

* use large resource

* use xlarge resource

* update xcode version, decrease resource_class to medium to fit our price plan

* revert Xcode to 12.0, revert resource_class to xlarge, and change bundler version to 2.2.7 - working UISDK config

* try solution proposed by Mikolaj

* going back to xcode 12.2 and large resource_class

* using medium resource_class

* update fastlane

* update fastlane take 2

* circleci sanity check

* test removing ssh key

* reverting last commit

* adjust bundler version

* test circleci

* update to xcode 13

* update fastlane

* remove fastline update, run bundle install before installing specific gem

* Use xcode 12.5.1

* Minor change

Co-authored-by: EdwardW2 <[email protected]>
Co-authored-by: Diana Petrea <[email protected]>

* [MOB-3633] Add Loyalty API (#119)

* Add endpoints

* LoyaltyStatus API Added

* Add LoyaltyPoints model

* Fix up the API endpoints

* LoyaltyStatus Interactor

* Edit APIEndpoint again

* Update LoyaltyService

* LoyaltyBurn interactor

* Loyaltyearn Interactor

* Update LoyaltyService

* PreAuth interactor

* Update service

* Add mocks

* Preauth mock

* Add tests

* Add remaining tests

* Update PreAuth interactor

* Remove Integration Tests (Not ready)

* Fix loyaltyservice for preauth

* Fix tests

* Make requested changes to LoyaltyPreAuth

* points to burnPoints

* Guard currency

* Fix broken test

* Add new status test to make sure request is setup correctly

* Fix loyaltyStatus?

* cicleci test commit

* test circleci commit

* Add errors

* Mob 3656 (#123)

* get and persist loyalty status after payment provider response

* minor change

* add get current status method to loyalty service

* refresh current loyalty status

* add unit tests

* Fix for paymemt provider model

* resolve PR comments

Co-authored-by: Mostafa Hadian <[email protected]>

Co-authored-by: Diana Petrea <[email protected]>
Co-authored-by: Mostafa Hadian <[email protected]>
Co-authored-by: dianakarh <[email protected]>

* Mob 3650 (#125)

* update loyalty nonce model

* fix unit test

* fix loyalty preauth interactor

* redo execute implementation in loyalty preauth interactor

* Mob 3785 (#126)

* add slug to KarhooError

* use slug, add new error type

* add new errot type

* bump version

Co-authored-by: EdwardW2 <[email protected]>
Co-authored-by: Jo Santa Maria <[email protected]>
Co-authored-by: Mostafa Hadian <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: cornelkar <[email protected]>
Co-authored-by: cosminBadulescu <[email protected]>
Co-authored-by: ancafeurdean09 <[email protected]>
Co-authored-by: Anca Feurdean <[email protected]>

* Mob 3893 post release 1 5 5 [MASTER] (#132)

* [MOB-2976] Quote model update for Polling (#80)

* Update quote models

* Update tests

* Update cart file (#81)

* Call follow endpoint for guest checkout booking fee retrieval (#83)

* [MOB-3176] Cancellation SLA to booking (#84)

* New models

* Update tripinfo object

* Update JSON

* Remove package.resolved file

* Update tests

* Ignore this (#85)

* {MOB-3181] Quotes cancellation SLA (#86)

* Update quote model

* Update tests

* MOB-3144 - Add decimal formatting to CancellationFeePrice (#87)

* Add decimal formatting to CancellationFeePrice

* Update to use global const

* Remove URL suffix (#88)

* Add BrowserInfo to Adyen DropIn Payload (#89)

* Bump nokogiri from 1.10.7 to 1.11.1 (#76)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.11.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.11.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* MOB-3205 Add SupplyPartnerID to the AdyenPayments request (#90)

* Add SupplyPartnerId field to the payments API

* Update tests and add supplyPartnerId

* Add Fleet model to be used in Quote model (#91)

* Make service cancellation type an enum (#92)

* Make service cancellation type an enum

* Retain other service cancellation type values.

* Bump kramdown from 2.3.0 to 2.3.1 (#93)

Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use the Keychain to store user credentials. (#94)

* Add fastlane update command (#95)

* Add fastlane update command

* Add fastlane update as a separate command

* Update Gemfile.lock

* [MOB-3216] Release 1.4.0 (#96)

* Bump version

* Update pod spec (Need this to be published)

* Bump nokogiri from 1.11.2 to 1.11.5 (#98)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.2 to 1.11.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.2...v1.11.5)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use date data type for dateBooked (#99)

* Bump version number to 1.5.0 (#100)

* [MOB-3438] login with credentials (#104)

* Make first small changes to auth service.

* Create auth credentials swift files and update authservice

* Init auth credentials interactor

* Credentials finally works as public

* Almost finished

* Swap credentials with authToken

* Finish interactor + rename token interactor

* Remove requestsender

* Test pass

* Release 1.5.1 (#106)

* versiob bump to 1_5_1-rc1

* updated version to 1_5_1

* changed readme (#108)

* MOB-3445 change AuthToken init access level from internal to public (#109)

* MOB-3488 Release 1.5.2 (develop) (#110)

* Release 1.5.2

* Update marketting project version

* MOB-3405 fix coding key for fleet capabilties (#112)

Co-authored-by: Anca Feurdean <[email protected]>

* fix refresh token call headers (#114)

* MOB-3528: Release 1.5.3 (develop) (#115)

* Release 1.5.3

* test circleci

* undo circleci test

* Add new error codes (#117)

* Add loyalty nonce to booking api (#118)

* Modify LoyaltyProgramme to be an Object vs an Array (#120)

* Mob xxxx circleci fix (#124)

* Update config.yml

* Update config.yml

* Revert

* Avoid deleting the SSH private key

* use separate commends

* use xlarge resource

* use cache for bundle

* update xcode version to 12.2.0

* a bit cleanup

* revert back to working version

* update bundler version

* use large resource

* use xlarge resource

* update xcode version, decrease resource_class to medium to fit our price plan

* revert Xcode to 12.0, revert resource_class to xlarge, and change bundler version to 2.2.7 - working UISDK config

* try solution proposed by Mikolaj

* going back to xcode 12.2 and large resource_class

* using medium resource_class

* update fastlane

* update fastlane take 2

* circleci sanity check

* test removing ssh key

* reverting last commit

* adjust bundler version

* test circleci

* update to xcode 13

* update fastlane

* remove fastline update, run bundle install before installing specific gem

* Use xcode 12.5.1

* Minor change

Co-authored-by: EdwardW2 <[email protected]>
Co-authored-by: Diana Petrea <[email protected]>

* [MOB-3633] Add Loyalty API (#119)

* Add endpoints

* LoyaltyStatus API Added

* Add LoyaltyPoints model

* Fix up the API endpoints

* LoyaltyStatus Interactor

* Edit APIEndpoint again

* Update LoyaltyService

* LoyaltyBurn interactor

* Loyaltyearn Interactor

* Update LoyaltyService

* PreAuth interactor

* Update service

* Add mocks

* Preauth mock

* Add tests

* Add remaining tests

* Update PreAuth interactor

* Remove Integration Tests (Not ready)

* Fix loyaltyservice for preauth

* Fix tests

* Make requested changes to LoyaltyPreAuth

* points to burnPoints

* Guard currency

* Fix broken test

* Add new status test to make sure request is setup correctly

* Fix loyaltyStatus?

* cicleci test commit

* test circleci commit

* Add errors

* Mob 3656 (#123)

* get and persist loyalty status after payment provider response

* minor change

* add get current status method to loyalty service

* refresh current loyalty status

* add unit tests

* Fix for paymemt provider model

* resolve PR comments

Co-authored-by: Mostafa Hadian <[email protected]>

Co-authored-by: Diana Petrea <[email protected]>
Co-authored-by: Mostafa Hadian <[email protected]>
Co-authored-by: dianakarh <[email protected]>

* Mob 3650 (#125)

* update loyalty nonce model

* fix unit test

* fix loyalty preauth interactor

* redo execute implementation in loyalty preauth interactor

* Mob 3785 (#126)

* add slug to KarhooError

* use slug, add new error type

* add new errot type

* bump version (#127)

* MOB-3819 add shopper locale to adyen payment request (#129)

* add shopper locale to adyen payment request

* add minor tweak

* Feature/MOB-3883 add basic analytics events to track the conversion steps (#130)

* New event names added according to requirements in https://karhoo.atlassian.net/browse/MOB-3868

* cleanup

* cleanup

* Renaming

* bump version

Co-authored-by: EdwardW2 <[email protected]>
Co-authored-by: Jo Santa Maria <[email protected]>
Co-authored-by: Mostafa Hadian <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: cornelkar <[email protected]>
Co-authored-by: cosminBadulescu <[email protected]>
Co-authored-by: ancafeurdean09 <[email protected]>
Co-authored-by: Anca Feurdean <[email protected]>
Co-authored-by: Aleksander Wędrychowski <[email protected]>

* Feature/MOB-4020 update network sdk to support versioning of payment related calls (#136)

* Add `version` parameter to PaymentProvider model

* Payment API Version added to payments interactors and endpints

* force v68 api version for debug

* Payment version added to path if differs from v51

* version path component fix

* version string calculation improved

* Test v68 version

* update tests

* version bump 1.5.5 => 1.5.6

* Change version number

* MOB-4021 cherry pick

* version bump 1.6.0

* version bump in Podspec

Co-authored-by: EdwardW2 <[email protected]>
Co-authored-by: Jo Santa Maria <[email protected]>
Co-authored-by: Mostafa Hadian <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: cornelkar <[email protected]>
Co-authored-by: cosminBadulescu <[email protected]>
Co-authored-by: dianakarh <[email protected]>
Co-authored-by: ancafeurdean09 <[email protected]>
Co-authored-by: Anca Feurdean <[email protected]>
Co-authored-by: Aleksander Wędrychowski <[email protected]>
Co-authored-by: Aleksander Wędrychowski <[email protected]>

* MOB-4020 post release 1.6.1 [develop] (#144)

* [MOB-3216] Update master (#97)

* [MOB-2976] Quote model update for Polling (#80)

* Update quote models

* Update tests

* Update cart file (#81)

* Call follow endpoint for guest checkout booking fee retrieval (#83)

* [MOB-3176] Cancellation SLA to booking (#84)

* New models

* Update tripinfo object

* Update JSON

* Remove package.resolved file

* Update tests

* Ignore this (#85)

* {MOB-3181] Quotes cancellation SLA (#86)

* Update quote model

* Update tests

* MOB-3144 - Add decimal formatting to CancellationFeePrice (#87)

* Add decimal formatting to CancellationFeePrice

* Update to use global const

* Remove URL suffix (#88)

* Add BrowserInfo to Adyen DropIn Payload (#89)

* Bump nokogiri from 1.10.7 to 1.11.1 (#76)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.11.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.11.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* MOB-3205 Add SupplyPartnerID to the AdyenPayments request (#90)

* Add SupplyPartnerId field to the payments API

* Update tests and add supplyPartnerId

* Add Fleet model to be used in Quote model (#91)

* Make service cancellation type an enum (#92)

* Make service cancellation type an enum

* Retain other service cancellation type values.

* Bump kramdown from 2.3.0 to 2.3.1 (#93)

Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use the Keychain to store user credentials. (#94)

* Add fastlane update command (#95)

* Add fastlane update command

* Add fastlane update as a separate command

* Update Gemfile.lock

* [MOB-3216] Release 1.4.0 (#96)

* Bump version

* Update pod spec (Need this to be published)

Co-authored-by: Jo Santa Maria <[email protected]>
Co-authored-by: Mostafa Hadian <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: cornelkar <[email protected]>

* MOB-3387 Final release 1.5.0 (#102)

* [MOB-2976] Quote model update for Polling (#80)

* Update quote models

* Update tests

* Update cart file (#81)

* Call follow endpoint for guest checkout booking fee retrieval (#83)

* [MOB-3176] Cancellation SLA to booking (#84)

* New models

* Update tripinfo object

* Update JSON

* Remove package.resolved file

* Update tests

* Ignore this (#85)

* {MOB-3181] Quotes cancellation SLA (#86)

* Update quote model

* Update tests

* MOB-3144 - Add decimal formatting to CancellationFeePrice (#87)

* Add decimal formatting to CancellationFeePrice

* Update to use global const

* Remove URL suffix (#88)

* Add BrowserInfo to Adyen DropIn Payload (#89)

* Bump nokogiri from 1.10.7 to 1.11.1 (#76)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.11.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.11.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* MOB-3205 Add SupplyPartnerID to the AdyenPayments request (#90)

* Add SupplyPartnerId field to the payments API

* Update tests and add supplyPartnerId

* Add Fleet model to be used in Quote model (#91)

* Make service cancellation type an enum (#92)

* Make service cancellation type an enum

* Retain other service cancellation type values.

* Bump kramdown from 2.3.0 to 2.3.1 (#93)

Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use the Keychain to store user credentials. (#94)

* Add fastlane update command (#95)

* Add fastlane update command

* Add fastlane update as a separate command

* Update Gemfile.lock

* [MOB-3216] Release 1.4.0 (#96)

* Bump version

* Update pod spec (Need this to be published)

* Bump nokogiri from 1.11.2 to 1.11.5 (#98)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.2 to 1.11.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.2...v1.11.5)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use date data type for dateBooked (#99)

* Bump version number to 1.5.0

Co-authored-by: EdwardW2 <[email protected]>
Co-authored-by: Jo Santa Maria <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: cornelkar <[email protected]>

* Post release 1 5 1 (#107)

* [MOB-2976] Quote model update for Polling (#80)

* Update quote models

* Update tests

* Update cart file (#81)

* Call follow endpoint for guest checkout booking fee retrieval (#83)

* [MOB-3176] Cancellation SLA to booking (#84)

* New models

* Update tripinfo object

* Update JSON

* Remove package.resolved file

* Update tests

* Ignore this (#85)

* {MOB-3181] Quotes cancellation SLA (#86)

* Update quote model

* Update tests

* MOB-3144 - Add decimal formatting to CancellationFeePrice (#87)

* Add decimal formatting to CancellationFeePrice

* Update to use global const

* Remove URL suffix (#88)

* Add BrowserInfo to Adyen DropIn Payload (#89)

* Bump nokogiri from 1.10.7 to 1.11.1 (#76)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.11.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.11.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* MOB-3205 Add SupplyPartnerID to the AdyenPayments request (#90)

* Add SupplyPartnerId field to the payments API

* Update tests and add supplyPartnerId

* Add Fleet model to be used in Quote model (#91)

* Make service cancellation type an enum (#92)

* Make service cancellation type an enum

* Retain other service cancellation type values.

* Bump kramdown from 2.3.0 to 2.3.1 (#93)

Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use the Keychain to store user credentials. (#94)

* Add fastlane update command (#95)

* Add fastlane update command

* Add fastlane update as a separate command

* Update Gemfile.lock

* [MOB-3216] Release 1.4.0 (#96)

* Bump version

* Update pod spec (Need this to be published)

* Bump nokogiri from 1.11.2 to 1.11.5 (#98)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.2 to 1.11.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.2...v1.11.5)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use date data type for dateBooked (#99)

* Bump version number to 1.5.0 (#100)

* [MOB-3438] login with credentials (#104)

* Make first small changes to auth service.

* Create auth credentials swift files and update authservice

* Init auth credentials interactor

* Credentials finally works as public

* Almost finished

* Swap credentials with authToken

* Finish interactor + rename token interactor

* Remove requestsender

* Test pass

* versiob bump to 1_5_1-rc1

* updated version to 1_5_1

Co-authored-by: EdwardW2 <[email protected]>
Co-authored-by: Jo Santa Maria <[email protected]>
Co-authored-by: Mostafa Hadian <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: cornelkar <[email protected]>

* MOB-3488 Post release 1.5.2 (master) (#111)

* [MOB-2976] Quote model update for Polling (#80)

* Update quote models

* Update tests

* Update cart file (#81)

* Call follow endpoint for guest checkout booking fee retrieval (#83)

* [MOB-3176] Cancellation SLA to booking (#84)

* New models

* Update tripinfo object

* Update JSON

* Remove package.resolved file

* Update tests

* Ignore this (#85)

* {MOB-3181] Quotes cancellation SLA (#86)

* Update quote model

* Update tests

* MOB-3144 - Add decimal formatting to CancellationFeePrice (#87)

* Add decimal formatting to CancellationFeePrice

* Update to use global const

* Remove URL suffix (#88)

* Add BrowserInfo to Adyen DropIn Payload (#89)

* Bump nokogiri from 1.10.7 to 1.11.1 (#76)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.11.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.11.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* MOB-3205 Add SupplyPartnerID to the AdyenPayments request (#90)

* Add SupplyPartnerId field to the payments API

* Update tests and add supplyPartnerId

* Add Fleet model to be used in Quote model (#91)

* Make service cancellation type an enum (#92)

* Make service cancellation type an enum

* Retain other service cancellation type values.

* Bump kramdown from 2.3.0 to 2.3.1 (#93)

Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use the Keychain to store user credentials. (#94)

* Add fastlane update command (#95)

* Add fastlane update command

* Add fastlane update as a separate command

* Update Gemfile.lock

* [MOB-3216] Release 1.4.0 (#96)

* Bump version

* Update pod spec (Need this to be published)

* Bump nokogiri from 1.11.2 to 1.11.5 (#98)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.2 to 1.11.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.2...v1.11.5)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use date data type for dateBooked (#99)

* Bump version number to 1.5.0 (#100)

* [MOB-3438] login with credentials (#104)

* Make first small changes to auth service.

* Create auth credentials swift files and update authservice

* Init auth credentials interactor

* Credentials finally works as public

* Almost finished

* Swap credentials with authToken

* Finish interactor + rename token interactor

* Remove requestsender

* Test pass

* Release 1.5.1 (#106)

* versiob bump to 1_5_1-rc1

* updated version to 1_5_1

* changed readme (#108)

* MOB-3445 change AuthToken init access level from internal to public (#109)

* Release 1.5.2

* Update marketting project version

Co-authored-by: EdwardW2 <[email protected]>
Co-authored-by: Jo Santa Maria <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: cornelkar <[email protected]>
Co-authored-by: cosminBadulescu <[email protected]>
Co-authored-by: dianakarh <[email protected]>

* MOB-3528: Post Release 1.5.3 (master) (#116)

* [MOB-2976] Quote model update for Polling (#80)

* Update quote models

* Update tests

* Update cart file (#81)

* Call follow endpoint for guest checkout booking fee retrieval (#83)

* [MOB-3176] Cancellation SLA to booking (#84)

* New models

* Update tripinfo object

* Update JSON

* Remove package.resolved file

* Update tests

* Ignore this (#85)

* {MOB-3181] Quotes cancellation SLA (#86)

* Update quote model

* Update tests

* MOB-3144 - Add decimal formatting to CancellationFeePrice (#87)

* Add decimal formatting to CancellationFeePrice

* Update to use global const

* Remove URL suffix (#88)

* Add BrowserInfo to Adyen DropIn Payload (#89)

* Bump nokogiri from 1.10.7 to 1.11.1 (#76)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.11.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.11.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* MOB-3205 Add SupplyPartnerID to the AdyenPayments request (#90)

* Add SupplyPartnerId field to the payments API

* Update tests and add supplyPartnerId

* Add Fleet model to be used in Quote model (#91)

* Make service cancellation type an enum (#92)

* Make service cancellation type an enum

* Retain other service cancellation type values.

* Bump kramdown from 2.3.0 to 2.3.1 (#93)

Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use the Keychain to store user credentials. (#94)

* Add fastlane update command (#95)

* Add fastlane update command

* Add fastlane update as a separate command

* Update Gemfile.lock

* [MOB-3216] Release 1.4.0 (#96)

* Bump version

* Update pod spec (Need this to be published)

* Bump nokogiri from 1.11.2 to 1.11.5 (#98)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.2 to 1.11.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.2...v1.11.5)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use date data type for dateBooked (#99)

* Bump version number to 1.5.0 (#100)

* [MOB-3438] login with credentials (#104)

* Make first small changes to auth service.

* Create auth credentials swift files and update authservice

* Init auth credentials interactor

* Credentials finally works as public

* Almost finished

* Swap credentials with authToken

* Finish interactor + rename token interactor

* Remove requestsender

* Test pass

* Release 1.5.1 (#106)

* versiob bump to 1_5_1-rc1

* updated version to 1_5_1

* changed readme (#108)

* MOB-3445 change AuthToken init access level from internal to public (#109)

* MOB-3488 Release 1.5.2 (develop) (#110)

* Release 1.5.2

* Update marketting project version

* MOB-3405 fix coding key for fleet capabilties (#112)

Co-authored-by: Anca Feurdean <[email protected]>

* fix refresh token call headers (#114)

* Release 1.5.3

* test circleci fix

* undo circleci test

Co-authored-by: EdwardW2 <[email protected]>
Co-authored-by: Jo Santa Maria <[email protected]>
Co-authored-by: Mostafa Hadian <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: cornelkar <[email protected]>
Co-authored-by: cosminBadulescu <[email protected]>
Co-authored-by: ancafeurdean09 <[email protected]>

* Mob-3749_post_release_1_5_4 (#128)

* [MOB-2976] Quote model update for Polling (#80)

* Update quote models

* Update tests

* Update cart file (#81)

* Call follow endpoint for guest checkout booking fee retrieval (#83)

* [MOB-3176] Cancellation SLA to booking (#84)

* New models

* Update tripinfo object

* Update JSON

* Remove package.resolved file

* Update tests

* Ignore this (#85)

* {MOB-3181] Quotes cancellation SLA (#86)

* Update quote model

* Update tests

* MOB-3144 - Add decimal formatting to CancellationFeePrice (#87)

* Add decimal formatting to CancellationFeePrice

* Update to use global const

* Remove URL suffix (#88)

* Add BrowserInfo to Adyen DropIn Payload (#89)

* Bump nokogiri from 1.10.7 to 1.11.1 (#76)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.11.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.11.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* MOB-3205 Add SupplyPartnerID to the AdyenPayments request (#90)

* Add SupplyPartnerId field to the payments API

* Update tests and add supplyPartnerId

* Add Fleet model to be used in Quote model (#91)

* Make service cancellation type an enum (#92)

* Make service cancellation type an enum

* Retain other service cancellation type values.

* Bump kramdown from 2.3.0 to 2.3.1 (#93)

Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use the Keychain to store user credentials. (#94)

* Add fastlane update command (#95)

* Add fastlane update command

* Add fastlane update as a separate command

* Update Gemfile.lock

* [MOB-3216] Release 1.4.0 (#96)

* Bump version

* Update pod spec (Need this to be published)

* Bump nokogiri from 1.11.2 to 1.11.5 (#98)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.2 to 1.11.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.2...v1.11.5)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use date data type for dateBooked (#99)

* Bump version number to 1.5.0 (#100)

* [MOB-3438] login with credentials (#104)

* Make first small changes to auth service.

* Create auth credentials swift files and update authservice

* Init auth credentials interactor

* Credentials finally works as public

* Almost finished

* Swap credentials with authToken

* Finish interactor + rename token interactor

* Remove requestsender

* Test pass

* Release 1.5.1 (#106)

* versiob bump to 1_5_1-rc1

* updated version to 1_5_1

* changed readme (#108)

* MOB-3445 change AuthToken init access level from internal to public (#109)

* MOB-3488 Release 1.5.2 (develop) (#110)

* Release 1.5.2

* Update marketting project version

* MOB-3405 fix coding key for fleet capabilties (#112)

Co-authored-by: Anca Feurdean <[email protected]>

* fix refresh token call headers (#114)

* MOB-3528: Release 1.5.3 (develop) (#115)

* Release 1.5.3

* test circleci

* undo circleci test

* Add new error codes (#117)

* Add loyalty nonce to booking api (#118)

* Modify LoyaltyProgramme to be an Object vs an Array (#120)

* Mob xxxx circleci fix (#124)

* Update config.yml

* Update config.yml

* Revert

* Avoid deleting the SSH private key

* use separate commends

* use xlarge resource

* use cache for bundle

* update xcode version to 12.2.0

* a bit cleanup

* revert back to working version

* update bundler version

* use large resource

* use xlarge resource

* update xcode version, decrease resour…
  • Loading branch information
13 people authored Aug 10, 2022
1 parent e8e4bbd commit f7f6c65
Show file tree
Hide file tree
Showing 27 changed files with 414 additions and 208 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ fastlane/.env
# access keys
Client/Keys.swift
Package.resolved
.idea
2 changes: 1 addition & 1 deletion KarhooSDK.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "KarhooSDK"
s.version = "1.6.2"
s.version = "1.6.3"
s.summary = "Karhoo Network SDK"
s.homepage = "https://developer.karhoo.com/docs/build-apps-using-sdks"
s.license = 'BSD 2-Clause'
Expand Down
42 changes: 37 additions & 5 deletions KarhooSDK.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,9 @@
43F939A41F3C85A300914E18 /* KarhooEnvironmentDetails.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F9399B1F3C85A300914E18 /* KarhooEnvironmentDetails.swift */; };
43F939A51F3C85A300914E18 /* URLSessionSender.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F9399C1F3C85A300914E18 /* URLSessionSender.swift */; };
43F939B61F3CD33200914E18 /* JsonHttpRequestBuilderSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F939B11F3CD33200914E18 /* JsonHttpRequestBuilderSpec.swift */; };
517C6CCF2886BF3C00EA164C /* VehicleImageRules.swift in Sources */ = {isa = PBXBuildFile; fileRef = 517C6CCE2886BF3C00EA164C /* VehicleImageRules.swift */; };
517C6CD12886BF7500EA164C /* KarhooVehicleRulesInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 517C6CD02886BF7500EA164C /* KarhooVehicleRulesInteractor.swift */; };
517C6CD32886BF9100EA164C /* VehicleRulesInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 517C6CD22886BF9100EA164C /* VehicleRulesInteractor.swift */; };
51C3FCD727FE137200273BA2 /* AdyenAPIVersionProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51C3FCD627FE137200273BA2 /* AdyenAPIVersionProvider.swift */; };
51C3FCD927FE194C00273BA2 /* KarhooAdyenAPIVersionProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51C3FCD827FE194C00273BA2 /* KarhooAdyenAPIVersionProvider.swift */; };
5C076FFF20F23B5F00A35537 /* CategoryQuoteMapperSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C076FFE20F23B5F00A35537 /* CategoryQuoteMapperSpec.swift */; };
Expand Down Expand Up @@ -440,6 +443,9 @@
6FED7B9225794AAC00E95C27 /* CancellationFee.json in Resources */ = {isa = PBXBuildFile; fileRef = 6FED7B9125794AAC00E95C27 /* CancellationFee.json */; };
6FED7B9C25794D8A00E95C27 /* CancellationFeeFalse.json in Resources */ = {isa = PBXBuildFile; fileRef = 6FED7B9B25794D8A00E95C27 /* CancellationFeeFalse.json */; };
6FED7C42257E741000E95C27 /* Luggage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6FED7C41257E741000E95C27 /* Luggage.swift */; };
7B28E006288688D400F6FDAE /* KarhooPaymentProviderUpdateHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B28E005288688D400F6FDAE /* KarhooPaymentProviderUpdateHandler.swift */; };
7B28E008288688E300F6FDAE /* PaymentProviderUpdateHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B28E007288688E300F6FDAE /* PaymentProviderUpdateHandler.swift */; };
7B28E00A2886891300F6FDAE /* Keys.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B28E0092886891300F6FDAE /* Keys.swift */; };
A10F03D6260CA199005743F4 /* ServiceCancellationType.swift in Sources */ = {isa = PBXBuildFile; fileRef = A10F03D5260CA199005743F4 /* ServiceCancellationType.swift */; };
A1F3C05A261B7C44003CE2CD /* MockSecretStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1F3C059261B7C44003CE2CD /* MockSecretStore.swift */; };
A1F3C070261B83AC003CE2CD /* CredentialsStoreKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1F3C06F261B83AC003CE2CD /* CredentialsStoreKeys.swift */; };
Expand Down Expand Up @@ -877,6 +883,9 @@
43F9399C1F3C85A300914E18 /* URLSessionSender.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLSessionSender.swift; sourceTree = "<group>"; };
43F939B01F3CD33200914E18 /* JsonHttpClientSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JsonHttpClientSpec.swift; sourceTree = "<group>"; };
43F939B11F3CD33200914E18 /* JsonHttpRequestBuilderSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JsonHttpRequestBuilderSpec.swift; sourceTree = "<group>"; };
517C6CCE2886BF3C00EA164C /* VehicleImageRules.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VehicleImageRules.swift; sourceTree = "<group>"; };
517C6CD02886BF7500EA164C /* KarhooVehicleRulesInteractor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KarhooVehicleRulesInteractor.swift; sourceTree = "<group>"; };
517C6CD22886BF9100EA164C /* VehicleRulesInteractor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VehicleRulesInteractor.swift; sourceTree = "<group>"; };
51C3FCD627FE137200273BA2 /* AdyenAPIVersionProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdyenAPIVersionProvider.swift; sourceTree = "<group>"; };
51C3FCD827FE194C00273BA2 /* KarhooAdyenAPIVersionProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KarhooAdyenAPIVersionProvider.swift; sourceTree = "<group>"; };
5C076FFE20F23B5F00A35537 /* CategoryQuoteMapperSpec.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CategoryQuoteMapperSpec.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -994,6 +1003,9 @@
6FED7B9125794AAC00E95C27 /* CancellationFee.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = CancellationFee.json; sourceTree = "<group>"; };
6FED7B9B25794D8A00E95C27 /* CancellationFeeFalse.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = CancellationFeeFalse.json; sourceTree = "<group>"; };
6FED7C41257E741000E95C27 /* Luggage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Luggage.swift; sourceTree = "<group>"; };
7B28E005288688D400F6FDAE /* KarhooPaymentProviderUpdateHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = KarhooPaymentProviderUpdateHandler.swift; path = KarhooSDK/Service/User/KarhooPaymentProviderUpdateHandler.swift; sourceTree = SOURCE_ROOT; };
7B28E007288688E300F6FDAE /* PaymentProviderUpdateHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PaymentProviderUpdateHandler.swift; path = KarhooSDK/Service/User/PaymentProviderUpdateHandler.swift; sourceTree = SOURCE_ROOT; };
7B28E0092886891300F6FDAE /* Keys.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Keys.swift; sourceTree = "<group>"; };
A10F03D5260CA199005743F4 /* ServiceCancellationType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServiceCancellationType.swift; sourceTree = "<group>"; };
A1F3C059261B7C44003CE2CD /* MockSecretStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockSecretStore.swift; sourceTree = "<group>"; };
A1F3C06F261B83AC003CE2CD /* CredentialsStoreKeys.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CredentialsStoreKeys.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1415,6 +1427,8 @@
6F69F34A255A7FFD00F8DA05 /* KarhooQuoteCoverageInteractor.swift */,
6F9A9E4325641B0C00B50753 /* VerifyQuoteInteractor.swift */,
6F9A9E4925641BE400B50753 /* KarhooVerifyQuoteInteractor.swift */,
517C6CD22886BF9100EA164C /* VehicleRulesInteractor.swift */,
517C6CD02886BF7500EA164C /* KarhooVehicleRulesInteractor.swift */,
);
path = Interactor;
sourceTree = "<group>";
Expand Down Expand Up @@ -1460,6 +1474,7 @@
09A9B2982405901B00823FB0 /* LaunchScreen.storyboard */,
09A9B29B2405901B00823FB0 /* Info.plist */,
5D480EA12F7236874F815CF5 /* Keys.swift */,
7B28E0092886891300F6FDAE /* Keys.swift */,
);
path = Client;
sourceTree = "<group>";
Expand Down Expand Up @@ -1568,6 +1583,7 @@
095A03C12333AF98007D805E /* UIConfig.swift */,
27421AB287B1A33F00AC4119 /* UserInfo.swift */,
313DC2DC20221D0100D9DD1B /* Vehicle.swift */,
517C6CCE2886BF3C00EA164C /* VehicleImageRules.swift */,
5CDD26D324BF4EA900436F01 /* VehicleAvailability.swift */,
23163622274274330082EE9B /* LoyaltyStatus.swift */,
23163624274276E40082EE9B /* LoyaltyPoints.swift */,
Expand Down Expand Up @@ -2499,6 +2515,7 @@
43850F401ECB0056009CB8FD /* User */ = {
isa = PBXGroup;
children = (
7B28E004288688B600F6FDAE /* PaymentProviderUpdater */,
2359B45C2342522E008433A1 /* UpdateUserDetailsInteractor */,
43850F3E1ECB003E009CB8FD /* UserService.swift */,
43850F431ECB0056009CB8FD /* KarhooUserService.swift */,
Expand Down Expand Up @@ -2977,6 +2994,15 @@
path = CancallationFee;
sourceTree = "<group>";
};
7B28E004288688B600F6FDAE /* PaymentProviderUpdater */ = {
isa = PBXGroup;
children = (
7B28E007288688E300F6FDAE /* PaymentProviderUpdateHandler.swift */,
7B28E005288688D400F6FDAE /* KarhooPaymentProviderUpdateHandler.swift */,
);
path = PaymentProviderUpdater;
sourceTree = "<group>";
};
BAA0A09FEA1B89384EFDA915 /* TripUpdate */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -3357,9 +3383,9 @@
isa = PBXNativeTarget;
buildConfigurationList = 4387A6551E3BAF6D0024FD55 /* Build configuration list for PBXNativeTarget "KarhooSDK" */;
buildPhases = (
4387A63E1E3BAF6D0024FD55 /* Headers */,
4387A63C1E3BAF6D0024FD55 /* Sources */,
4387A63D1E3BAF6D0024FD55 /* Frameworks */,
4387A63E1E3BAF6D0024FD55 /* Headers */,
4387A63F1E3BAF6D0024FD55 /* Resources */,
);
buildRules = (
Expand Down Expand Up @@ -3536,6 +3562,7 @@
buildActionMask = 2147483647;
files = (
09A9B2922405901900823FB0 /* ViewController.swift in Sources */,
7B28E00A2886891300F6FDAE /* Keys.swift in Sources */,
40FBF609240FBB2E007F6A54 /* AuthRequestsTesterViewController.swift in Sources */,
09A9B28E2405901900823FB0 /* AppDelegate.swift in Sources */,
09A9B2902405901900823FB0 /* SceneDelegate.swift in Sources */,
Expand Down Expand Up @@ -3629,6 +3656,7 @@
6FA6200024F5536C00C1DF48 /* AdyenPayments.swift in Sources */,
09811A1820D7BB8C001DB06F /* CancelTripRequestPayload.swift in Sources */,
43850F4C1ECB0056009CB8FD /* KarhooUserService.swift in Sources */,
517C6CD12886BF7500EA164C /* KarhooVehicleRulesInteractor.swift in Sources */,
5C2856D220E3B127009B9464 /* ReverseGeocodeInteractor.swift in Sources */,
095A03C02333AF64007D805E /* KarhooUIConfigInteractor.swift in Sources */,
090E8226235DAD5900B447A2 /* KarhooEnvironment.swift in Sources */,
Expand Down Expand Up @@ -3723,6 +3751,7 @@
43D395CA1ECF9F5B00499E8F /* KarhooPaymentService.swift in Sources */,
FC8EB5C9216507B7009DC8DE /* TripQuote.swift in Sources */,
317610EC1FD84B1E00D2DB75 /* KarhooNetworkDateFormatter.swift in Sources */,
7B28E008288688E300F6FDAE /* PaymentProviderUpdateHandler.swift in Sources */,
FCBD67B7211C9D7E005AA332 /* RegisterInteractor.swift in Sources */,
142CB38B24DC290A0065149C /* LoyaltyProgramme.swift in Sources */,
5C224EAF223DCA9900C1CFCE /* AddPaymentDetailsInteractor.swift in Sources */,
Expand Down Expand Up @@ -3760,6 +3789,7 @@
5C813E67250FB40A0060A9A9 /* AdyenPaymentMethodsRequest.swift in Sources */,
2316363D274666CF0082EE9B /* KarhooLoyaltyPreAuthInteractor.swift in Sources */,
23163636274574EC0082EE9B /* LoyaltyEarnInteractor.swift in Sources */,
517C6CCF2886BF3C00EA164C /* VehicleImageRules.swift in Sources */,
5C49849024C0A89F00F646A4 /* QuoteVehicle.swift in Sources */,
6FED7B4D2577D0C200E95C27 /* KarhooCancellationFeeInteractor.swift in Sources */,
09A56DFC20922D5C00891F02 /* MeetingPointType.swift in Sources */,
Expand Down Expand Up @@ -3801,6 +3831,7 @@
147B889F24E3F537003F78B8 /* KarhooAdyenPaymentMethodsInteractor.swift in Sources */,
095A03D02333BABD007D805E /* KarhooUIConfigProvider.swift in Sources */,
BAA0A9B82B56E7732880DF88 /* PositionExt.swift in Sources */,
517C6CD32886BF9100EA164C /* VehicleRulesInteractor.swift in Sources */,
23163634274573910082EE9B /* KarhooLoyaltyBurnInteractor.swift in Sources */,
BAA0A0D9B4689C44C4517E85 /* Places.swift in Sources */,
BAA0A33C16B003E2D9F99AB3 /* PoiType.swift in Sources */,
Expand All @@ -3810,6 +3841,7 @@
BAA0A52F9D9380CE153EA7C6 /* PaymentSDKToken.swift in Sources */,
FC2EE934212425F6001B36D2 /* SDKErrorFactory.swift in Sources */,
09D0757520D826A700F75E32 /* KarhooLogoutInteractor.swift in Sources */,
7B28E006288688D400F6FDAE /* KarhooPaymentProviderUpdateHandler.swift in Sources */,
23163625274276E40082EE9B /* LoyaltyPoints.swift in Sources */,
FC1B01ED2209D0D20069D7F3 /* QuoteCategory.swift in Sources */,
FC321EE020F8D54E00B2C3CD /* DriverTrackingService.swift in Sources */,
Expand Down Expand Up @@ -4314,7 +4346,7 @@
CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 28;
CURRENT_PROJECT_VERSION = 29;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = U7U4Q7YGDH;
DYLIB_COMPATIBILITY_VERSION = 1;
Expand All @@ -4338,7 +4370,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.6.2;
MARKETING_VERSION = 1.6.3;
MODULEMAP_PRIVATE_FILE = "";
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.karhoo.KarhooSDK;
Expand All @@ -4359,7 +4391,7 @@
CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 28;
CURRENT_PROJECT_VERSION = 29;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = U7U4Q7YGDH;
DYLIB_COMPATIBILITY_VERSION = 1;
Expand All @@ -4383,7 +4415,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.6.2;
MARKETING_VERSION = 1.6.3;
MODULEMAP_PRIVATE_FILE = "";
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.karhoo.KarhooSDK;
Expand Down

This file was deleted.

51 changes: 51 additions & 0 deletions KarhooSDK/Api/Response/VehicleImageRules.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
//
// VehicleRules.swift
// KarhooSDK
//
// Created by Aleksander Wedrychowski on 19/07/2022.
// Copyright © 2022 Flit Technologies Ltd. All rights reserved.
//

import Foundation

public struct VehicleImageRules: Codable, KarhooCodableModel {
public let rules: [VehicleImageRule]

enum CodingKeys: String, CodingKey {
case rules = "mappings"
}
}

public struct VehicleImageRule: Codable {

private static let fallbackRuleValue = "*"

public enum RuleType {
/// Rule that should be used when the vehicle type and tags match perfectly the ones in the quote.
case specific
/// Default rule for a given vehicle type. If the quote does not contain vehicle tags, then this rule should be used.
case typeDefault
/// Rule that is general fallback if any other rule doesn't mach given vehicle.
case fallback
}
public let type: String
public let tags: [String]
public let imagePath: String

/// How a rule should be treated by front ent system.
public var ruleType: RuleType {
if type == VehicleImageRule.fallbackRuleValue {
return .fallback
} else if tags.isEmpty == true {
return .typeDefault
} else {
return .specific
}
}

enum CodingKeys: String, CodingKey {
case type
case tags
case imagePath = "image_png"
}
}
36 changes: 30 additions & 6 deletions KarhooSDK/Api/Util/Result.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,33 @@
import Foundation

public enum Result<T> {
case success(result: T)
case failure(error: KarhooError?)
case success(result: T, correlationId: String? = nil)
case failure(error: KarhooError?, correlationId: String? = nil)

@available(*, deprecated, message: "errorValue() is deprecated and will be removed in next SDK version. getErrorValue() should be used instead")
public func errorValue() -> KarhooError? {
getErrorValue()
}

public func getErrorValue() -> KarhooError? {
switch self {
case .failure(let error):
case .failure(let error, _):
return error

default:
return nil
}
}

@available(*, deprecated, message: "successValue() is deprecated and will be removed in next SDK version. getSuccessValue() should be used instead")
public func successValue() -> T? {
getSuccessValue()
}

public func getSuccessValue() -> T? {
switch self {
case .success(let result):
return result
return result.result

default:
return nil
Expand All @@ -41,13 +51,27 @@ public enum Result<T> {
return false
}
}

public func getCorrelationId() -> String? {
switch self {
case .success(let result):
return result.correlationId
case .failure(let error):
return error.correlationId
}
}

@available(*, deprecated, message: "successValue(orErrorCallback:) is deprecated and will be removed in next SDK version. getSuccessValue(orErrorCallback:) should be used instead")
public func successValue<E>(orErrorCallback: CallbackClosure<E>) -> T? {
getSuccessValue(orErrorCallback: orErrorCallback)
}

public func getSuccessValue<E>(orErrorCallback: CallbackClosure<E>) -> T? {
switch self {
case .success(let result):
return result
return result.result
case .failure(let error):
orErrorCallback(.failure(error: error))
orErrorCallback(.failure(error: error.error))
return nil
}
}
Expand Down
5 changes: 5 additions & 0 deletions KarhooSDK/Network/APIEndpoint.swift
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ enum APIEndpoint {
case adyenPublicKey
case adyenClientKey
case quoteCoverage
case vehicleImageRules
case verifyQuote(quoteID: String)
case loyaltyStatus(identifier: String)
case loyaltyBurn(identifier: String, currency: String, amount: Int)
Expand Down Expand Up @@ -141,6 +142,8 @@ enum APIEndpoint {
return "/payments/adyen/client-key"
case .quoteCoverage:
return "/quotes/coverage"
case .vehicleImageRules:
return "https://cdn.karhoo.com/s/images/vehicles/config.json"
case .verifyQuote(let quoteID):
return "/quotes/verify/\(quoteID)"
case .loyaltyStatus(let identifier):
Expand Down Expand Up @@ -198,6 +201,7 @@ enum APIEndpoint {
case .adyenPublicKey: return .get
case .adyenClientKey: return .get
case .quoteCoverage: return .get
case .vehicleImageRules: return .get
case .verifyQuote: return .get
case .loyaltyStatus: return .get
case .loyaltyBurn: return .get
Expand All @@ -222,6 +226,7 @@ enum APIEndpoint {
case .adyenPublicKey: return "v3"
case .adyenClientKey: return "v3"
case .quoteCoverage: return "v2"
case .vehicleImageRules: return ""
case .verifyQuote: return "v2"
case .loyaltyBalance: return "v3"
case .loyaltyConversion: return "v3"
Expand Down
Loading

0 comments on commit f7f6c65

Please sign in to comment.