Skip to content

Commit 3ba4442

Browse files
committed
Merge remote-tracking branch 'origin/6' into next
2 parents c1f7b56 + 272ab0d commit 3ba4442

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+4447
-210
lines changed

.openapi-generator/FILES

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ docs/Model/AddProductAttachmentDetails.md
100100
docs/Model/AddProductAttachmentDetailsAllOf.md
101101
docs/Model/AddProductFollowerRequest.md
102102
docs/Model/AddProductRequestBody.md
103+
docs/Model/AddProductRequestBodyAllOf.md
103104
docs/Model/AddProjectResponse201.md
104105
docs/Model/AddRole.md
105106
docs/Model/AddRoleAssignmentRequest.md
@@ -163,10 +164,13 @@ docs/Model/BaseUserMeAllOfLanguage.md
163164
docs/Model/BaseWebhook.md
164165
docs/Model/BasicDeal.md
165166
docs/Model/BasicDealProduct.md
167+
docs/Model/BasicDealProductAllOf.md
166168
docs/Model/BasicGoal.md
167169
docs/Model/BasicOrganization.md
168170
docs/Model/BasicPerson.md
169171
docs/Model/BasicPersonEmail.md
172+
docs/Model/BillingFrequency.md
173+
docs/Model/BillingFrequency1.md
170174
docs/Model/BulkDeleteResponse.md
171175
docs/Model/BulkDeleteResponseAllOf.md
172176
docs/Model/BulkDeleteResponseAllOfData.md
@@ -220,6 +224,7 @@ docs/Model/DealPersonDataEmail.md
220224
docs/Model/DealPersonDataPhone.md
221225
docs/Model/DealPersonDataWithId.md
222226
docs/Model/DealPersonDataWithIdAllOf.md
227+
docs/Model/DealProductRequestBody.md
223228
docs/Model/DealProductUnitDuration.md
224229
docs/Model/DealSearchItem.md
225230
docs/Model/DealSearchItemItem.md
@@ -535,9 +540,13 @@ docs/Model/MergePersonsResponse.md
535540
docs/Model/MergePersonsResponseAllOf.md
536541
docs/Model/MessageObject.md
537542
docs/Model/MessageObjectAttachments.md
543+
docs/Model/NameObject.md
538544
docs/Model/NewDeal.md
539545
docs/Model/NewDealParameters.md
540546
docs/Model/NewDealProduct.md
547+
docs/Model/NewDealProductAllOf.md
548+
docs/Model/NewDealProductAllOf1.md
549+
docs/Model/NewDealProductAllOf2.md
541550
docs/Model/NewFollowerResponse.md
542551
docs/Model/NewFollowerResponseData.md
543552
docs/Model/NewGoal.md
@@ -558,9 +567,7 @@ docs/Model/NoteParams.md
558567
docs/Model/NumberBoolean.md
559568
docs/Model/NumberBooleanDefault0.md
560569
docs/Model/NumberBooleanDefault1.md
561-
docs/Model/ObjectPrices.md
562570
docs/Model/OneLeadResponse200.md
563-
docs/Model/OptionalNameObject.md
564571
docs/Model/OrgAndOwnerId.md
565572
docs/Model/OrganizationAddressInfo.md
566573
docs/Model/OrganizationCountAndAddressInfo.md
@@ -691,7 +698,6 @@ docs/Model/ProductSearchResponse.md
691698
docs/Model/ProductSearchResponseAllOf.md
692699
docs/Model/ProductSearchResponseAllOfData.md
693700
docs/Model/ProductWithArrayPrices.md
694-
docs/Model/ProductWithObjectPrices.md
695701
docs/Model/ProductsResponse.md
696702
docs/Model/ProjectBoardObject.md
697703
docs/Model/ProjectGroupsObject.md
@@ -736,7 +742,6 @@ docs/Model/RelatedUserData.md
736742
docs/Model/RelationshipOrganizationInfoItem.md
737743
docs/Model/RelationshipOrganizationInfoItemAllOf.md
738744
docs/Model/RelationshipOrganizationInfoItemWithActiveFlag.md
739-
docs/Model/RequiredNameObject.md
740745
docs/Model/RequiredPostProjectParameters.md
741746
docs/Model/RequiredPostTaskParameters.md
742747
docs/Model/RequredTitleParameter.md
@@ -944,6 +949,7 @@ lib/Model/AddProductAttachmentDetails.php
944949
lib/Model/AddProductAttachmentDetailsAllOf.php
945950
lib/Model/AddProductFollowerRequest.php
946951
lib/Model/AddProductRequestBody.php
952+
lib/Model/AddProductRequestBodyAllOf.php
947953
lib/Model/AddProjectResponse201.php
948954
lib/Model/AddRole.php
949955
lib/Model/AddRoleAssignmentRequest.php
@@ -1008,10 +1014,13 @@ lib/Model/BaseUserMeAllOfLanguage.php
10081014
lib/Model/BaseWebhook.php
10091015
lib/Model/BasicDeal.php
10101016
lib/Model/BasicDealProduct.php
1017+
lib/Model/BasicDealProductAllOf.php
10111018
lib/Model/BasicGoal.php
10121019
lib/Model/BasicOrganization.php
10131020
lib/Model/BasicPerson.php
10141021
lib/Model/BasicPersonEmail.php
1022+
lib/Model/BillingFrequency.php
1023+
lib/Model/BillingFrequency1.php
10151024
lib/Model/BulkDeleteResponse.php
10161025
lib/Model/BulkDeleteResponseAllOf.php
10171026
lib/Model/BulkDeleteResponseAllOfData.php
@@ -1065,6 +1074,7 @@ lib/Model/DealPersonDataEmail.php
10651074
lib/Model/DealPersonDataPhone.php
10661075
lib/Model/DealPersonDataWithId.php
10671076
lib/Model/DealPersonDataWithIdAllOf.php
1077+
lib/Model/DealProductRequestBody.php
10681078
lib/Model/DealProductUnitDuration.php
10691079
lib/Model/DealSearchItem.php
10701080
lib/Model/DealSearchItemItem.php
@@ -1381,9 +1391,13 @@ lib/Model/MergePersonsResponseAllOf.php
13811391
lib/Model/MessageObject.php
13821392
lib/Model/MessageObjectAttachments.php
13831393
lib/Model/ModelInterface.php
1394+
lib/Model/NameObject.php
13841395
lib/Model/NewDeal.php
13851396
lib/Model/NewDealParameters.php
13861397
lib/Model/NewDealProduct.php
1398+
lib/Model/NewDealProductAllOf.php
1399+
lib/Model/NewDealProductAllOf1.php
1400+
lib/Model/NewDealProductAllOf2.php
13871401
lib/Model/NewFollowerResponse.php
13881402
lib/Model/NewFollowerResponseData.php
13891403
lib/Model/NewGoal.php
@@ -1404,9 +1418,7 @@ lib/Model/NoteParams.php
14041418
lib/Model/NumberBoolean.php
14051419
lib/Model/NumberBooleanDefault0.php
14061420
lib/Model/NumberBooleanDefault1.php
1407-
lib/Model/ObjectPrices.php
14081421
lib/Model/OneLeadResponse200.php
1409-
lib/Model/OptionalNameObject.php
14101422
lib/Model/OrgAndOwnerId.php
14111423
lib/Model/OrganizationAddressInfo.php
14121424
lib/Model/OrganizationCountAndAddressInfo.php
@@ -1537,7 +1549,6 @@ lib/Model/ProductSearchResponse.php
15371549
lib/Model/ProductSearchResponseAllOf.php
15381550
lib/Model/ProductSearchResponseAllOfData.php
15391551
lib/Model/ProductWithArrayPrices.php
1540-
lib/Model/ProductWithObjectPrices.php
15411552
lib/Model/ProductsResponse.php
15421553
lib/Model/ProjectBoardObject.php
15431554
lib/Model/ProjectGroupsObject.php
@@ -1582,7 +1593,6 @@ lib/Model/RelatedUserData.php
15821593
lib/Model/RelationshipOrganizationInfoItem.php
15831594
lib/Model/RelationshipOrganizationInfoItemAllOf.php
15841595
lib/Model/RelationshipOrganizationInfoItemWithActiveFlag.php
1585-
lib/Model/RequiredNameObject.php
15861596
lib/Model/RequiredPostProjectParameters.php
15871597
lib/Model/RequiredPostTaskParameters.php
15881598
lib/Model/RequredTitleParameter.php

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
66

77
## [Unreleased]
8+
### Added
9+
- Added `billing_frequency`, `billing_frequency_cycles` and `billing_start_date` fields to
10+
- `GET`, `POST` and `PUT` `/v1/deals/{id}/products` endpoints
11+
- `GET`, `POST` and `PATCH` `/v2/deals/{id}/products` endpoints
12+
- `GET` `/v2/deals/products` endpoint
13+
- Added `billing_frequency`, `billing_frequency_cycles` fields to
14+
- `GET`, `POST` and `PUT` `/v1/products` endpoints
15+
- `GET` `/v1/products/{id}` endpoint
16+
- `GET`, `POST` and `PATCH` `/v2/products` endpoints
17+
- `GET` `/v2/products/{id}` endpoints
818

919
### Added
1020
- Added documentation for new endpoints `/deals/{id}/changelog`, `/persons/{id}/changelog` and `/organizations/{id}/changelog`.

README.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -638,6 +638,7 @@ Class | Method | HTTP request | Description
638638
- [AddProductAttachmentDetailsAllOf](docs/Model/AddProductAttachmentDetailsAllOf.md)
639639
- [AddProductFollowerRequest](docs/Model/AddProductFollowerRequest.md)
640640
- [AddProductRequestBody](docs/Model/AddProductRequestBody.md)
641+
- [AddProductRequestBodyAllOf](docs/Model/AddProductRequestBodyAllOf.md)
641642
- [AddProjectResponse201](docs/Model/AddProjectResponse201.md)
642643
- [AddRole](docs/Model/AddRole.md)
643644
- [AddRoleAssignmentRequest](docs/Model/AddRoleAssignmentRequest.md)
@@ -701,10 +702,13 @@ Class | Method | HTTP request | Description
701702
- [BaseWebhook](docs/Model/BaseWebhook.md)
702703
- [BasicDeal](docs/Model/BasicDeal.md)
703704
- [BasicDealProduct](docs/Model/BasicDealProduct.md)
705+
- [BasicDealProductAllOf](docs/Model/BasicDealProductAllOf.md)
704706
- [BasicGoal](docs/Model/BasicGoal.md)
705707
- [BasicOrganization](docs/Model/BasicOrganization.md)
706708
- [BasicPerson](docs/Model/BasicPerson.md)
707709
- [BasicPersonEmail](docs/Model/BasicPersonEmail.md)
710+
- [BillingFrequency](docs/Model/BillingFrequency.md)
711+
- [BillingFrequency1](docs/Model/BillingFrequency1.md)
708712
- [BulkDeleteResponse](docs/Model/BulkDeleteResponse.md)
709713
- [BulkDeleteResponseAllOf](docs/Model/BulkDeleteResponseAllOf.md)
710714
- [BulkDeleteResponseAllOfData](docs/Model/BulkDeleteResponseAllOfData.md)
@@ -758,6 +762,7 @@ Class | Method | HTTP request | Description
758762
- [DealPersonDataPhone](docs/Model/DealPersonDataPhone.md)
759763
- [DealPersonDataWithId](docs/Model/DealPersonDataWithId.md)
760764
- [DealPersonDataWithIdAllOf](docs/Model/DealPersonDataWithIdAllOf.md)
765+
- [DealProductRequestBody](docs/Model/DealProductRequestBody.md)
761766
- [DealProductUnitDuration](docs/Model/DealProductUnitDuration.md)
762767
- [DealSearchItem](docs/Model/DealSearchItem.md)
763768
- [DealSearchItemItem](docs/Model/DealSearchItemItem.md)
@@ -1073,9 +1078,13 @@ Class | Method | HTTP request | Description
10731078
- [MergePersonsResponseAllOf](docs/Model/MergePersonsResponseAllOf.md)
10741079
- [MessageObject](docs/Model/MessageObject.md)
10751080
- [MessageObjectAttachments](docs/Model/MessageObjectAttachments.md)
1081+
- [NameObject](docs/Model/NameObject.md)
10761082
- [NewDeal](docs/Model/NewDeal.md)
10771083
- [NewDealParameters](docs/Model/NewDealParameters.md)
10781084
- [NewDealProduct](docs/Model/NewDealProduct.md)
1085+
- [NewDealProductAllOf](docs/Model/NewDealProductAllOf.md)
1086+
- [NewDealProductAllOf1](docs/Model/NewDealProductAllOf1.md)
1087+
- [NewDealProductAllOf2](docs/Model/NewDealProductAllOf2.md)
10791088
- [NewFollowerResponse](docs/Model/NewFollowerResponse.md)
10801089
- [NewFollowerResponseData](docs/Model/NewFollowerResponseData.md)
10811090
- [NewGoal](docs/Model/NewGoal.md)
@@ -1096,9 +1105,7 @@ Class | Method | HTTP request | Description
10961105
- [NumberBoolean](docs/Model/NumberBoolean.md)
10971106
- [NumberBooleanDefault0](docs/Model/NumberBooleanDefault0.md)
10981107
- [NumberBooleanDefault1](docs/Model/NumberBooleanDefault1.md)
1099-
- [ObjectPrices](docs/Model/ObjectPrices.md)
11001108
- [OneLeadResponse200](docs/Model/OneLeadResponse200.md)
1101-
- [OptionalNameObject](docs/Model/OptionalNameObject.md)
11021109
- [OrgAndOwnerId](docs/Model/OrgAndOwnerId.md)
11031110
- [OrganizationAddressInfo](docs/Model/OrganizationAddressInfo.md)
11041111
- [OrganizationCountAndAddressInfo](docs/Model/OrganizationCountAndAddressInfo.md)
@@ -1229,7 +1236,6 @@ Class | Method | HTTP request | Description
12291236
- [ProductSearchResponseAllOf](docs/Model/ProductSearchResponseAllOf.md)
12301237
- [ProductSearchResponseAllOfData](docs/Model/ProductSearchResponseAllOfData.md)
12311238
- [ProductWithArrayPrices](docs/Model/ProductWithArrayPrices.md)
1232-
- [ProductWithObjectPrices](docs/Model/ProductWithObjectPrices.md)
12331239
- [ProductsResponse](docs/Model/ProductsResponse.md)
12341240
- [ProjectBoardObject](docs/Model/ProjectBoardObject.md)
12351241
- [ProjectGroupsObject](docs/Model/ProjectGroupsObject.md)
@@ -1274,7 +1280,6 @@ Class | Method | HTTP request | Description
12741280
- [RelationshipOrganizationInfoItem](docs/Model/RelationshipOrganizationInfoItem.md)
12751281
- [RelationshipOrganizationInfoItemAllOf](docs/Model/RelationshipOrganizationInfoItemAllOf.md)
12761282
- [RelationshipOrganizationInfoItemWithActiveFlag](docs/Model/RelationshipOrganizationInfoItemWithActiveFlag.md)
1277-
- [RequiredNameObject](docs/Model/RequiredNameObject.md)
12781283
- [RequiredPostProjectParameters](docs/Model/RequiredPostProjectParameters.md)
12791284
- [RequiredPostTaskParameters](docs/Model/RequiredPostTaskParameters.md)
12801285
- [RequredTitleParameter](docs/Model/RequredTitleParameter.md)

docs/Model/AddProductAttachmentDetails.md

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,21 @@
44

55
Name | Type | Description | Notes
66
------------ | ------------- | ------------- | -------------
7-
**product_id** | **int** | The ID of the product |
8-
**item_price** | **float** | The price at which this product will be added to the deal |
9-
**quantity** | **int** | Quantity – e.g. how many items of this product will be added to the deal |
10-
**discount** | **float** | The value of the discount. The `discount_type` field can be used to specify whether the value is an amount or a percentage. | [optional] [default to 0]
11-
**discount_type** | **string** | The type of the discount's value. | [optional] [default to 'percentage']
12-
**duration** | **float** | The duration of the product. If omitted, will be set to 1. | [optional] [default to 1]
7+
**product_id** | **int** | The ID of the product | [optional]
8+
**item_price** | **float** | The price at which this product will be added to the deal | [optional]
9+
**quantity** | **int** | Quantity – e.g. how many items of this product will be added to the deal | [optional]
10+
**discount** | **float** | The value of the discount. The `discount_type` field can be used to specify whether the value is an amount or a percentage | [optional] [default to 0]
11+
**discount_type** | **string** | The type of the discount's value | [optional] [default to 'percentage']
12+
**duration** | **float** | The duration of the product. If omitted, will be set to 1 | [optional] [default to 1]
1313
**duration_unit** | **string** | The type of the duration. (For example hourly, daily, etc.) | [optional]
14-
**product_variation_id** | **int** | The ID of the product variation to use. When omitted, no variation will be used. | [optional]
14+
**product_variation_id** | **int** | The ID of the product variation to use. When omitted, no variation will be used | [optional]
1515
**comments** | **string** | A textual comment associated with this product-deal attachment | [optional]
1616
**tax** | **float** | The product tax | [optional]
17-
**tax_method** | **string** | The tax option to be applied to the products. When using `inclusive`, the tax percentage will already be included in the price. When using `exclusive`, the tax will not be included in the price. When using `none`, no tax will be added. Use the `tax` field for defining the tax percentage amount. By default, the user setting value for tax options will be used. Changing this in one product affects the rest of the products attached to the deal. | [optional]
18-
**enabled_flag** | **bool** | Whether the product is enabled for a deal or not. This makes it possible to add products to a deal with a specific price and discount criteria, but keep them disabled, which refrains them from being included in the deal value calculation. When omitted, the product will be marked as enabled by default. | [optional] [default to true]
17+
**tax_method** | **string** | The tax option to be applied to the products. When using `inclusive`, the tax percentage will already be included in the price. When using `exclusive`, the tax will not be included in the price. When using `none`, no tax will be added. Use the `tax` field for defining the tax percentage amount. By default, the user setting value for tax options will be used. Changing this in one product affects the rest of the products attached to the deal | [optional]
18+
**enabled_flag** | **bool** | Whether the product is enabled for a deal or not. This makes it possible to add products to a deal with a specific price and discount criteria, but keep them disabled, which refrains them from being included in the deal value calculation. When omitted, the product will be marked as enabled by default | [optional] [default to true]
19+
**billing_frequency** | [**\Pipedrive\Model\BillingFrequency**](BillingFrequency.md) | | [optional]
20+
**billing_frequency_cycles** | **int** | Only available in Advanced and above plans The number of times the billing frequency repeats for a product in a deal When `billing_frequency` is set to `one-time`, this field must be `null` For all the other values of `billing_frequency`, `null` represents a product billed indefinitely Must be a positive integer less or equal to 312 | [optional]
21+
**billing_start_date** | **string** | Only available in Advanced and above plans The billing start date. Must be between 15 years in the past and 15 years in the future | [optional]
1922
**id** | **int** | The ID of the deal-product (the ID of the product attached to the deal) | [optional]
2023
**company_id** | **int** | The ID of the company | [optional]
2124
**deal_id** | **int** | The ID of the deal | [optional]

docs/Model/AddProductRequestBody.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@
44

55
Name | Type | Description | Notes
66
------------ | ------------- | ------------- | -------------
7-
**name** | **string** | The name of the product |
7+
**name** | **string** | The name of the product | [optional]
88
**code** | **string** | The product code | [optional]
99
**unit** | **string** | The unit in which this product is sold | [optional]
1010
**tax** | **float** | The tax percentage | [optional] [default to 0]
1111
**active_flag** | **bool** | Whether this product will be made active or not | [optional] [default to true]
1212
**selectable** | **bool** | Whether this product can be selected in deals or not | [optional] [default to true]
1313
**visible_to** | [**VisibleTo**](VisibleTo.md) | The visibility of the product. If omitted, the visibility will be set to the default visibility setting of this item type for the authorized user. Read more about visibility groups <a href=\"https://support.pipedrive.com/en/article/visibility-groups\" target=\"_blank\" rel=\"noopener noreferrer\">here</a>.<h4>Essential / Advanced plan</h4><table><tr><th style=\"width: 40px\">Value</th><th>Description</th></tr><tr><td>`1`</td><td>Owner & followers</td><tr><td>`3`</td><td>Entire company</td></tr></table><h4>Professional / Enterprise plan</h4><table><tr><th style=\"width: 40px\">Value</th><th>Description</th></tr><tr><td>`1`</td><td>Owner only</td><tr><td>`3`</td><td>Owner's visibility group</td></tr><tr><td>`5`</td><td>Owner's visibility group and sub-groups</td></tr><tr><td>`7`</td><td>Entire company</td></tr></table> | [optional]
14-
**owner_id** | **int** | The ID of the user who will be marked as the owner of this product. When omitted, the authorized user ID will be used. | [optional]
14+
**owner_id** | **int** | The ID of the user who will be marked as the owner of this product. When omitted, the authorized user ID will be used | [optional]
1515
**prices** | **object[]** | An array of objects, each containing: `currency` (string), `price` (number), `cost` (number, optional), `overhead_cost` (number, optional). Note that there can only be one price per product per currency. When `prices` is omitted altogether, a default price of 0 and a default currency based on the company's currency will be assigned. | [optional]
16+
**billing_frequency** | [**\Pipedrive\Model\BillingFrequency1**](BillingFrequency1.md) | | [optional]
17+
**billing_frequency_cycles** | **int** | Only available in Advanced and above plans The number of times the billing frequency repeats for a product in a deal When `billing_frequency` is set to `one-time`, this field must be `null` For all the other values of `billing_frequency`, `null` represents a product billed indefinitely Must be a positive integer less or equal to 312 | [optional]
1618

1719
[[Back to Model list]](../../README.md#models) [[Back to API list]](../../README.md#endpoints) [[Back to README]](../../README.md)
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# # AddProductRequestBodyAllOf
2+
3+
## Properties
4+
5+
Name | Type | Description | Notes
6+
------------ | ------------- | ------------- | -------------
7+
**billing_frequency** | [**\Pipedrive\Model\BillingFrequency1**](BillingFrequency1.md) | | [optional]
8+
9+
[[Back to Model list]](../../README.md#models) [[Back to API list]](../../README.md#endpoints) [[Back to README]](../../README.md)

0 commit comments

Comments
 (0)