projects / photoprint.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 221f5fb)
Mise à jour des templates / script pour les inscriptions client.
authorBenoît Pin <benoit.pin@gmail.com>
Mon, 1 Sep 2014 18:50:28 +0000 (20:50 +0200)
committerBenoît Pin <benoit.pin@gmail.com>
Mon, 1 Sep 2014 18:50:28 +0000 (20:50 +0200)
skins/customer_add_control.py patch | blob | history
skins/customer_join_form.py patch | blob | history
skins/customer_join_template.pt patch | blob | history
skins/customer_login_form.pt patch | blob | history
skins/validatePrivateAccess.py [new file with mode: 0755] patch | blob

diff --git a/skins/customer_add_control.py b/skins/customer_add_control.py
index 274f4c6..8280dbc 100755 (executable)
--- a/skins/customer_add_control.py
+++ b/skins/customer_add_control.py
@@ -1,6 +1,6 @@
 ##parameters=**kw
 from Products.CMFCore.utils import getToolByName
 ##parameters=**kw
 from Products.CMFCore.utils import getToolByName
-from Products.realis.utils import translate
+from Products.photoprint.utils import translate
 from Products.CMFDefault.utils import translate as cmf_translate
 rtool = getToolByName(context, 'portal_registration')
 ptool = getToolByName(context, 'portal_properties')
 from Products.CMFDefault.utils import translate as cmf_translate
 rtool = getToolByName(context, 'portal_registration')
 ptool = getToolByName(context, 'portal_properties')
diff --git a/skins/customer_join_form.py b/skins/customer_join_form.py
index 4df2848..13422ea 100755 (executable)
--- a/skins/customer_join_form.py
+++ b/skins/customer_join_form.py
@@ -1,6 +1,6 @@
 ##parameters=add=''
 from Products.CMFCore.utils import getToolByName
 ##parameters=add=''
 from Products.CMFCore.utils import getToolByName
-from Products.realis.utils import translate
+from Products.Plinn.utils import translate
 from ZTUtils import make_query as mq
 _ = lambda msg : translate(msg, context)
 ptool = getToolByName(script, 'portal_properties')
 from ZTUtils import make_query as mq
 _ = lambda msg : translate(msg, context)
 ptool = getToolByName(script, 'portal_properties')
@@ -17,7 +17,8 @@ fg = lambda name : form.get(name,'').strip()
 
 if add and \
        context.validatePassword(**form) and \
 
 if add and \
        context.validatePassword(**form) and \
-       context.customer_add_control(**form) :
+       context.customer_add_control(**form) and \
+       context.validatePrivateAccess(**form) :
        came_from = fg('came_from')
        if came_from :
                return context.setRedirect(     atool, 'user/logged_in'
        came_from = fg('came_from')
        if came_from :
                return context.setRedirect(     atool, 'user/logged_in'
@@ -39,6 +40,9 @@ continuationFields = [
        , 'password'
        , 'confirm'
        , 'send_password'
        , 'password'
        , 'confirm'
        , 'send_password'
+       , 'wedding_id'
+       , 'wedding_password'
+       , 'wedding_password_confirm'
        , 'billing_address'
        , 'billing_city'
        , 'billing_zipcode'
        , 'billing_address'
        , 'billing_city'
        , 'billing_zipcode'
diff --git a/skins/customer_join_template.pt b/skins/customer_join_template.pt
index 7799f6f..acbf54c 100644 (file)
--- a/skins/customer_join_template.pt
+++ b/skins/customer_join_template.pt
@@ -2,7 +2,7 @@
   <head>
     <meta http-equiv="content-type" content="text/html;charset=UTF-8"/>
   </head>
   <head>
     <meta http-equiv="content-type" content="text/html;charset=UTF-8"/>
   </head>
-  <body metal:fill-slot="main_no_tabs" i18n:domain="realis"
+  <body metal:fill-slot="main_no_tabs" i18n:domain="plinn"
         tal:omit-tag="">
     <div tal:condition="python:options.get('came_from', '').endswith('/my_cart')"
          tal:define="step_authentication python:True" tal:omit-tag="">
         tal:omit-tag="">
     <div tal:condition="python:options.get('came_from', '').endswith('/my_cart')"
          tal:define="step_authentication python:True" tal:omit-tag="">
@@ -69,6 +69,34 @@
         <tr>
           <td colspan="2"><hr/></td>
         </tr>
         <tr>
           <td colspan="2"><hr/></td>
         </tr>
+        <tr>
+          <td colspan="2" style="text-align:center">
+            <h3>Accès à des images privées</h3>
+            veuillez entrer le code d'accès pour accéder / acheter les images<br/>
+            d'un événement privé couvert par les photographes de notre agence.
+          </td>
+        </tr>
+        <tr>
+          <th>Identifiant collection privée</th>
+          <td>
+            <input type="text" name="wedding_id" tal:attributes="value options/wedding_id"/>
+          </td>
+        </tr>
+        <tr>
+          <th>Mot de passe associé</th>
+          <td>
+            <input type="password" name="wedding_password" tal:attributes="value options/wedding_password" />
+          </td>
+        </tr>
+        <tr>
+          <th>Confirmation du mot de passe</th>
+          <td>
+            <input type="password" name="wedding_password_confirm" tal:attributes="value options/wedding_password_confirm" />
+          </td>
+        </tr>
+        <tr>
+          <td colspan="2"><hr/></td>
+        </tr>
         <tr>
           <td colspan="2" style="text-align:center">
             <h3 i18n:translate="">Billing informations</h3>
         <tr>
           <td colspan="2" style="text-align:center">
             <h3 i18n:translate="">Billing informations</h3>
diff --git a/skins/customer_login_form.pt b/skins/customer_login_form.pt
index d5fc2e5..7e9b601 100644 (file)
--- a/skins/customer_login_form.pt
+++ b/skins/customer_login_form.pt
@@ -4,7 +4,7 @@
   <head>
     <meta http-equiv="content-type" content="text/html;charset=UTF-8"/>
   </head>
   <head>
     <meta http-equiv="content-type" content="text/html;charset=UTF-8"/>
   </head>
-  <body metal:fill-slot="main_no_tabs" i18n:domain="realis" tal:omit-tag="">
+  <body metal:fill-slot="main_no_tabs" i18n:domain="photoprint" tal:omit-tag="">
     <div tal:condition="python:request.get('came_from', '').endswith('/my_cart')"
          tal:define="step_authentication python:True"
          tal:omit-tag="">
     <div tal:condition="python:request.get('came_from', '').endswith('/my_cart')"
          tal:define="step_authentication python:True"
          tal:omit-tag="">
diff --git a/skins/validatePrivateAccess.py b/skins/validatePrivateAccess.py
new file mode 100755 (executable)
index 0000000..19e3a7d
--- /dev/null
+++ b/skins/validatePrivateAccess.py
@@ -0,0 +1,16 @@
+##parameters=**kw
+kg = lambda name : kw.get(name,'').strip()
+
+weddingId = kg('wedding_id')
+if not weddingId :
+       return True
+
+else :
+       password = kg('wedding_password')
+       confirm = kg('wedding_password_confirm')
+       memberId = kg('member_id')
+       msg = context.grantAccess(context, weddingId, password, confirm, memberId)
+       if msg :
+               return context.setStatus(False, msg)
+       else :
+               return True
photoprint Plinn product