Skip to content

Cyclos 4.11 #2

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
mmuman wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Cyclos 4.11 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdcdff7
Update Cyclos to 4.11
mmuman Feb 14, 2019
e48c007
[FIX] Add new API parameters for Cyclos 4.11
mmuman Dec 22, 2018
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
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ services:
- eusko_net

cyclos-app:
image: cyclos/cyclos:4.6.2
image: cyclos/cyclos:4.11
ports:
- 8081:8080
environment:
Expand Down
8 changes: 6 additions & 2 deletions etc/cyclos/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -931,7 +931,8 @@ def create_payment_transfer_type(name, direction, from_account_type_id,
to_account_type_id, custom_fields=[],
status_flows=[], initial_statuses=[],
channels=[ID_CANAL_MAIN_WEB, ID_CANAL_WEB_SERVICES],
principal_types=[]):
principal_types=[],
description_availability="OPTIONAL"):
logger.info('Création du type de paiement "%s"...', name)
r = requests.post(eusko_web_services + 'transferType/save',
headers=headers,
Expand All @@ -948,6 +949,7 @@ def create_payment_transfer_type(name, direction, from_account_type_id,
'maxChargebackTime': {'amount': '2', 'field': 'MONTHS'},
'channels': channels,
'principalTypes': principal_types,
'descriptionAvailability': description_availability,
})
check_request_status(r)
payment_transfer_type_id = r.json()['result']
Expand All @@ -962,7 +964,8 @@ def create_payment_transfer_type(name, direction, from_account_type_id,


def create_generated_transfer_type(name, direction, from_account_type_id,
to_account_type_id):
to_account_type_id,
description_availability="OPTIONAL"):
logger.info('Création du type de paiement "%s"...', name)
r = requests.post(eusko_web_services + 'transferType/save',
headers=headers,
Expand All @@ -973,6 +976,7 @@ def create_generated_transfer_type(name, direction, from_account_type_id,
'direction': direction,
'from': from_account_type_id,
'to': to_account_type_id,
'descriptionAvailability': description_availability,
})
check_request_status(r)
generated_transfer_type_id = r.json()['result']
Expand Down