Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Thomas Gambier
slapos.core
Commits
d7a40189
Commit
d7a40189
authored
Nov 21, 2012
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge vifib_data_payzen into slapos_payzen
parent
e478ad28
Changes
25
Hide whitespace changes
Inline
Side-by-side
Showing
25 changed files
with
13 additions
and
26 deletions
+13
-26
master/bt5/slapos_payzen/PathTemplateItem/portal_integrations/slapos_payzen_integration.xml
...ateItem/portal_integrations/slapos_payzen_integration.xml
+2
-2
master/bt5/slapos_payzen/PathTemplateItem/portal_integrations/slapos_payzen_integration/Causality.xml
...rtal_integrations/slapos_payzen_integration/Causality.xml
+0
-0
master/bt5/slapos_payzen/PathTemplateItem/portal_integrations/slapos_payzen_integration/Resource.xml
...ortal_integrations/slapos_payzen_integration/Resource.xml
+0
-0
master/bt5/slapos_payzen/PathTemplateItem/portal_integrations/slapos_payzen_integration/Resource/978.xml
...l_integrations/slapos_payzen_integration/Resource/978.xml
+0
-0
master/bt5/slapos_payzen/PathTemplateItem/portal_secure_payments/slapos_payzen.xml
...PathTemplateItem/portal_secure_payments/slapos_payzen.xml
+1
-1
master/bt5/slapos_payzen/PathTemplateItem/portal_secure_payments/slapos_payzen/default_link.xml
...tem/portal_secure_payments/slapos_payzen/default_link.xml
+0
-0
master/bt5/slapos_payzen/PathTemplateItem/portal_secure_payments/slapos_payzen/wsdl_link.xml
...teItem/portal_secure_payments/slapos_payzen/wsdl_link.xml
+0
-0
master/bt5/slapos_payzen/PathTemplateItem/sale_trade_condition_module/payzen_sale_trade_condition.xml
...le_trade_condition_module/payzen_sale_trade_condition.xml
+0
-0
master/bt5/slapos_payzen/ToolTemplateItem/portal_secure_payments.xml
...slapos_payzen/ToolTemplateItem/portal_secure_payments.xml
+0
-0
master/bt5/slapos_payzen/bt/revision
master/bt5/slapos_payzen/bt/revision
+1
-1
master/bt5/slapos_payzen/bt/template_path_list
master/bt5/slapos_payzen/bt/template_path_list
+8
-1
master/bt5/slapos_payzen/bt/template_tool_id_list
master/bt5/slapos_payzen/bt/template_tool_id_list
+0
-0
master/bt5/vifib_data_payzen/bt/change_log
master/bt5/vifib_data_payzen/bt/change_log
+0
-2
master/bt5/vifib_data_payzen/bt/copyright_list
master/bt5/vifib_data_payzen/bt/copyright_list
+0
-1
master/bt5/vifib_data_payzen/bt/dependency_list
master/bt5/vifib_data_payzen/bt/dependency_list
+0
-2
master/bt5/vifib_data_payzen/bt/description
master/bt5/vifib_data_payzen/bt/description
+0
-1
master/bt5/vifib_data_payzen/bt/license
master/bt5/vifib_data_payzen/bt/license
+0
-1
master/bt5/vifib_data_payzen/bt/revision
master/bt5/vifib_data_payzen/bt/revision
+0
-1
master/bt5/vifib_data_payzen/bt/template_format_version
master/bt5/vifib_data_payzen/bt/template_format_version
+0
-1
master/bt5/vifib_data_payzen/bt/template_path_list
master/bt5/vifib_data_payzen/bt/template_path_list
+0
-7
master/bt5/vifib_data_payzen/bt/title
master/bt5/vifib_data_payzen/bt/title
+0
-1
master/bt5/vifib_data_payzen/bt/version
master/bt5/vifib_data_payzen/bt/version
+0
-1
master/bt5/vifib_erp5/bt/dependency_list
master/bt5/vifib_erp5/bt/dependency_list
+0
-1
master/bt5/vifib_erp5/bt/revision
master/bt5/vifib_erp5/bt/revision
+1
-1
master/product/Vifib/tests/VifibMixin.py
master/product/Vifib/tests/VifibMixin.py
+0
-1
No files found.
master/bt5/
vifib_data_payzen/PathTemplateItem/portal_integrations/vifib
_payzen_integration.xml
→
master/bt5/
slapos_payzen/PathTemplateItem/portal_integrations/slapos
_payzen_integration.xml
View file @
d7a40189
...
@@ -92,7 +92,7 @@
...
@@ -92,7 +92,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
vifib
_payzen_integration
</string>
</value>
<value>
<string>
slapos
_payzen_integration
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
language
</string>
</key>
<key>
<string>
language
</string>
</key>
...
@@ -106,7 +106,7 @@
...
@@ -106,7 +106,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
title
</string>
</key>
<key>
<string>
title
</string>
</key>
<value>
<string>
Vifib
Payzen Integration
</string>
</value>
<value>
<string>
SlapOS
Payzen Integration
</string>
</value>
</item>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
...
...
master/bt5/
vifib_data_payzen/PathTemplateItem/portal_integrations/vifib
_payzen_integration/Causality.xml
→
master/bt5/
slapos_payzen/PathTemplateItem/portal_integrations/slapos
_payzen_integration/Causality.xml
View file @
d7a40189
File moved
master/bt5/
vifib_data_payzen/PathTemplateItem/portal_integrations/vifib
_payzen_integration/Resource.xml
→
master/bt5/
slapos_payzen/PathTemplateItem/portal_integrations/slapos
_payzen_integration/Resource.xml
View file @
d7a40189
File moved
master/bt5/
vifib_data_payzen/PathTemplateItem/portal_integrations/vifib
_payzen_integration/Resource/978.xml
→
master/bt5/
slapos_payzen/PathTemplateItem/portal_integrations/slapos
_payzen_integration/Resource/978.xml
View file @
d7a40189
File moved
master/bt5/
vifib_data_payzen/PathTemplateItem/portal_secure_payments/vifib
_payzen.xml
→
master/bt5/
slapos_payzen/PathTemplateItem/portal_secure_payments/slapos
_payzen.xml
View file @
d7a40189
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
vifib
_payzen
</string>
</value>
<value>
<string>
slapos
_payzen
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
payzen_vads_action_mode
</string>
</key>
<key>
<string>
payzen_vads_action_mode
</string>
</key>
...
...
master/bt5/
vifib_data_payzen/PathTemplateItem/portal_secure_payments/vifib
_payzen/default_link.xml
→
master/bt5/
slapos_payzen/PathTemplateItem/portal_secure_payments/slapos
_payzen/default_link.xml
View file @
d7a40189
File moved
master/bt5/
vifib_data_payzen/PathTemplateItem/portal_secure_payments/vifib
_payzen/wsdl_link.xml
→
master/bt5/
slapos_payzen/PathTemplateItem/portal_secure_payments/slapos
_payzen/wsdl_link.xml
View file @
d7a40189
File moved
master/bt5/
vifib_data
_payzen/PathTemplateItem/sale_trade_condition_module/payzen_sale_trade_condition.xml
→
master/bt5/
slapos
_payzen/PathTemplateItem/sale_trade_condition_module/payzen_sale_trade_condition.xml
View file @
d7a40189
File moved
master/bt5/
vifib_data
_payzen/ToolTemplateItem/portal_secure_payments.xml
→
master/bt5/
slapos
_payzen/ToolTemplateItem/portal_secure_payments.xml
View file @
d7a40189
File moved
master/bt5/slapos_payzen/bt/revision
View file @
d7a40189
82
83
\ No newline at end of file
\ No newline at end of file
master/bt5/slapos_payzen/bt/template_path_list
View file @
d7a40189
portal_alarms/slapos_payzen_update_confirmed_payment
portal_alarms/slapos_payzen_update_confirmed_payment
portal_alarms/slapos_payzen_update_started_payment
portal_alarms/slapos_payzen_update_started_payment
\ No newline at end of file
portal_integrations/slapos_payzen_integration
portal_integrations/slapos_payzen_integration/Causality
portal_integrations/slapos_payzen_integration/Resource
portal_integrations/slapos_payzen_integration/Resource/**
portal_secure_payments/slapos_payzen
portal_secure_payments/slapos_payzen/**
sale_trade_condition_module/payzen_sale_trade_condition
\ No newline at end of file
master/bt5/
vifib_data
_payzen/bt/template_tool_id_list
→
master/bt5/
slapos
_payzen/bt/template_tool_id_list
View file @
d7a40189
File moved
master/bt5/vifib_data_payzen/bt/change_log
deleted
100644 → 0
View file @
e478ad28
2011/10/06 Łukasz Nowak
* Initial release.
\ No newline at end of file
master/bt5/vifib_data_payzen/bt/copyright_list
deleted
100644 → 0
View file @
e478ad28
Vifib
\ No newline at end of file
master/bt5/vifib_data_payzen/bt/dependency_list
deleted
100644 → 0
View file @
e478ad28
vifib_payzen
vifib_data
\ No newline at end of file
master/bt5/vifib_data_payzen/bt/description
deleted
100644 → 0
View file @
e478ad28
Payzen integration data for Vifib.net
\ No newline at end of file
master/bt5/vifib_data_payzen/bt/license
deleted
100644 → 0
View file @
e478ad28
GPL
\ No newline at end of file
master/bt5/vifib_data_payzen/bt/revision
deleted
100644 → 0
View file @
e478ad28
11
\ No newline at end of file
master/bt5/vifib_data_payzen/bt/template_format_version
deleted
100644 → 0
View file @
e478ad28
1
\ No newline at end of file
master/bt5/vifib_data_payzen/bt/template_path_list
deleted
100644 → 0
View file @
e478ad28
portal_integrations/vifib_payzen_integration
portal_integrations/vifib_payzen_integration/Causality
portal_integrations/vifib_payzen_integration/Resource
portal_integrations/vifib_payzen_integration/Resource/**
portal_secure_payments/vifib_payzen
portal_secure_payments/vifib_payzen/**
sale_trade_condition_module/payzen_sale_trade_condition
\ No newline at end of file
master/bt5/vifib_data_payzen/bt/title
deleted
100644 → 0
View file @
e478ad28
vifib_data_payzen
\ No newline at end of file
master/bt5/vifib_data_payzen/bt/version
deleted
100644 → 0
View file @
e478ad28
Vifib 0.5
\ No newline at end of file
master/bt5/vifib_erp5/bt/dependency_list
View file @
d7a40189
...
@@ -13,7 +13,6 @@ vifib_base
...
@@ -13,7 +13,6 @@ vifib_base
vifib_configurator
vifib_configurator
vifib_data
vifib_data
slapos_category
slapos_category
vifib_data_payzen
vifib_data_simulation
vifib_data_simulation
vifib_payzen
vifib_payzen
vifib_slap
vifib_slap
...
...
master/bt5/vifib_erp5/bt/revision
View file @
d7a40189
568
569
\ No newline at end of file
\ No newline at end of file
master/product/Vifib/tests/VifibMixin.py
View file @
d7a40189
...
@@ -115,7 +115,6 @@ class testVifibMixin(ERP5TypeTestCase):
...
@@ -115,7 +115,6 @@ class testVifibMixin(ERP5TypeTestCase):
'vifib_upgrader'
,
'vifib_upgrader'
,
'vifib_slapos_accounting'
,
'vifib_slapos_accounting'
,
'vifib_data_simulation'
,
'vifib_data_simulation'
,
'vifib_data_payzen'
,
'vifib_configurator'
,
'vifib_configurator'
,
'erp5_ui_test'
,
'erp5_ui_test'
,
# All business templates above are the dependency
# All business templates above are the dependency
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment