Skip to content

erp5
erp5
Commit ceaef5a3 authored by Rafael Monnerat's avatar Rafael Monnerat
5 Browse files
Options

erp5_payzen_secure_payment: Move Payzen to REST API 

See merge request nexedi/erp5!1326
parents 36477a37 d6dcd5a4
Pipeline #13046 running with stage
    Expand all Show whitespace changes
    Inline Side-by-side
    Showing with 430 additions and 270 deletions
    bt5/erp5_payzen_secure_payment/DocumentTemplateItem/portal_components/document.erp5.PayzenService.xml
    View file @ ceaef5a3
    ......@@ -6,10 +6,22 @@
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_recorded_property_dict</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>default_reference</string> </key>
    <value> <string>PayzenService</string> </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>document.erp5.PayzenService</string> </value>
    ......@@ -24,6 +36,24 @@
    <none/>
    </value>
    </item>
    <item>
    <key> <string>text_content_error_message</string> </key>
    <value>
    <tuple/>
    </value>
    </item>
    <item>
    <key> <string>text_content_warning_message</string> </key>
    <value>
    <tuple>
    <string>W: 24, 4: Redefining name \'tz\' from outer scope (line 15) (redefined-outer-name)</string>
    <string>W: 23, 4: Redefining name \'present\' from outer scope (line 14) (redefined-outer-name)</string>
    <string>W:190, 4: Unreachable code (unreachable)</string>
    <string>W:195, 4: Unreachable code (unreachable)</string>
    <string>W:200, 4: Unreachable code (unreachable)</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>version</string> </key>
    <value> <string>erp5</string> </value>
    ......@@ -31,13 +61,28 @@
    <item>
    <key> <string>workflow_history</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="PersistentMapping" module="Persistence.mapping"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>data</string> </key>
    <value>
    <dictionary/>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="3" aka="AAAAAAAAAAM=">
    <pickle>
    <global name="PersistentMapping" module="Persistence.mapping"/>
    </pickle>
    ......@@ -50,7 +95,7 @@
    <item>
    <key> <string>component_validation_workflow</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
    </value>
    </item>
    </dictionary>
    ......@@ -59,7 +104,7 @@
    </dictionary>
    </pickle>
    </record>
    <record id="3" aka="AAAAAAAAAAM=">
    <record id="4" aka="AAAAAAAAAAQ=">
    <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
    </pickle>
    ......@@ -74,33 +119,6 @@
    <key> <string>action</string> </key>
    <value> <string>validate</string> </value>
    </item>
    <item>
    <key> <string>actor</string> </key>
    <value> <string>ERP5TypeTestCase</string> </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>time</string> </key>
    <value>
    <object>
    <klass>
    <global name="DateTime" module="DateTime.DateTime"/>
    </klass>
    <tuple>
    <none/>
    </tuple>
    <state>
    <tuple>
    <float>1377844605.75</float>
    <string>GMT+9</string>
    </tuple>
    </state>
    </object>
    </value>
    </item>
    <item>
    <key> <string>validation_state</string> </key>
    <value> <string>validated</string> </value>
    ......
    bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/service_api_key_property.xml 0 → 100644
    View file @ ceaef5a3
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="Standard Property" module="erp5.portal_type"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>categories</string> </key>
    <value>
    <tuple>
    <string>elementary_type/string</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>service_api_key_property</string> </value>
    </item>
    <item>
    <key> <string>portal_type</string> </key>
    <value> <string>Standard Property</string> </value>
    </item>
    <item>
    <key> <string>read_permission</string> </key>
    <value> <string>Manage portal</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_payzen_secure_payment/SkinTemplateItem/portal_skins/erp5_payzen_secure_payment/PayzenService_view.xml
    View file @ ceaef5a3
    ......@@ -106,6 +106,7 @@
    <list>
    <string>my_link_url_string</string>
    <string>my_service_username</string>
    <string>my_service_api_key</string>
    <string>my_service_password</string>
    <string>my_payzen_vads_ctx_mode</string>
    <string>my_payzen_vads_version</string>
    ......
    bt5/erp5_payzen_secure_payment/SkinTemplateItem/portal_skins/erp5_payzen_secure_payment/PayzenService_view/my_service_password.xml
    View file @ ceaef5a3
    ......@@ -227,6 +227,10 @@
    <key> <string>hidden</string> </key>
    <value> <int>0</int> </value>
    </item>
    <item>
    <key> <string>input_type</string> </key>
    <value> <string>text</string> </value>
    </item>
    <item>
    <key> <string>max_length</string> </key>
    <value> <string></string> </value>
    ......@@ -237,7 +241,7 @@
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string>Certificate</string> </value>
    <value> <string>Key</string> </value>
    </item>
    <item>
    <key> <string>truncate</string> </key>
    ......
    bt5/erp5_payzen_secure_payment/SkinTemplateItem/portal_skins/erp5_payzen_secure_payment/PayzenService_view/my_service_username.xml
    View file @ ceaef5a3
    ......@@ -227,6 +227,10 @@
    <key> <string>hidden</string> </key>
    <value> <int>0</int> </value>
    </item>
    <item>
    <key> <string>input_type</string> </key>
    <value> <string>text</string> </value>
    </item>
    <item>
    <key> <string>max_length</string> </key>
    <value> <string></string> </value>
    ......@@ -237,7 +241,7 @@
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string>VADS Site ID</string> </value>
    <value> <string>User</string> </value>
    </item>
    <item>
    <key> <string>truncate</string> </key>
    ......
    • Jérome Perrin @jerome ·
      Owner

      @rafael @tomo I think this erp5-vifib branch was rebased. Tests on 1.0 now fail with

      2021-01-21 23:21:14 slapos[16081] INFO fatal: Could not parse object 'ceaef5a3c5469a04f5650376cda54cb162abf38a'.

      wouldn't it be easier to use a dedicated private repository for the vifib fork ?

    • Thomas Gambier 🚴🏼 @tomo ·
      Owner

      wouldn't it be easier to use a dedicated private repository for the vifib fork ?

      one day, we will merge our changes to master :)

      Anyway, as soon as we do rebase instead of merge, we can lose our commits at any time so it means we must tag all the commits that appear in slapos 1.0 branch to be sure to never lose them due to garbage collector.

    • Jérome Perrin @jerome ·
      Owner

      Thanks, yes, hopefully these changes will be merged :)

      Note that it does not have to be a tag, it can also be a branch. Also branches can be a folder, so we can use vifib/something. Not sure it's better, it's just possible.

      FYI, this commit will not be garbage collected because there is discussion on it. What gitlab uses is another namespace, branches are in refs/heads/* and in git config we have by default:

      [remote "origin"]
  url = https://lab.nexedi.com/nexedi/erp5.git
  fetch = +refs/heads/*:refs/remotes/origin/*

      gitlab uses refs/keep-around to "keep around" (prevent garbage collection) of commits, so if you change git config to :

      [remote "origin"]
  url = https://lab.nexedi.com/nexedi/erp5.git
  fetch = +refs/heads/*:refs/remotes/origin/*
  fetch = +refs/keep-around/*:refs/remotes/keep-around/*

      and git fetch again, you can get this commit locally. Then you can push it again in a new branch and this repairs the failing build.

      There's this Could not parse object error, because the commit is not fetched by default, because git only fetches branches (refs/heads) and tags (refs/tags), it's still there somewhere in refs/keep-around, which is not fetched by default.

    • Thomas Gambier 🚴🏼 @tomo ·
      Owner

      Oups, I didn't see your comment :( it would have been much easier for me...

      So I went to git clone --mirror in order to retrieve everything and then I tagged from there. I used erp5-vifib-20201229 tag name.

    • Rafael Monnerat @rafael ·
      Owner

      it was my mistake to not push a tag along with the rebase, sorry on this and thanks to @tomo for fix.

    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
    GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7