Commit c64ff63f authored by Rafael Monnerat's avatar Rafael Monnerat

Fixes to Vifib Master

See merge request nexedi/slapos.core!276
parents 38888d8a 698d908b
...@@ -3,6 +3,10 @@ ...@@ -3,6 +3,10 @@
<type>Acknowledgement</type> <type>Acknowledgement</type>
<workflow>local_permission_slapos_interaction_workflow</workflow> <workflow>local_permission_slapos_interaction_workflow</workflow>
</chain> </chain>
<chain>
<type>Cloud Contract</type>
<workflow>local_permission_slapos_interaction_workflow</workflow>
</chain>
<chain> <chain>
<type>Computer</type> <type>Computer</type>
<workflow>local_permission_slapos_interaction_workflow, slapos_erp5_interaction_workflow</workflow> <workflow>local_permission_slapos_interaction_workflow, slapos_erp5_interaction_workflow</workflow>
......
...@@ -2340,11 +2340,7 @@ class TestCloudContract(TestSlapOSGroupRoleSecurityMixin): ...@@ -2340,11 +2340,7 @@ class TestCloudContract(TestSlapOSGroupRoleSecurityMixin):
reference = 'TESTPERSON-%s' % self.generateNewId() reference = 'TESTPERSON-%s' % self.generateNewId()
person = self.portal.person_module.newContent(portal_type='Person', person = self.portal.person_module.newContent(portal_type='Person',
reference=reference) reference=reference)
contract = self.portal.cloud_contract_module.newContent( contract = person.Person_generateCloudContract(batch=True)
portal_type='Cloud Contract',
destination_section_value=person,
)
contract.updateLocalRolesOnSecurityGroups()
self.assertSecurityGroup(contract, self.assertSecurityGroup(contract,
['G-COMPANY', person.getUserId(), self.user_id], False) ['G-COMPANY', person.getUserId(), self.user_id], False)
self.assertRoles(contract, 'G-COMPANY', ['Assignor']) self.assertRoles(contract, 'G-COMPANY', ['Assignor'])
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>actbox_category</string> </key>
<value> <string>workflow</string> </value>
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>activate_script_name</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>after_script_name</string> </key>
<value>
<list>
<string>Base_updateAllLocalRoles</string>
</list>
</value>
</item>
<item>
<key> <string>before_commit_script_name</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>guard</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>CloudContract_updateDestinationSection</string> </value>
</item>
<item>
<key> <string>method_id</string> </key>
<value>
<list>
<string>_setDestinationSection.*</string>
</list>
</value>
</item>
<item>
<key> <string>once_per_transaction</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>portal_type_filter</string> </key>
<value>
<list>
<string>Cloud Contract</string>
</list>
</value>
</item>
<item>
<key> <string>portal_type_group_filter</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>script_name</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>temporary_document_disallowed</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
<value> <int>2</int> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
Acknowledgement | local_permission_slapos_interaction_workflow Acknowledgement | local_permission_slapos_interaction_workflow
Cloud Contract | local_permission_slapos_interaction_workflow
Computer Model | local_permission_slapos_interaction_workflow Computer Model | local_permission_slapos_interaction_workflow
Computer Network | local_permission_slapos_interaction_workflow Computer Network | local_permission_slapos_interaction_workflow
Computer Network | slapos_erp5_interaction_workflow Computer Network | slapos_erp5_interaction_workflow
......
...@@ -20,15 +20,17 @@ payment_transaction = payzen_event.getDestinationValue(portal_type="Payment Tran ...@@ -20,15 +20,17 @@ payment_transaction = payzen_event.getDestinationValue(portal_type="Payment Tran
now = DateTime() now = DateTime()
payment_transaction.AccountingTransaction_updateStartDate(now) payment_transaction.AccountingTransaction_updateStartDate(now)
_, transaction_id = payment_transaction.PaymentTransaction_generatePayzenId() transaction_date, transaction_number = payment_transaction.PaymentTransaction_generatePayzenId()
if transaction_id is None: if transaction_number is None:
raise ValueError, "Transaction already registered" raise ValueError, "Transaction already registered"
transaction_id = transaction_date.Date().replace("/", "") + "-" + transaction_number
payzen_dict = { payzen_dict = {
'vads_currency': payment_transaction.getResourceValue().Currency_getIntegrationMapping(), 'vads_currency': payment_transaction.getResourceValue().Currency_getIntegrationMapping(),
'vads_amount': str(int(round((payment_transaction.PaymentTransaction_getTotalPayablePrice() * -100), 0))), 'vads_amount': str(int(round((payment_transaction.PaymentTransaction_getTotalPayablePrice() * -100), 0))),
'vads_trans_date': now.toZone('UTC').asdatetime().strftime('%Y%m%d%H%M%S'), 'vads_trans_date': now.toZone('UTC').asdatetime().strftime('%Y%m%d%H%M%S'),
'vads_trans_id': transaction_id, 'vads_trans_id': transaction_number,
'vads_order_id': transaction_id, 'vads_order_id': transaction_id,
'vads_language': 'en', 'vads_language': 'en',
'vads_url_cancel': vads_url_cancel, 'vads_url_cancel': vads_url_cancel,
......
payzen_event = state_change['object'] payzen_event = state_change['object']
payment_transaction = payzen_event.getDestinationValue(portal_type="Payment Transaction") payment_transaction = payzen_event.getDestinationValue(portal_type="Payment Transaction")
transaction_date, transaction_id = payment_transaction.PaymentTransaction_getPayzenId() transaction_date, transaction_number = payment_transaction.PaymentTransaction_getPayzenId()
if transaction_id is None: if transaction_number is None:
raise ValueError('Transaction not registered in payzen integration tool') raise ValueError('Transaction not registered in payzen integration tool')
transaction_id = transaction_date.Date().replace("/", "") + "-" + transaction_number
payment_service = payzen_event.getSourceValue(portal_type="Payzen Service") payment_service = payzen_event.getSourceValue(portal_type="Payzen Service")
data_kw, sent_text, received_text = payment_service.rest_getInfo( data_kw, sent_text, received_text = payment_service.rest_getInfo(
transaction_date.toZone('UTC').asdatetime(), transaction_date.toZone('UTC').asdatetime(),
......
...@@ -15,8 +15,6 @@ ...@@ -15,8 +15,6 @@
<item>Person</item> <item>Person</item>
<item>Price</item> <item>Price</item>
<item>Reference</item> <item>Reference</item>
<item>SlapOSAccountingHostingSubscriptionConstraint</item>
<item>SlaposHostingSubscriptionConstraint</item>
<item>SoftwareInstance</item> <item>SoftwareInstance</item>
<item>Task</item> <item>Task</item>
<item>TextDocument</item> <item>TextDocument</item>
......
...@@ -11,8 +11,6 @@ Subscription Request | HostingSubscription ...@@ -11,8 +11,6 @@ Subscription Request | HostingSubscription
Subscription Request | Person Subscription Request | Person
Subscription Request | Price Subscription Request | Price
Subscription Request | Reference Subscription Request | Reference
Subscription Request | SlapOSAccountingHostingSubscriptionConstraint
Subscription Request | SlaposHostingSubscriptionConstraint
Subscription Request | SoftwareInstance Subscription Request | SoftwareInstance
Subscription Request | Task Subscription Request | Task
Subscription Request | TextDocument Subscription Request | TextDocument
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment