go-packages/paypal
1
0
Fork 1
mirror of https://github.com/plutov/paypal.git synced 2025-02-02 23:20:36 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge structs

Browse Source
This commit is contained in:
imikod 2018-03-26 14:48:13 +03:00
parent 65a74578c8
commit 838828c020
2 changed files with 23 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
billing.go
View File

@ -8,26 +8,6 @@ import (
"time"
)
type (
// CreateAgreementResp struct
CreateAgreementResp struct {
ID string `json:"id,omitempty"`
Name string `json:"name,omitempty"`
Description string `json:"description,omitempty"`
Plan BillingPlan `json:"plan,omitempty"`
Links []Link `json:"links,omitempty"`
StartTime time.Time `json:"start_time,omitempty"`
}
// ListBillingPlansResp struct
ListBillingPlansResp struct {
TotalItems string `json:"total_items,omitempty"`
TotalPages string `json:"total_pages,omitempty"`
Plans []BillingPlan `json:"plans,omitempty"`
Links []Link `json:"links,omitempty"`
}
)
// ActivatePlan activates a billing plan.
// By default, a new plan is not activated.
// Endpoint: PATCH /v1/payments/billing-plans/
@ -77,14 +57,14 @@ func (c *Client) CreateBillingPlan(plan BillingPlan) (*BillingPlan, error) {
// CreateBillingAgreement creates an agreement for specified plan.
// Endpoint: POST /v1/payments/billing-agreements
func (c *Client) CreateBillingAgreement(a BillingAgreement) (*CreateAgreementResp, error) {
func (c *Client) CreateBillingAgreement(a BillingAgreement) (*BillingAgreement, error) {
// PayPal needs only ID, so we will remove all fields except Plan ID
a.Plan = BillingPlan{
ID: a.Plan.ID,
}
req, err := c.NewRequest("POST", fmt.Sprintf("%s%s", c.APIBase, "/v1/payments/billing-agreements"), a)
response := &CreateAgreementResp{}
response := &BillingAgreement{}
if err != nil {
return response, err
}
@ -107,16 +87,16 @@ func (c *Client) DeletePlan(planID string) error {
// ExecuteApprovedAgreement - Use this call to execute (complete) a PayPal agreement that has been approved by the payer.
// Endpoint: POST /v1/payments/billing-agreements/token/agreement-execute
func (c *Client) ExecuteApprovedAgreement(token string) (*ExecuteAgreementResponse, error) {
func (c *Client) ExecuteApprovedAgreement(token string) (*BillingAgreement, error) {
req, err := http.NewRequest("POST", fmt.Sprintf("%s%s", c.APIBase, "/v1/payments/billing-agreements/"+token+"/agreement-execute"), nil)
if err != nil {
return &ExecuteAgreementResponse{}, err
return &BillingAgreement{}, err
}
req.SetBasicAuth(c.ClientID, c.Secret)
req.Header.Set("Authorization", "Bearer "+c.Token.Token)
e := ExecuteAgreementResponse{}
e := BillingAgreement{}
if err = c.SendWithAuth(req, &e); err != nil {
return &e, err

37
types.go
View File

@ -121,12 +121,16 @@ type (
// BillingAgreement struct
BillingAgreement struct {
Name string `json:"name,omitempty"`
Description string `json:"description,omitempty"`
StartDate JSONTime `json:"start_date,omitempty"`
Plan BillingPlan `json:"plan,omitempty"`
Payer Payer `json:"payer,omitempty"`
ShippingAddress *ShippingAddress `json:"shipping_address,omitempty"`
ID string `json:"id,omitempty"`
Name string `json:"name,omitempty"`
Description string `json:"description,omitempty"`
StartDate JSONTime `json:"start_date,omitempty"`
Plan BillingPlan `json:"plan,omitempty"`
Payer Payer `json:"payer,omitempty"`
ShippingAddress *ShippingAddress `json:"shipping_address,omitempty"`
State string `json:"state,omitempty"`
AgreementDetails AgreementDetails `json:"agreement_details"`
Links []Link `json:"links"`
}
// BillingPlan struct
@ -252,19 +256,6 @@ type (
Details []ErrorResponseDetail `json:"details"`
}
// ExecuteAgreementResponse struct
ExecuteAgreementResponse struct {
ID string `json:"id"`
State string `json:"state"`
Description string `json:"description,omitempty"`
Payer Payer `json:"payer"`
Plan BillingPlan `json:"plan"`
StartDate time.Time `json:"start_date"`
ShippingAddress ShippingAddress `json:"shipping_address"`
AgreementDetails AgreementDetails `json:"agreement_details"`
Links []Link `json:"links"`
}
// ExecuteResponse struct
ExecuteResponse struct {
ID string `json:"id"`
@ -305,6 +296,14 @@ type (
Enctype string `json:"enctype,omitempty"`
}
// ListBillingPlansResp struct
ListBillingPlansResp struct {
TotalItems string `json:"total_items,omitempty"`
TotalPages string `json:"total_pages,omitempty"`
Plans []BillingPlan `json:"plans,omitempty"`
Links []Link `json:"links,omitempty"`
}
// MerchantPreferences struct
MerchantPreferences struct {
SetupFee *AmountPayout `json:"setup_fee,omitempty"`