data-and-reporting-sdk 1.0.0 → 1.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/README.md +15 -16
- data/lib/shell_data_reporting_ap_is/controllers/base_controller.rb +9 -9
- data/lib/shell_data_reporting_ap_is/controllers/customer_controller.rb +210 -210
- data/lib/shell_data_reporting_ap_is/controllers/invoice_controller.rb +221 -221
- data/lib/shell_data_reporting_ap_is/controllers/o_auth_authorization_controller.rb +9 -9
- data/lib/shell_data_reporting_ap_is/controllers/transaction_controller.rb +354 -354
- data/lib/shell_data_reporting_ap_is/exceptions/default_error_exception.rb +15 -15
- data/lib/shell_data_reporting_ap_is/exceptions/error_object_exception.rb +15 -15
- data/lib/shell_data_reporting_ap_is/exceptions/error_user_access_error1_exception.rb +15 -15
- data/lib/shell_data_reporting_ap_is/exceptions/o_auth_provider_exception.rb +15 -15
- data/lib/shell_data_reporting_ap_is/http/auth/bearer_token.rb +54 -10
- data/lib/shell_data_reporting_ap_is/models/account_access.rb +3 -8
- data/lib/shell_data_reporting_ap_is/models/account_request.rb +17 -26
- data/lib/shell_data_reporting_ap_is/models/account_response.rb +2 -6
- data/lib/shell_data_reporting_ap_is/models/account_response_accounts_items.rb +29 -53
- data/lib/shell_data_reporting_ap_is/models/accounts.rb +1 -2
- data/lib/shell_data_reporting_ap_is/models/address.rb +4 -11
- data/lib/shell_data_reporting_ap_is/models/audit_request.rb +17 -25
- data/lib/shell_data_reporting_ap_is/models/audit_response.rb +2 -6
- data/lib/shell_data_reporting_ap_is/models/audit_response_audits_items.rb +50 -63
- data/lib/shell_data_reporting_ap_is/models/bank_account.rb +5 -13
- data/lib/shell_data_reporting_ap_is/models/base_model.rb +76 -28
- data/lib/shell_data_reporting_ap_is/models/bonus_configuration.rb +9 -18
- data/lib/shell_data_reporting_ap_is/models/bonus_history.rb +14 -29
- data/lib/shell_data_reporting_ap_is/models/card_day_time_restrictions.rb +3 -9
- data/lib/shell_data_reporting_ap_is/models/card_exceptions.rb +8 -19
- data/lib/shell_data_reporting_ap_is/models/card_group_request.rb +6 -12
- data/lib/shell_data_reporting_ap_is/models/card_group_response.rb +2 -6
- data/lib/shell_data_reporting_ap_is/models/card_group_response_card_groups_items.rb +10 -20
- data/lib/shell_data_reporting_ap_is/models/card_type_request.rb +3 -7
- data/lib/shell_data_reporting_ap_is/models/card_type_response.rb +1 -3
- data/lib/shell_data_reporting_ap_is/models/card_type_response_customer_card_types_items.rb +15 -31
- data/lib/shell_data_reporting_ap_is/models/card_type_response_error.rb +1 -2
- data/lib/shell_data_reporting_ap_is/models/card_usage_restrictions.rb +5 -10
- data/lib/shell_data_reporting_ap_is/models/card_usage_summary_request.rb +3 -8
- data/lib/shell_data_reporting_ap_is/models/card_usage_summary_response.rb +1 -3
- data/lib/shell_data_reporting_ap_is/models/col_co_access.rb +2 -4
- data/lib/shell_data_reporting_ap_is/models/current_volume.rb +2 -5
- data/lib/shell_data_reporting_ap_is/models/customer_contract.rb +1 -2
- data/lib/shell_data_reporting_ap_is/models/customer_detail_request.rb +2 -5
- data/lib/shell_data_reporting_ap_is/models/customer_detail_response.rb +31 -45
- data/lib/shell_data_reporting_ap_is/models/customer_price_list_request.rb +5 -12
- data/lib/shell_data_reporting_ap_is/models/customer_price_list_response.rb +1 -3
- data/lib/shell_data_reporting_ap_is/models/default_error_fault.rb +1 -2
- data/lib/shell_data_reporting_ap_is/models/delivery_addresses.rb +7 -18
- data/lib/shell_data_reporting_ap_is/models/eid_access.rb +1 -2
- data/lib/shell_data_reporting_ap_is/models/eid_document.rb +11 -16
- data/lib/shell_data_reporting_ap_is/models/eid_document_response.rb +3 -8
- data/lib/shell_data_reporting_ap_is/models/eid_download_req.rb +2 -4
- data/lib/shell_data_reporting_ap_is/models/eid_search_req.rb +10 -15
- data/lib/shell_data_reporting_ap_is/models/eid_search_request.rb +2 -4
- data/lib/shell_data_reporting_ap_is/models/error_details.rb +1 -3
- data/lib/shell_data_reporting_ap_is/models/error_status.rb +11 -2
- data/lib/shell_data_reporting_ap_is/models/error_user_access_error.rb +1 -2
- data/lib/shell_data_reporting_ap_is/models/exception_product.rb +1 -2
- data/lib/shell_data_reporting_ap_is/models/exception_site_location.rb +1 -2
- data/lib/shell_data_reporting_ap_is/models/fee_item.rb +35 -71
- data/lib/shell_data_reporting_ap_is/models/fee_item_summary_all_of0.rb +5 -11
- data/lib/shell_data_reporting_ap_is/models/fee_rule_location.rb +4 -10
- data/lib/shell_data_reporting_ap_is/models/fee_rule_product.rb +2 -5
- data/lib/shell_data_reporting_ap_is/models/fee_rule_tier.rb +1 -3
- data/lib/shell_data_reporting_ap_is/models/fee_summary_response.rb +1 -3
- data/lib/shell_data_reporting_ap_is/models/fees_fee_rule_tiers.rb +3 -7
- data/lib/shell_data_reporting_ap_is/models/finance_currency.rb +1 -2
- data/lib/shell_data_reporting_ap_is/models/fleetmanagement_v1_user_loggedinuser_request.rb +104 -0
- data/lib/shell_data_reporting_ap_is/models/fuel_consumption_card.rb +1 -3
- data/lib/shell_data_reporting_ap_is/models/fuel_consumption_data.rb +9 -20
- data/lib/shell_data_reporting_ap_is/models/fuel_consumption_request.rb +7 -14
- data/lib/shell_data_reporting_ap_is/models/fuel_consumption_response.rb +1 -3
- data/lib/shell_data_reporting_ap_is/models/invoice_dates_data.rb +1 -2
- data/lib/shell_data_reporting_ap_is/models/invoice_dates_request_filters.rb +2 -6
- data/lib/shell_data_reporting_ap_is/models/invoice_dates_response_data.rb +1 -3
- data/lib/shell_data_reporting_ap_is/models/invoice_distribution_method.rb +2 -4
- data/lib/shell_data_reporting_ap_is/models/invoice_download_req.rb +2 -5
- data/lib/shell_data_reporting_ap_is/models/invoice_search_additional_document.rb +2 -4
- data/lib/shell_data_reporting_ap_is/models/invoice_search_details.rb +86 -107
- data/lib/shell_data_reporting_ap_is/models/invoice_search_request.rb +5 -7
- data/lib/shell_data_reporting_ap_is/models/invoice_search_request_filters.rb +21 -31
- data/lib/shell_data_reporting_ap_is/models/invoice_search_response.rb +2 -7
- data/lib/shell_data_reporting_ap_is/models/invoice_summary_request_filters.rb +21 -31
- data/lib/shell_data_reporting_ap_is/models/invoice_summary_response.rb +1 -3
- data/lib/shell_data_reporting_ap_is/models/invoices_summaries.rb +5 -10
- data/lib/shell_data_reporting_ap_is/models/last_statement_of_account.rb +39 -48
- data/lib/shell_data_reporting_ap_is/models/logged_in_user_request.rb +2 -4
- data/lib/shell_data_reporting_ap_is/models/logged_in_user_response.rb +12 -25
- data/lib/shell_data_reporting_ap_is/models/monthly_invoice_trend.rb +2 -5
- data/lib/shell_data_reporting_ap_is/models/multi_priced_transaction_request.rb +21 -32
- data/lib/shell_data_reporting_ap_is/models/multi_priced_transaction_request_accounts_items.rb +1 -3
- data/lib/shell_data_reporting_ap_is/models/multi_priced_transaction_response.rb +2 -6
- data/lib/shell_data_reporting_ap_is/models/multi_priced_transaction_response_transactions_items.rb +70 -122
- data/lib/shell_data_reporting_ap_is/models/o_auth_token.rb +2 -6
- data/lib/shell_data_reporting_ap_is/models/past_statement_of_accounts.rb +11 -22
- data/lib/shell_data_reporting_ap_is/models/payer_access.rb +3 -8
- data/lib/shell_data_reporting_ap_is/models/payer_details.rb +49 -92
- data/lib/shell_data_reporting_ap_is/models/payer_request.rb +9 -12
- data/lib/shell_data_reporting_ap_is/models/payer_response.rb +2 -6
- data/lib/shell_data_reporting_ap_is/models/payers.rb +2 -5
- data/lib/shell_data_reporting_ap_is/models/payments_since_last_soa.rb +8 -17
- data/lib/shell_data_reporting_ap_is/models/pin_advice_types.rb +5 -6
- data/lib/shell_data_reporting_ap_is/models/price_list.rb +25 -45
- data/lib/shell_data_reporting_ap_is/models/price_trans_summary_request.rb +28 -44
- data/lib/shell_data_reporting_ap_is/models/price_transaction_request.rb +41 -59
- data/lib/shell_data_reporting_ap_is/models/priced_request_data.rb +20 -46
- data/lib/shell_data_reporting_ap_is/models/priced_response_data.rb +91 -201
- data/lib/shell_data_reporting_ap_is/models/priced_trans_summary_response.rb +1 -3
- data/lib/shell_data_reporting_ap_is/models/priced_trans_summary_response_transactions_summary_items.rb +22 -28
- data/lib/shell_data_reporting_ap_is/models/priced_transaction_items_location_items.rb +11 -2
- data/lib/shell_data_reporting_ap_is/models/priced_transaction_request_v2.rb +1 -3
- data/lib/shell_data_reporting_ap_is/models/priced_transaction_response_transactions_items.rb +91 -141
- data/lib/shell_data_reporting_ap_is/models/priced_transaction_response_v2.rb +2 -6
- data/lib/shell_data_reporting_ap_is/models/pricing_current_volume.rb +3 -6
- data/lib/shell_data_reporting_ap_is/models/pricing_history.rb +2 -5
- data/lib/shell_data_reporting_ap_is/models/purchase_categories.rb +1 -4
- data/lib/shell_data_reporting_ap_is/models/recent_transaction_req.rb +6 -14
- data/lib/shell_data_reporting_ap_is/models/recent_transaction_request.rb +1 -3
- data/lib/shell_data_reporting_ap_is/models/recent_transactions.rb +29 -60
- data/lib/shell_data_reporting_ap_is/models/recent_transactions_response.rb +2 -6
- data/lib/shell_data_reporting_ap_is/models/role.rb +3 -6
- data/lib/shell_data_reporting_ap_is/models/search_doc_req.rb +19 -27
- data/lib/shell_data_reporting_ap_is/models/search_documents_invoice.rb +9 -16
- data/lib/shell_data_reporting_ap_is/models/search_documents_request.rb +1 -3
- data/lib/shell_data_reporting_ap_is/models/search_documents_response.rb +3 -7
- data/lib/shell_data_reporting_ap_is/models/search_soa_req.rb +4 -11
- data/lib/shell_data_reporting_ap_is/models/search_statement_of_account.rb +11 -18
- data/lib/shell_data_reporting_ap_is/models/search_statement_of_account_request.rb +1 -3
- data/lib/shell_data_reporting_ap_is/models/search_statement_of_account_response.rb +2 -7
- data/lib/shell_data_reporting_ap_is/models/site_location.rb +11 -2
- data/lib/shell_data_reporting_ap_is/models/statement_of_account_request_filters.rb +2 -5
- data/lib/shell_data_reporting_ap_is/models/statement_of_account_resp.rb +1 -2
- data/lib/shell_data_reporting_ap_is/models/statement_of_account_response.rb +1 -3
- data/lib/shell_data_reporting_ap_is/models/tier.rb +8 -12
- data/lib/shell_data_reporting_ap_is/models/transaction_exceptions.rb +47 -92
- data/lib/shell_data_reporting_ap_is/models/transaction_exceptions_request.rb +12 -21
- data/lib/shell_data_reporting_ap_is/models/transaction_exceptions_response.rb +2 -4
- data/lib/shell_data_reporting_ap_is/models/transaction_fees_request.rb +21 -33
- data/lib/shell_data_reporting_ap_is/models/transaction_fees_response.rb +2 -6
- data/lib/shell_data_reporting_ap_is/models/update_odometer.rb +1 -2
- data/lib/shell_data_reporting_ap_is/models/update_odometer_reference.rb +1 -2
- data/lib/shell_data_reporting_ap_is/models/update_odometer_request.rb +3 -8
- data/lib/shell_data_reporting_ap_is/models/update_odometer_response.rb +2 -4
- data/lib/shell_data_reporting_ap_is/models/usage_summary.rb +6 -14
- data/lib/shell_data_reporting_ap_is/models/volume_based_bonus_request.rb +2 -5
- data/lib/shell_data_reporting_ap_is/models/volume_based_bonus_response.rb +2 -4
- data/lib/shell_data_reporting_ap_is/models/volume_based_pricing_request.rb +2 -5
- data/lib/shell_data_reporting_ap_is/models/volume_based_pricing_response.rb +2 -5
- data/lib/shell_data_reporting_ap_is/utilities/file_wrapper.rb +9 -9
- data/lib/shell_data_reporting_ap_is/utilities/union_type_lookup.rb +35 -0
- data/lib/shell_data_reporting_ap_is.rb +3 -0
- data/test/controllers/controller_test_base.rb +0 -5
- data/test/controllers/test_invoice_controller.rb +1 -1
- data/test/controllers/test_transaction_controller.rb +83 -75
- metadata +12 -16
@@ -72,10 +72,8 @@ module ShellDataReportingApIs
|
|
72
72
|
]
|
73
73
|
end
|
74
74
|
|
75
|
-
def initialize(include_payer_group = false,
|
76
|
-
|
77
|
-
requested_api_name = SKIP,
|
78
|
-
payer_id = SKIP,
|
75
|
+
def initialize(include_payer_group = false, include_eid_details = false,
|
76
|
+
requested_api_name = SKIP, payer_id = SKIP,
|
79
77
|
payer_number = SKIP)
|
80
78
|
@include_payer_group = include_payer_group unless include_payer_group == SKIP
|
81
79
|
@include_eid_details = include_eid_details unless include_eid_details == SKIP
|
@@ -71,9 +71,9 @@ module ShellDataReportingApIs
|
|
71
71
|
attr_accessor :roles
|
72
72
|
|
73
73
|
# List of payers which the user has access to.
|
74
|
-
# •
|
75
|
-
# more than that, the remaining will be ignored.
|
76
|
-
# •
|
74
|
+
# • It will return 250 payers only and it is configurable. If the user
|
75
|
+
# has more than that, the remaining will be ignored.
|
76
|
+
# • The payer which is marked as default will be the first item in the
|
77
77
|
# output.
|
78
78
|
# Note: This list will be empty for users mapped with roles which has either
|
79
79
|
# IsShellAdmin or IsServiceAccount set to true as their access level is
|
@@ -225,30 +225,17 @@ module ShellDataReportingApIs
|
|
225
225
|
]
|
226
226
|
end
|
227
227
|
|
228
|
-
def initialize(user_name = SKIP,
|
229
|
-
|
230
|
-
|
231
|
-
|
232
|
-
|
233
|
-
|
234
|
-
|
235
|
-
week_begins = SKIP,
|
236
|
-
display_week = true,
|
237
|
-
csv_separator = SKIP,
|
238
|
-
decimal_separator = SKIP,
|
239
|
-
report_format = SKIP,
|
240
|
-
has_api_access = true,
|
241
|
-
roles = SKIP,
|
242
|
-
payers = SKIP,
|
243
|
-
accounts = SKIP,
|
244
|
-
collecting_companies = SKIP,
|
228
|
+
def initialize(user_name = SKIP, display_name = SKIP, id_mssoid = SKIP,
|
229
|
+
preferred_language = SKIP, is_super_admin = false,
|
230
|
+
date_format = SKIP, time_format = SKIP, week_begins = SKIP,
|
231
|
+
display_week = true, csv_separator = SKIP,
|
232
|
+
decimal_separator = SKIP, report_format = SKIP,
|
233
|
+
has_api_access = true, roles = SKIP, payers = SKIP,
|
234
|
+
accounts = SKIP, collecting_companies = SKIP,
|
245
235
|
eid_access_details = SKIP,
|
246
236
|
user_classification_by_system = SKIP,
|
247
|
-
user_classification_by_shell = SKIP,
|
248
|
-
|
249
|
-
account_count = SKIP,
|
250
|
-
card_count = SKIP,
|
251
|
-
error = SKIP,
|
237
|
+
user_classification_by_shell = SKIP, payer_count = SKIP,
|
238
|
+
account_count = SKIP, card_count = SKIP, error = SKIP,
|
252
239
|
request_id = SKIP)
|
253
240
|
@user_name = user_name unless user_name == SKIP
|
254
241
|
@display_name = display_name unless display_name == SKIP
|
@@ -71,11 +71,8 @@ module ShellDataReportingApIs
|
|
71
71
|
]
|
72
72
|
end
|
73
73
|
|
74
|
-
def initialize(currency_code = SKIP,
|
75
|
-
|
76
|
-
month = SKIP,
|
77
|
-
total_net_amount = SKIP,
|
78
|
-
total_vat_amount = SKIP,
|
74
|
+
def initialize(currency_code = SKIP, currency_symbol = SKIP, month = SKIP,
|
75
|
+
total_net_amount = SKIP, total_vat_amount = SKIP,
|
79
76
|
year = SKIP)
|
80
77
|
@currency_code = currency_code unless currency_code == SKIP
|
81
78
|
@currency_symbol = currency_symbol unless currency_symbol == SKIP
|
@@ -28,12 +28,12 @@ module ShellDataReportingApIs
|
|
28
28
|
|
29
29
|
# List of Payers/Accounts entity.
|
30
30
|
# Mandatory.
|
31
|
-
# •
|
31
|
+
# • Max number of payers allowed in the input is 10, if it exceeds in the
|
32
32
|
# input it will throw an error.
|
33
|
-
# •
|
34
|
-
# change to 10 once SFH changes are integrated.
|
33
|
+
# • This value is configurable. Initial configuration will be 100 and
|
34
|
+
# will change to 10 once SFH changes are integrated.
|
35
35
|
# Note:
|
36
|
-
# 1.
|
36
|
+
# 1. At least one payer should be present.
|
37
37
|
# Accounts information are optional.
|
38
38
|
# @return [Array[MultiPricedTransactionRequestAccountsItems]]
|
39
39
|
attr_accessor :accounts
|
@@ -72,9 +72,9 @@ module ShellDataReportingApIs
|
|
72
72
|
|
73
73
|
# Transactions Period.
|
74
74
|
# Possible values are:
|
75
|
-
# 1.
|
76
|
-
# 2.
|
77
|
-
# 3.
|
75
|
+
# 1. Last 7 Days
|
76
|
+
# 2. Last 30 Days
|
77
|
+
# 3. Last 90 Days
|
78
78
|
# @return [Integer]
|
79
79
|
attr_accessor :period
|
80
80
|
|
@@ -168,12 +168,12 @@ module ShellDataReportingApIs
|
|
168
168
|
attr_accessor :include_fees
|
169
169
|
|
170
170
|
# Allowed Sorting Options:
|
171
|
-
# 1.
|
172
|
-
# 2.
|
173
|
-
# 3.
|
174
|
-
# 4.
|
175
|
-
# 5.
|
176
|
-
# 6.
|
171
|
+
# 1. TransactionDateAscending
|
172
|
+
# 2. TransactionDateDescending
|
173
|
+
# 3. GrossAmountDescending
|
174
|
+
# 4. GrossAmountAscending
|
175
|
+
# 5. NetAmountAscending
|
176
|
+
# 6. NetAmountDescensding
|
177
177
|
# Example value to be passed: 1,3
|
178
178
|
# Note: If IncludeFees is ‘True’ then sorting is not allowed. This parameter
|
179
179
|
# will be ignored.
|
@@ -251,25 +251,14 @@ module ShellDataReportingApIs
|
|
251
251
|
[]
|
252
252
|
end
|
253
253
|
|
254
|
-
def initialize(col_co_code = nil,
|
255
|
-
|
256
|
-
|
257
|
-
|
258
|
-
|
259
|
-
|
260
|
-
|
261
|
-
|
262
|
-
posting_date_from = SKIP,
|
263
|
-
posting_date_to = SKIP,
|
264
|
-
invoice_date = SKIP,
|
265
|
-
invoice_number = SKIP,
|
266
|
-
valid_invoice_date_only = SKIP,
|
267
|
-
invoice_from_date = SKIP,
|
268
|
-
invoice_to_date = SKIP,
|
269
|
-
fuel_only = SKIP,
|
270
|
-
include_fees = SKIP,
|
271
|
-
sort_order = SKIP,
|
272
|
-
current_page = SKIP,
|
254
|
+
def initialize(col_co_code = nil, accounts = nil, col_co_id = SKIP,
|
255
|
+
invoice_status = SKIP, purchased_in_country = SKIP,
|
256
|
+
from_date = SKIP, to_date = SKIP, period = SKIP,
|
257
|
+
posting_date_from = SKIP, posting_date_to = SKIP,
|
258
|
+
invoice_date = SKIP, invoice_number = SKIP,
|
259
|
+
valid_invoice_date_only = SKIP, invoice_from_date = SKIP,
|
260
|
+
invoice_to_date = SKIP, fuel_only = SKIP,
|
261
|
+
include_fees = SKIP, sort_order = SKIP, current_page = SKIP,
|
273
262
|
page_size = SKIP)
|
274
263
|
@col_co_id = col_co_id unless col_co_id == SKIP
|
275
264
|
@col_co_code = col_co_code
|
data/lib/shell_data_reporting_ap_is/models/multi_priced_transaction_request_accounts_items.rb
CHANGED
@@ -54,9 +54,7 @@ module ShellDataReportingApIs
|
|
54
54
|
[]
|
55
55
|
end
|
56
56
|
|
57
|
-
def initialize(payer_id = SKIP,
|
58
|
-
payer_number = SKIP,
|
59
|
-
account_id = SKIP,
|
57
|
+
def initialize(payer_id = SKIP, payer_number = SKIP, account_id = SKIP,
|
60
58
|
account_number = SKIP)
|
61
59
|
@payer_id = payer_id unless payer_id == SKIP
|
62
60
|
@payer_number = payer_number unless payer_number == SKIP
|
@@ -63,12 +63,8 @@ module ShellDataReportingApIs
|
|
63
63
|
[]
|
64
64
|
end
|
65
65
|
|
66
|
-
def initialize(transactions = SKIP,
|
67
|
-
|
68
|
-
request_id = SKIP,
|
69
|
-
current_page = SKIP,
|
70
|
-
row_count = SKIP,
|
71
|
-
total_pages = SKIP)
|
66
|
+
def initialize(transactions = SKIP, error = SKIP, request_id = SKIP,
|
67
|
+
current_page = SKIP, row_count = SKIP, total_pages = SKIP)
|
72
68
|
@transactions = transactions unless transactions == SKIP
|
73
69
|
@error = error unless error == SKIP
|
74
70
|
@request_id = request_id unless request_id == SKIP
|
data/lib/shell_data_reporting_ap_is/models/multi_priced_transaction_response_transactions_items.rb
CHANGED
@@ -187,13 +187,13 @@ module ShellDataReportingApIs
|
|
187
187
|
|
188
188
|
# Site Code
|
189
189
|
# Example:
|
190
|
-
# 050001 -
|
190
|
+
# 050001 - CHARNOCK RICHARD NTHBOUND MWSA 0755
|
191
191
|
# @return [String]
|
192
192
|
attr_accessor :site_code
|
193
193
|
|
194
194
|
# Site Name
|
195
195
|
# Example:
|
196
|
-
# 050001 -
|
196
|
+
# 050001 - CHARNOCK RICHARD NTHBOUND MWSA 0755
|
197
197
|
# @return [String]
|
198
198
|
attr_accessor :site_name
|
199
199
|
|
@@ -216,9 +216,9 @@ module ShellDataReportingApIs
|
|
216
216
|
attr_accessor :receipt_number
|
217
217
|
|
218
218
|
# Product Code
|
219
|
-
# 10
|
220
|
-
# 11
|
221
|
-
# 12
|
219
|
+
# 10 TMF Charges
|
220
|
+
# 11 Tunnel/Bridges
|
221
|
+
# 12 Motorway toll
|
222
222
|
# @return [String]
|
223
223
|
attr_accessor :product_code
|
224
224
|
|
@@ -233,21 +233,21 @@ module ShellDataReportingApIs
|
|
233
233
|
|
234
234
|
# Product Group Id
|
235
235
|
# Example:
|
236
|
-
# 1
|
237
|
-
# 2
|
238
|
-
# 3
|
239
|
-
# 4
|
240
|
-
# 5
|
236
|
+
# 1 Parent Product Group
|
237
|
+
# 2 All Fuels
|
238
|
+
# 3 Motor gasoline
|
239
|
+
# 4 2 stroke
|
240
|
+
# 5 Autogas
|
241
241
|
# @return [Integer]
|
242
242
|
attr_accessor :product_group_id
|
243
243
|
|
244
244
|
# Product Group Name
|
245
245
|
# Example:
|
246
|
-
# 1
|
247
|
-
# 2
|
248
|
-
# 3
|
249
|
-
# 4
|
250
|
-
# 5
|
246
|
+
# 1 Parent Product Group
|
247
|
+
# 2 All Fuels
|
248
|
+
# 3 Motor gasoline
|
249
|
+
# 4 2 stroke
|
250
|
+
# 5 Autogas
|
251
251
|
# @return [String]
|
252
252
|
attr_accessor :product_group_name
|
253
253
|
|
@@ -266,9 +266,9 @@ module ShellDataReportingApIs
|
|
266
266
|
attr_accessor :is_shell_site
|
267
267
|
|
268
268
|
# Network (Shell PH, ESSO, etc.,)
|
269
|
-
# 100013
|
270
|
-
# 100015
|
271
|
-
# 100016
|
269
|
+
# 100013 STEINDORFER
|
270
|
+
# 100015 S.A. BELGIAN SHELL N.V.
|
271
|
+
# 100016 ESSO BE
|
272
272
|
# Note: - The value could be null/blank for fees item.
|
273
273
|
# @return [String]
|
274
274
|
attr_accessor :network
|
@@ -492,13 +492,13 @@ module ShellDataReportingApIs
|
|
492
492
|
attr_accessor :crm_number
|
493
493
|
|
494
494
|
# Sales Item Dispute Status if disputed
|
495
|
-
# 0
|
496
|
-
# 1
|
497
|
-
# 2
|
498
|
-
# 3
|
499
|
-
# 4
|
500
|
-
# 5
|
501
|
-
# 6
|
495
|
+
# 0 No Dispute
|
496
|
+
# 1 In Dispute
|
497
|
+
# 2 Re-Instated
|
498
|
+
# 3 Adjusted
|
499
|
+
# 4 Written Off by Colco
|
500
|
+
# 5 Written Off by Delco
|
501
|
+
# 6 Charged Back to Site
|
502
502
|
# @return [String]
|
503
503
|
attr_accessor :dispute_status
|
504
504
|
|
@@ -1066,121 +1066,69 @@ module ShellDataReportingApIs
|
|
1066
1066
|
]
|
1067
1067
|
end
|
1068
1068
|
|
1069
|
-
def initialize(type = SKIP,
|
1070
|
-
|
1071
|
-
|
1072
|
-
|
1073
|
-
|
1074
|
-
|
1075
|
-
utc_offset = SKIP,
|
1076
|
-
fleet_id_input = SKIP,
|
1077
|
-
odometer_input = SKIP,
|
1078
|
-
driver_name = SKIP,
|
1079
|
-
vehicle_registration = SKIP,
|
1080
|
-
invoice_currency_code = SKIP,
|
1081
|
-
invoice_currency_symbol = SKIP,
|
1069
|
+
def initialize(type = SKIP, card_id = SKIP, card_pan = SKIP,
|
1070
|
+
card_expiry = SKIP, transaction_date = SKIP,
|
1071
|
+
transaction_time = SKIP, utc_offset = SKIP,
|
1072
|
+
fleet_id_input = SKIP, odometer_input = SKIP,
|
1073
|
+
driver_name = SKIP, vehicle_registration = SKIP,
|
1074
|
+
invoice_currency_code = SKIP, invoice_currency_symbol = SKIP,
|
1082
1075
|
transaction_currency_code = SKIP,
|
1083
1076
|
transaction_currency_symbol = SKIP,
|
1084
|
-
transaction_net_amount = SKIP,
|
1085
|
-
|
1086
|
-
|
1087
|
-
|
1088
|
-
|
1089
|
-
|
1090
|
-
purchased_in_country = SKIP,
|
1091
|
-
account_id = SKIP,
|
1092
|
-
account_number = SKIP,
|
1093
|
-
account_name = SKIP,
|
1094
|
-
account_short_name = SKIP,
|
1095
|
-
quantity = SKIP,
|
1077
|
+
transaction_net_amount = SKIP, transaction_tax = SKIP,
|
1078
|
+
transaction_gross_amount = SKIP, invoice_net_amount = SKIP,
|
1079
|
+
invoice_tax = SKIP, invoice_gross_amount = SKIP,
|
1080
|
+
purchased_in_country = SKIP, account_id = SKIP,
|
1081
|
+
account_number = SKIP, account_name = SKIP,
|
1082
|
+
account_short_name = SKIP, quantity = SKIP,
|
1096
1083
|
fuel_product = SKIP,
|
1097
1084
|
unit_price_in_transaction_currency = SKIP,
|
1098
1085
|
unit_price_in_invoice_currency = SKIP,
|
1099
1086
|
unit_discount_transaction_currency = SKIP,
|
1100
|
-
unit_discount_invoice_currency = SKIP,
|
1101
|
-
|
1102
|
-
|
1103
|
-
|
1104
|
-
|
1105
|
-
|
1106
|
-
|
1107
|
-
|
1108
|
-
|
1109
|
-
|
1110
|
-
|
1111
|
-
|
1112
|
-
|
1113
|
-
|
1114
|
-
|
1115
|
-
col_co_exchange_rate = SKIP,
|
1116
|
-
is_shell_site = SKIP,
|
1117
|
-
network = SKIP,
|
1118
|
-
site_group_id = SKIP,
|
1119
|
-
site_group_name = SKIP,
|
1120
|
-
posting_date = SKIP,
|
1121
|
-
issuer_code = SKIP,
|
1122
|
-
purchased_in_country_code = SKIP,
|
1123
|
-
customer_country_code = SKIP,
|
1124
|
-
customer_country = SKIP,
|
1125
|
-
release_code = SKIP,
|
1126
|
-
card_group_id = SKIP,
|
1127
|
-
card_sequence_number = SKIP,
|
1128
|
-
check_digit = SKIP,
|
1129
|
-
fleet_id_description = SKIP,
|
1130
|
-
vat_rate = SKIP,
|
1131
|
-
vat_category = SKIP,
|
1132
|
-
vat_country = SKIP,
|
1087
|
+
unit_discount_invoice_currency = SKIP, is_invoiced = SKIP,
|
1088
|
+
invoice_number = SKIP, invoice_date = SKIP, site_code = SKIP,
|
1089
|
+
site_name = SKIP, site_country = SKIP, location = SKIP,
|
1090
|
+
card_group_name = SKIP, receipt_number = SKIP,
|
1091
|
+
product_code = SKIP, product_name = SKIP,
|
1092
|
+
product_group_id = SKIP, product_group_name = SKIP,
|
1093
|
+
del_co_exchange_rate = SKIP, col_co_exchange_rate = SKIP,
|
1094
|
+
is_shell_site = SKIP, network = SKIP, site_group_id = SKIP,
|
1095
|
+
site_group_name = SKIP, posting_date = SKIP,
|
1096
|
+
issuer_code = SKIP, purchased_in_country_code = SKIP,
|
1097
|
+
customer_country_code = SKIP, customer_country = SKIP,
|
1098
|
+
release_code = SKIP, card_group_id = SKIP,
|
1099
|
+
card_sequence_number = SKIP, check_digit = SKIP,
|
1100
|
+
fleet_id_description = SKIP, vat_rate = SKIP,
|
1101
|
+
vat_category = SKIP, vat_country = SKIP,
|
1133
1102
|
effective_discount_in_trx_currency = SKIP,
|
1134
|
-
transaction_type = SKIP,
|
1135
|
-
|
1136
|
-
vat_applicable = SKIP,
|
1137
|
-
net_invoice_indicator = SKIP,
|
1103
|
+
transaction_type = SKIP, pin_indicator = SKIP,
|
1104
|
+
vat_applicable = SKIP, net_invoice_indicator = SKIP,
|
1138
1105
|
customer_currency_code = SKIP,
|
1139
1106
|
customer_currency_symbol = SKIP,
|
1140
1107
|
effective_unit_discount_in_customer_currency = SKIP,
|
1141
1108
|
effective_discount_in_customer_currency = SKIP,
|
1142
1109
|
va_ton_net_amount_in_customer_currency = SKIP,
|
1143
|
-
discount_type = SKIP,
|
1144
|
-
|
1145
|
-
|
1146
|
-
|
1147
|
-
|
1148
|
-
|
1149
|
-
|
1150
|
-
|
1151
|
-
|
1152
|
-
payer_number = SKIP,
|
1153
|
-
payer_name = SKIP,
|
1154
|
-
card_expiry_period = SKIP,
|
1155
|
-
authorisation_code = SKIP,
|
1156
|
-
transaction_id = SKIP,
|
1157
|
-
transaction_line = SKIP,
|
1158
|
-
allow_clearing = SKIP,
|
1159
|
-
crm_number = SKIP,
|
1160
|
-
dispute_status = SKIP,
|
1161
|
-
rebate_rate = SKIP,
|
1110
|
+
discount_type = SKIP, transaction_status = SKIP,
|
1111
|
+
sales_item_id = SKIP, payer_group = SKIP,
|
1112
|
+
payer_group_name = SKIP, refund_flag = SKIP,
|
1113
|
+
original_sales_item_id = SKIP, delco_name = SKIP,
|
1114
|
+
delco_code = SKIP, payer_number = SKIP, payer_name = SKIP,
|
1115
|
+
card_expiry_period = SKIP, authorisation_code = SKIP,
|
1116
|
+
transaction_id = SKIP, transaction_line = SKIP,
|
1117
|
+
allow_clearing = SKIP, crm_number = SKIP,
|
1118
|
+
dispute_status = SKIP, rebate_rate = SKIP,
|
1162
1119
|
del_co_to_col_co_exchange_rate = SKIP,
|
1163
|
-
net_euro_amount = SKIP,
|
1164
|
-
|
1165
|
-
|
1166
|
-
parent_customer_number = SKIP,
|
1167
|
-
parent_customer_name = SKIP,
|
1168
|
-
parent_customer_id = SKIP,
|
1120
|
+
net_euro_amount = SKIP, euro_rebate_amount = SKIP,
|
1121
|
+
euro_vat_amount = SKIP, parent_customer_number = SKIP,
|
1122
|
+
parent_customer_name = SKIP, parent_customer_id = SKIP,
|
1169
1123
|
incoming_site_number = SKIP,
|
1170
1124
|
incoming_site_description = SKIP,
|
1171
|
-
incoming_currency_code = SKIP,
|
1172
|
-
|
1173
|
-
|
1174
|
-
correction_flag = SKIP,
|
1175
|
-
additional1 = SKIP,
|
1176
|
-
additional2 = SKIP,
|
1177
|
-
additional3 = SKIP,
|
1125
|
+
incoming_currency_code = SKIP, incoming_product_code = SKIP,
|
1126
|
+
credit_debit_code = SKIP, correction_flag = SKIP,
|
1127
|
+
additional1 = SKIP, additional2 = SKIP, additional3 = SKIP,
|
1178
1128
|
additional4 = SKIP,
|
1179
1129
|
rebateon_net_amount_in_customer_currency = SKIP,
|
1180
1130
|
rebateon_net_amount_in_transaction_currency = SKIP,
|
1181
|
-
network_code = SKIP,
|
1182
|
-
trn_identifier = SKIP,
|
1183
|
-
card_type = SKIP,
|
1131
|
+
network_code = SKIP, trn_identifier = SKIP, card_type = SKIP,
|
1184
1132
|
delco_list_price_unit_net = SKIP,
|
1185
1133
|
delco_retail_price_unit_net = SKIP,
|
1186
1134
|
delco_retail_price_unit_gross = SKIP,
|
@@ -62,12 +62,8 @@ module ShellDataReportingApIs
|
|
62
62
|
[]
|
63
63
|
end
|
64
64
|
|
65
|
-
def initialize(access_token = nil,
|
66
|
-
|
67
|
-
expires_in = SKIP,
|
68
|
-
scope = SKIP,
|
69
|
-
expiry = SKIP,
|
70
|
-
refresh_token = SKIP)
|
65
|
+
def initialize(access_token = nil, token_type = nil, expires_in = SKIP,
|
66
|
+
scope = SKIP, expiry = SKIP, refresh_token = SKIP)
|
71
67
|
@access_token = access_token
|
72
68
|
@token_type = token_type
|
73
69
|
@expires_in = expires_in unless expires_in == SKIP
|
@@ -294,38 +294,27 @@ module ShellDataReportingApIs
|
|
294
294
|
]
|
295
295
|
end
|
296
296
|
|
297
|
-
def initialize(amount_due = SKIP,
|
298
|
-
amount_not_overdue = SKIP,
|
297
|
+
def initialize(amount_due = SKIP, amount_not_overdue = SKIP,
|
299
298
|
amount_overdue = SKIP,
|
300
|
-
amount_overdue_from_unallocated = SKIP,
|
301
|
-
amount_paid = SKIP,
|
299
|
+
amount_overdue_from_unallocated = SKIP, amount_paid = SKIP,
|
302
300
|
balance_on_this_statement = SKIP,
|
303
|
-
billing_currency_code = SKIP,
|
304
|
-
|
305
|
-
credit_limit = SKIP,
|
306
|
-
credit_limit_currency_code = SKIP,
|
301
|
+
billing_currency_code = SKIP, billing_currency_symbol = SKIP,
|
302
|
+
credit_limit = SKIP, credit_limit_currency_code = SKIP,
|
307
303
|
credit_limit_currency_symbol = SKIP,
|
308
304
|
credit_limit_in_customer_currency = SKIP,
|
309
|
-
currency_code = SKIP,
|
310
|
-
|
311
|
-
fully_paid = SKIP,
|
312
|
-
last_payment_currency_code = SKIP,
|
305
|
+
currency_code = SKIP, currency_symbol = SKIP,
|
306
|
+
fully_paid = SKIP, last_payment_currency_code = SKIP,
|
313
307
|
last_payment_currency_symbol = SKIP,
|
314
|
-
last_payment_date = SKIP,
|
315
|
-
|
316
|
-
|
317
|
-
|
318
|
-
payer_number = SKIP,
|
319
|
-
payment_due_date = SKIP,
|
320
|
-
so_a_reference_number = SKIP,
|
321
|
-
statement_date = SKIP,
|
308
|
+
last_payment_date = SKIP, last_payment_value = SKIP,
|
309
|
+
outstanding_balance = SKIP, payer_id = SKIP,
|
310
|
+
payer_number = SKIP, payment_due_date = SKIP,
|
311
|
+
so_a_reference_number = SKIP, statement_date = SKIP,
|
322
312
|
statement_of_account_id = SKIP,
|
323
313
|
total_billing_documents = SKIP,
|
324
314
|
total_net_amount_billing_currency = SKIP,
|
325
315
|
total_summary_billing_documents = SKIP,
|
326
316
|
total_vat_amount_billing_currency = SKIP,
|
327
|
-
unallocated_payment = SKIP,
|
328
|
-
local_currency_code = SKIP,
|
317
|
+
unallocated_payment = SKIP, local_currency_code = SKIP,
|
329
318
|
local_currency_symbol = SKIP,
|
330
319
|
local_currency_exchange_rate = SKIP)
|
331
320
|
@amount_due = amount_due unless amount_due == SKIP
|
@@ -96,14 +96,9 @@ module ShellDataReportingApIs
|
|
96
96
|
]
|
97
97
|
end
|
98
98
|
|
99
|
-
def initialize(is_default = false,
|
100
|
-
|
101
|
-
|
102
|
-
col_co_country_code = SKIP,
|
103
|
-
payer_group_id = SKIP,
|
104
|
-
payer_group = SKIP,
|
105
|
-
payer_id = SKIP,
|
106
|
-
payer_number = SKIP,
|
99
|
+
def initialize(is_default = false, colco_id = SKIP, colco_code = SKIP,
|
100
|
+
col_co_country_code = SKIP, payer_group_id = SKIP,
|
101
|
+
payer_group = SKIP, payer_id = SKIP, payer_number = SKIP,
|
107
102
|
payer_name = SKIP)
|
108
103
|
@is_default = is_default unless is_default == SKIP
|
109
104
|
@colco_id = colco_id unless colco_id == SKIP
|