Merge vifib_data_payzen into slapos_payzen

master/bt5/vifib_data_payzen/PathTemplateItem/portal_integrations/vifib_payzen_integration.xml → master/bt5/slapos_payzen/PathTemplateItem/portal_integrations/slapos_payzen_integration.xml

@@ -92,7 +92,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>vifib_payzen_integration</string> </value>
+            <value> <string>slapos_payzen_integration</string> </value>
         </item>
         <item>
             <key> <string>language</string> </key>
@@ -106,7 +106,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Vifib Payzen Integration</string> </value>
+            <value> <string>SlapOS Payzen Integration</string> </value>
         </item>
       </dictionary>
     </pickle>

master/bt5/vifib_data_payzen/PathTemplateItem/portal_secure_payments/vifib_payzen.xml → master/bt5/slapos_payzen/PathTemplateItem/portal_secure_payments/slapos_payzen.xml

@@ -30,7 +30,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>vifib_payzen</string> </value>
+            <value> <string>slapos_payzen</string> </value>
         </item>
         <item>
             <key> <string>payzen_vads_action_mode</string> </key>

master/bt5/slapos_payzen/bt/revision

-82
\ No newline at end of file
+83
\ No newline at end of file

master/bt5/slapos_payzen/bt/template_path_list

 portal_alarms/slapos_payzen_update_confirmed_payment
-portal_alarms/slapos_payzen_update_started_payment
\ No newline at end of file
+portal_alarms/slapos_payzen_update_started_payment
+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/change_log

-2011/10/06 Łukasz Nowak
-* Initial release.
\ No newline at end of file

master/bt5/vifib_data_payzen/bt/copyright_list

-Vifib
\ No newline at end of file

master/bt5/vifib_data_payzen/bt/dependency_list

-vifib_payzen
-vifib_data
\ No newline at end of file

master/bt5/vifib_data_payzen/bt/description

-Payzen integration data for Vifib.net
\ No newline at end of file

master/bt5/vifib_data_payzen/bt/license

-GPL
\ No newline at end of file

master/bt5/vifib_data_payzen/bt/revision

-11
\ No newline at end of file

master/bt5/vifib_data_payzen/bt/template_format_version

-1
\ No newline at end of file

master/bt5/vifib_data_payzen/bt/template_path_list

-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

-vifib_data_payzen
\ No newline at end of file

master/bt5/vifib_data_payzen/bt/version

-Vifib 0.5
\ No newline at end of file

master/bt5/vifib_erp5/bt/dependency_list

@@ -13,7 +13,6 @@ vifib_base
 vifib_configurator
 vifib_data
 slapos_category
-vifib_data_payzen
 vifib_data_simulation
 vifib_payzen
 vifib_slap

master/bt5/vifib_erp5/bt/revision

-568
\ No newline at end of file
+569
\ No newline at end of file

master/product/Vifib/tests/VifibMixin.py

@@ -115,7 +115,6 @@ class testVifibMixin(ERP5TypeTestCase):
       'vifib_upgrader',
       'vifib_slapos_accounting',
       'vifib_data_simulation',
-      'vifib_data_payzen',
       'vifib_configurator',
       'erp5_ui_test',
       # All business templates above are the dependency