Skip to content

Cc 965 #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
andrei-popa88 wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Cc 965 #155

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
88e1c12
Added new fields
Jan 18, 2021
e0cb883
Fixed spacing
Jan 18, 2021
a03703d
Reverted previous change
Jan 18, 2021
6ce9b6e
Fixed intend
Jan 18, 2021
7cf83cf
Reverted spacing to 1 instead of 2
Jan 18, 2021
2cfb2c8
Fixed spacing between bracers
Jan 18, 2021
44951a0
Added space in front of all lines
Jan 18, 2021
68a551f
Fxied intend
Jan 18, 2021
63d5168
Fixed intend
Jan 18, 2021
49f3f26
Newline at end of file
Jan 18, 2021
dc18d95
Fixed end line for each
Jan 18, 2021
07fd11b
Fixed intend for map
Jan 18, 2021
4190648
Added new fields: CONTRACT_EXPIRATION_DATE_TIME(LCN), tangible and ta…
Mar 22, 2021
f1ff0a0
Added missing comma
Mar 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 48 additions & 21 deletions custom_connectors/none/two_checkout.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,9 @@
type: 'integer', control_type: 'integer' },
{ name: 'IS_TRIAL', label: 'Is trial',
type: 'integer', control_type: 'integer' },
{ name: 'CONTRACT_EXPIRATION_DATE_TIME', label: 'Contract expiration date time', type: 'date_time', control_type: 'date_time' },
{ name: 'MERCHANT_DEAL_AUTO_RENEWAL', label: 'Merchant deal auto renewal', type: 'boolean', control_type: 'checkbox', render_input: 'boolean_conversion', parse_ouput: 'boolean_conversion' },
{ name: 'CLIENT_DEAL_AUTO_RENEWAL', label: 'Client deal auto renewal', type: 'boolean', control_type: 'checkbox', render_input: 'boolean_conversion', parse_ouput: 'boolean_conversion' },
{ name: 'HASH', label: 'Hash' }
]
end,
Expand Down Expand Up @@ -588,13 +591,14 @@
]
end,

proposal_updated_schema: lambda do
proposal_schema: lambda do
[
{ name: 'proposal_id' },
{ name: 'name' },
{ name: 'type' },
{ name: 'version', type: 'integer', control_type: 'integer' },
{ name: 'status' },
{ name: 'scope' },
{ name: 'status_comment' },
{ name: 'expiration_date',
type: 'date_time',
Expand All @@ -616,11 +620,16 @@
{ name: 'product_code' },
{ name: 'quantity', type: 'integer', control_type: 'integer' },
{ name: 'price', type: 'number', control_type: 'number' },
{ name: 'subscription_reference', type: 'string', control_type: 'string' },
{ name: 'proration_date', type: 'date_time', control_type: 'date_time' },
{ name: 'next_contract_renewal_period', type: 'integer', control_type: 'integer' },
{ name: 'amendment_scenario', type: 'string', control_type: 'string' },
{ name: 'merchant_deal_auto_renewal', type: 'boolean', control_type: 'checkbox', render_input: 'boolean_conversion', parse_ouput: 'boolean_conversion' },
{ name: 'client_deal_auto_renewal', type: 'boolean', control_type: 'checkbox', render_input: 'boolean_conversion', parse_ouput: 'boolean_conversion' },
{ name: 'discounted_price',
type: 'number',
control_type: 'number' },
{ name: 'price_type' },
{ name: 'subscription_reference' },
{ name: 'contract_period',
type: 'integer', control_type: 'integer' },
{ name: 'immediate_action',
Expand Down Expand Up @@ -655,7 +664,6 @@
{ name: 'email', control_type: 'email' },
{ name: 'first_name' },
{ name: 'last_name' },
{ name: 'vat_code', label: 'VAT code' },
{ name: 'phone', control_type: 'phone' },
{ name: 'country' },
{ name: 'state' },
Expand All @@ -668,12 +676,13 @@
{ name: 'email', control_type: 'email' },
{ name: 'first_name' },
{ name: 'last_name' },
{ name: 'vat_code', label: 'VAT code' },
{ name: 'phone', control_type: 'phone' },
{ name: 'country' },
{ name: 'state' },
{ name: 'city' },
{ name: 'zip' },
{ name: 'tax_exemption_id', type: 'string', control_type: 'string' },
{ name: 'vat_code', type: 'string', control_type: 'string' },
{ name: 'address' }
] },
{ name: 'tac', type: 'object', properties: [
Expand Down Expand Up @@ -865,7 +874,20 @@
] }
] },
{ name: 'trial_description' },
{ name: 'trial_url' }
{ name: 'trial_url' },
{ name: 'tangible', type: 'boolean', control_type: 'checkbox',
render_input: 'boolean_conversion',
parse_ouput: 'boolean_conversion' },
{ name: 'tangible_details', type: 'object', properties: [
{ name: 'unit_details', type: 'array', of: 'object', properties: [
{ name: 'type', control_type: 'string' },
{ name: 'amount', control_type: 'number' },
] },
{ name: 'fee', type: 'array', of: 'object', properties: [
{ name: 'currency', control_type: 'string' },
{ name: 'amount', control_type: 'number' },
] }
] },
]
end,

Expand Down Expand Up @@ -932,12 +954,14 @@
if ['catalogue_product_created', 'catalogue_product_updated'].include?(field)
call('catalogue_product_schema')
elsif field == 'proposal_updated'
call('proposal_updated_schema')
call('proposal_schema')
elsif field == 'proposal_created'
call('proposal_schema')
else
call('ins_event_schema')
end
end.flatten)
fields = fields - %w[catalogue_product_created catalogue_product_updated proposal_updated]
fields = fields - %w[catalogue_product_created catalogue_product_updated proposal_updated proposal_created]
if fields.length > 0
items = unless fields.length == 1 && fields[0] == 'order_created'
call('recurrence')
Expand Down Expand Up @@ -1049,6 +1073,8 @@

webhook_notification: lambda do |_input, payload, _e_i_s, _e_o_s, _headers|
if payload['HASH'].present? && payload['DATE_UPDATED'].present?
payload['CLIENT_DEAL_AUTO_RENEWAL'] = ['true', 1, '1', true].include?(payload['CLIENT_DEAL_AUTO_RENEWAL'])
payload['MERCHANT_DEAL_AUTO_RENEWAL'] = ['true', 1, '1', true].include?(payload['MERCHANT_DEAL_AUTO_RENEWAL'])
payload
else
{}
Expand Down Expand Up @@ -1115,7 +1141,7 @@
webhook_notification: lambda do |input, payload, _e_i_s, _e_o_s, _headers|
if input['field_list']&.split(',')&.include?(payload['message_type']&.downcase)
if %w[CATALOGUE_PRODUCT_CREATED CATALOGUE_PRODUCT_UPDATED
PROPOSAL_UPDATED].include?(payload['message_type'])
PROPOSAL_UPDATED PROPOSAL_CREATED].include?(payload['message_type'])
payload.each do |key, value|
payload[key] = if value.is_a?(Array)
value.map do |obj|
Expand Down Expand Up @@ -1148,18 +1174,18 @@
elsif value['line_items'].present?
value['line_items'] = value.dig('line_items')&.
map do |_item_key, item_value|
if item_value['price_options'].present?
item_value['price_options'] = item_value['price_options'].
map do |_option_key, option_value|
if option_value['group_options'].present?
option_value['group_options'] = option_value['group_options'].values.
map { |item| { value: item } }
end
option_value
if item_value['price_options'].present?
item_value['price_options'] = item_value['price_options'].
map do |_option_key, option_value|
if option_value['group_options'].present?
option_value['group_options'] = option_value['group_options'].values.
map { |item| { value: item } }
end
option_value
end
item_value
end
item_value
end
value
end
else
Expand Down Expand Up @@ -1190,9 +1216,9 @@
items = []
(0...(payload['item_count'].to_i)).to_a.each do |index|
items << payload.select { |key, _val| key.match?(/^item_.*_#{index + 1}+$/) }&.
each_with_object({}) do |(key, value), hash|
hash[key.gsub("_#{index + 1}", '')] = value
end
each_with_object({}) do |(key, value), hash|
hash[key.gsub("_#{index + 1}", '')] = value
end
end
payload.reject { |key, _val| key.match?(/^item_.*_[0-9]+$/) }&.merge({ 'items' => items })
end
Expand Down Expand Up @@ -1240,7 +1266,8 @@
['Recurring restarted', 'recurring_restarted'],
['Catalogue product created', 'catalogue_product_created'],
['Catalogue product update', 'catalogue_product_updated'],
['Proposal updated', 'proposal_updated']
['Proposal updated', 'proposal_updated'],
['Proposal created', 'proposal_created']
]
end
}
Expand Down