Désactivation d'options obsolètes.

Mise en place du script d'annulation d'un paiement PayPal.

diff --git a/locales/en/LC_MESSAGES/photoprint.po b/locales/en/LC_MESSAGES/photoprint.po
index ddc0a0d..f0d7834 100644 (file)
--- a/locales/en/LC_MESSAGES/photoprint.po
+++ b/locales/en/LC_MESSAGES/photoprint.po
@@ -56,10 +56,6 @@ msgstr ""
 msgid "Please enter a phone."
 msgstr ""
 
 msgid "Please enter a phone."
 msgstr ""
 

-#: t/skins/customer_add_control.py:28
-msgid "Please accept general conditions of sales."
-msgstr ""
-

 #: t/skins/customer_join_template.pt:11
 msgid "New customer account"
 msgstr ""
 #: t/skins/customer_join_template.pt:11
 msgid "New customer account"
 msgstr ""


@@ -92,51 +88,39 @@ msgstr ""
 msgid "Password (confirm)"
 msgstr ""
 
 msgid "Password (confirm)"
 msgstr ""
 

-#: t/skins/customer_join_template.pt:60
-msgid "Mail Password?"
-msgstr ""
-
-#: t/skins/customer_join_template.pt:64
-msgid "Check this box to have the password mailed."
-msgstr ""
-
-#: t/skins/customer_join_template.pt:102 t/skins/personalize_form.pt:46
+#: t/skins/customer_join_template.pt:93 t/skins/personalize_form.pt:46

 msgid "Billing informations"
 msgstr ""
 
 msgid "Billing informations"
 msgstr ""
 

-#: t/skins/customer_join_template.pt:106 t/skins/order_view_template.pt:35
+#: t/skins/customer_join_template.pt:97 t/skins/order_view_template.pt:35

 #: t/skins/order_view_template.pt:60 t/skins/personalize_form.pt:50
 msgid "Address"
 msgstr ""
 
 #: t/skins/order_view_template.pt:60 t/skins/personalize_form.pt:50
 msgid "Address"
 msgstr ""
 

-#: t/skins/customer_join_template.pt:113 t/skins/order_view_template.pt:39
+#: t/skins/customer_join_template.pt:104 t/skins/order_view_template.pt:39

 #: t/skins/order_view_template.pt:64 t/skins/personalize_form.pt:57
 msgid "City"
 msgstr ""
 
 #: t/skins/order_view_template.pt:64 t/skins/personalize_form.pt:57
 msgid "City"
 msgstr ""
 

-#: t/skins/customer_join_template.pt:119 t/skins/order_view_template.pt:43
+#: t/skins/customer_join_template.pt:110 t/skins/order_view_template.pt:43

 #: t/skins/order_view_template.pt:68 t/skins/personalize_form.pt:63
 msgid "Zip code"
 msgstr ""
 
 #: t/skins/order_view_template.pt:68 t/skins/personalize_form.pt:63
 msgid "Zip code"
 msgstr ""
 

-#: t/skins/customer_join_template.pt:125 t/skins/order_view_template.pt:47
+#: t/skins/customer_join_template.pt:116 t/skins/order_view_template.pt:47

 #: t/skins/order_view_template.pt:72 t/skins/personalize_form.pt:69
 msgid "Country"
 msgstr ""
 
 #: t/skins/order_view_template.pt:72 t/skins/personalize_form.pt:69
 msgid "Country"
 msgstr ""
 

-#: t/skins/customer_join_template.pt:135 t/skins/personalize_form.pt:79
+#: t/skins/customer_join_template.pt:126 t/skins/personalize_form.pt:79

 msgid "Phone"
 msgstr ""
 
 msgid "Phone"
 msgstr ""
 

-#: t/skins/customer_join_template.pt:144
-msgid "I accept general conditions of sales"
-msgstr ""
-
-#: t/skins/customer_join_template.pt:152
+#: t/skins/customer_join_template.pt:136

 msgid "Register"
 msgstr ""
 
 msgid "Register"
 msgstr ""
 

-#: t/skins/customer_join_template.pt:153
+#: t/skins/customer_join_template.pt:137

 #: t/skins/photoprint_templates_edit_template.pt:142
 msgid "Cancel"
 msgstr ""
 #: t/skins/photoprint_templates_edit_template.pt:142
 msgid "Cancel"
 msgstr ""


@@ -463,6 +447,10 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
 msgid "Change"
 msgstr ""
 

+#: t/skins/photoprint_order_cancel.py:5
+msgid "Your payment has been canceled. You can retry later."
+msgstr ""
+

 #: t/skins/photoprint_order_confirm.py:7
 msgid "Your payment has been accepted by PayPal."
 msgstr ""
 #: t/skins/photoprint_order_confirm.py:7
 msgid "Your payment has been accepted by PayPal."
 msgstr ""


@@ -566,6 +554,18 @@ msgstr ""
 msgid "You must enter a numeric value for the VAT rate."
 msgstr ""
 
 msgid "You must enter a numeric value for the VAT rate."
 msgstr ""
 

+#: t/utils.py:53
+msgid "Wrong private collection identifier."
+msgstr ""
+
+#: t/utils.py:56
+msgid "Collection's password does not match confirmation."
+msgstr ""
+
+#: t/utils.py:60
+msgid "Wrong collection's password."
+msgstr ""
+

 # from photoprint-manual.pot
 msgid "Your payment is complete."
 msgstr ""
 # from photoprint-manual.pot
 msgid "Your payment is complete."
 msgstr ""

diff --git a/locales/fr/LC_MESSAGES/photoprint.mo b/locales/fr/LC_MESSAGES/photoprint.mo
index 4556162..b480a57 100644 (file)
Binary files a/locales/fr/LC_MESSAGES/photoprint.mo and b/locales/fr/LC_MESSAGES/photoprint.mo differ

diff --git a/locales/fr/LC_MESSAGES/photoprint.po b/locales/fr/LC_MESSAGES/photoprint.po
index 4854769..e2a0659 100644 (file)
--- a/locales/fr/LC_MESSAGES/photoprint.po
+++ b/locales/fr/LC_MESSAGES/photoprint.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plinn 2.0\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: Plinn 2.0\n"

-"POT-Creation-Date: Mon Sep  1 20:58:12 2014\n"
-"PO-Revision-Date: 2014-09-01 21:22+0200\n"
+"POT-Creation-Date: Mon Sep  1 23:37:28 2014\n"
+"PO-Revision-Date: 2014-09-01 23:39+0200\n"

 "Last-Translator:  Benoît PIN\n"
 "Language-Team: CRI http://cri.ensmp.fr\n"
 "Language: \n"
 "Last-Translator:  Benoît PIN\n"
 "Language-Team: CRI http://cri.ensmp.fr\n"
 "Language: \n"


@@ -76,10 +76,6 @@ msgstr "Veuillez entrer un pays."
 msgid "Please enter a phone."
 msgstr "Veuillez entrer un numéro de téléphone."
 
 msgid "Please enter a phone."
 msgstr "Veuillez entrer un numéro de téléphone."
 

-#: t/skins/customer_add_control.py:28
-msgid "Please accept general conditions of sales."
-msgstr "Veuillez accepter les conditions générales des ventes."
-

 #: t/skins/customer_join_template.pt:11
 msgid "New customer account"
 msgstr "Nouveau compte client"
 #: t/skins/customer_join_template.pt:11
 msgid "New customer account"
 msgstr "Nouveau compte client"


@@ -112,51 +108,39 @@ msgstr "Mot de passe"
 msgid "Password (confirm)"
 msgstr "Mot de passe (confirmation)"
 
 msgid "Password (confirm)"
 msgstr "Mot de passe (confirmation)"
 

-#: t/skins/customer_join_template.pt:60
-msgid "Mail Password?"
-msgstr "Envoyer le mot de passe ?"
-
-#: t/skins/customer_join_template.pt:64
-msgid "Check this box to have the password mailed."
-msgstr "Cochez cette case afin que votre mot de passe vous soit envoyé par mail."
-
-#: t/skins/customer_join_template.pt:102 t/skins/personalize_form.pt:46
+#: t/skins/customer_join_template.pt:93 t/skins/personalize_form.pt:46

 msgid "Billing informations"
 msgstr "Informations de facturation"
 
 msgid "Billing informations"
 msgstr "Informations de facturation"
 

-#: t/skins/customer_join_template.pt:106 t/skins/order_view_template.pt:35
+#: t/skins/customer_join_template.pt:97 t/skins/order_view_template.pt:35

 #: t/skins/order_view_template.pt:60 t/skins/personalize_form.pt:50
 msgid "Address"
 msgstr "Adresse"
 
 #: t/skins/order_view_template.pt:60 t/skins/personalize_form.pt:50
 msgid "Address"
 msgstr "Adresse"
 

-#: t/skins/customer_join_template.pt:113 t/skins/order_view_template.pt:39
+#: t/skins/customer_join_template.pt:104 t/skins/order_view_template.pt:39

 #: t/skins/order_view_template.pt:64 t/skins/personalize_form.pt:57
 msgid "City"
 msgstr "Ville"
 
 #: t/skins/order_view_template.pt:64 t/skins/personalize_form.pt:57
 msgid "City"
 msgstr "Ville"
 

-#: t/skins/customer_join_template.pt:119 t/skins/order_view_template.pt:43
+#: t/skins/customer_join_template.pt:110 t/skins/order_view_template.pt:43

 #: t/skins/order_view_template.pt:68 t/skins/personalize_form.pt:63
 msgid "Zip code"
 msgstr "Code postal"
 
 #: t/skins/order_view_template.pt:68 t/skins/personalize_form.pt:63
 msgid "Zip code"
 msgstr "Code postal"
 

-#: t/skins/customer_join_template.pt:125 t/skins/order_view_template.pt:47
+#: t/skins/customer_join_template.pt:116 t/skins/order_view_template.pt:47

 #: t/skins/order_view_template.pt:72 t/skins/personalize_form.pt:69
 msgid "Country"
 msgstr "Pays"
 
 #: t/skins/order_view_template.pt:72 t/skins/personalize_form.pt:69
 msgid "Country"
 msgstr "Pays"
 

-#: t/skins/customer_join_template.pt:135 t/skins/personalize_form.pt:79
+#: t/skins/customer_join_template.pt:126 t/skins/personalize_form.pt:79

 msgid "Phone"
 msgstr "Téléphone"
 
 msgid "Phone"
 msgstr "Téléphone"
 

-#: t/skins/customer_join_template.pt:144
-msgid "I accept general conditions of sales"
-msgstr "J'accepte les conditions générales des ventes"
-
-#: t/skins/customer_join_template.pt:152
+#: t/skins/customer_join_template.pt:136

 msgid "Register"
 msgstr "S'enregistrer"
 
 msgid "Register"
 msgstr "S'enregistrer"
 

-#: t/skins/customer_join_template.pt:153
+#: t/skins/customer_join_template.pt:137

 #: t/skins/photoprint_templates_edit_template.pt:142
 msgid "Cancel"
 msgstr "Annuler"
 #: t/skins/photoprint_templates_edit_template.pt:142
 msgid "Cancel"
 msgstr "Annuler"


@@ -508,6 +492,10 @@ msgstr "Adresse e-mail"
 msgid "Change"
 msgstr "Modifier"
 
 msgid "Change"
 msgstr "Modifier"
 

+#: t/skins/photoprint_order_cancel.py:5
+msgid "Your payment has been canceled. You can retry later."
+msgstr "Votre paiement a été annulé. Vous pouvez réessayer plus tard."
+

 #: t/skins/photoprint_order_confirm.py:7
 msgid "Your payment has been accepted by PayPal."
 msgstr "Votre paiement a été accepté par PayPal."
 #: t/skins/photoprint_order_confirm.py:7
 msgid "Your payment has been accepted by PayPal."
 msgstr "Votre paiement a été accepté par PayPal."


@@ -618,6 +606,18 @@ msgstr "Vous devez saisir une valeur numérique pour le prix."
 msgid "You must enter a numeric value for the VAT rate."
 msgstr "Vous devez saisir une valeur numérique pour la TVA (pourcentage)."
 
 msgid "You must enter a numeric value for the VAT rate."
 msgstr "Vous devez saisir une valeur numérique pour la TVA (pourcentage)."
 

+#: t/utils.py:53
+msgid "Wrong private collection identifier."
+msgstr "Identifiant de collection privée incorrect."
+
+#: t/utils.py:56
+msgid "Collection's password does not match confirmation."
+msgstr "Le mot de passe de collection et sa confirmation sont différents."
+
+#: t/utils.py:60
+msgid "Wrong collection's password."
+msgstr "Mot de passe de collection incorrect."
+

 msgid "Your payment is complete."
 msgstr "Votre paiement a été accepté."
 
 msgid "Your payment is complete."
 msgstr "Votre paiement a été accepté."
 


@@ -705,6 +705,19 @@ msgstr "[%s] expédition de la commande %s"
 msgid "paypal_pay"
 msgstr "Paiement PayPal"
 
 msgid "paypal_pay"
 msgstr "Paiement PayPal"
 

+#~ msgid "Please accept general conditions of sales."
+#~ msgstr "Veuillez accepter les conditions générales des ventes."
+
+#~ msgid "Mail Password?"
+#~ msgstr "Envoyer le mot de passe ?"
+
+#~ msgid "Check this box to have the password mailed."
+#~ msgstr ""
+#~ "Cochez cette case afin que votre mot de passe vous soit envoyé par mail."
+
+#~ msgid "I accept general conditions of sales"
+#~ msgstr "J'accepte les conditions générales des ventes"
+

 #~ msgid "Use one of these button to pay:"
 #~ msgstr "Utilisez un de ces bouton pour payer :"
 
 #~ msgid "Use one of these button to pay:"
 #~ msgstr "Utilisez un de ces bouton pour payer :"
 

diff --git a/locales/photoprint.pot b/locales/photoprint.pot
index ce8cb2e..9965dd2 100644 (file)
--- a/locales/photoprint.pot
+++ b/locales/photoprint.pot
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Meaningless\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: Meaningless\n"

-"POT-Creation-Date: Mon Sep  1 20:58:12 2014\n"
+"POT-Creation-Date: Mon Sep  1 23:37:28 2014\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Zope 3 Developers <zope-dev@zope.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Zope 3 Developers <zope-dev@zope.org>\n"


@@ -79,10 +79,6 @@ msgstr ""
 msgid "Please enter a phone."
 msgstr ""
 
 msgid "Please enter a phone."
 msgstr ""
 

-#: t/skins/customer_add_control.py:28
-msgid "Please accept general conditions of sales."
-msgstr ""
-

 #: t/skins/customer_join_template.pt:11
 msgid "New customer account"
 msgstr ""
 #: t/skins/customer_join_template.pt:11
 msgid "New customer account"
 msgstr ""


@@ -116,61 +112,49 @@ msgstr ""
 msgid "Password (confirm)"
 msgstr ""
 
 msgid "Password (confirm)"
 msgstr ""
 

-#: t/skins/customer_join_template.pt:60
-msgid "Mail Password?"
-msgstr ""
-
-#: t/skins/customer_join_template.pt:64
-msgid "Check this box to have the password mailed."
-msgstr ""
-
-#: t/skins/customer_join_template.pt:102
+#: t/skins/customer_join_template.pt:93

 #: t/skins/personalize_form.pt:46
 msgid "Billing informations"
 msgstr ""
 
 #: t/skins/personalize_form.pt:46
 msgid "Billing informations"
 msgstr ""
 

-#: t/skins/customer_join_template.pt:106
+#: t/skins/customer_join_template.pt:97

 #: t/skins/order_view_template.pt:35
 #: t/skins/order_view_template.pt:60
 #: t/skins/personalize_form.pt:50
 msgid "Address"
 msgstr ""
 
 #: t/skins/order_view_template.pt:35
 #: t/skins/order_view_template.pt:60
 #: t/skins/personalize_form.pt:50
 msgid "Address"
 msgstr ""
 

-#: t/skins/customer_join_template.pt:113
+#: t/skins/customer_join_template.pt:104

 #: t/skins/order_view_template.pt:39
 #: t/skins/order_view_template.pt:64
 #: t/skins/personalize_form.pt:57
 msgid "City"
 msgstr ""
 
 #: t/skins/order_view_template.pt:39
 #: t/skins/order_view_template.pt:64
 #: t/skins/personalize_form.pt:57
 msgid "City"
 msgstr ""
 

-#: t/skins/customer_join_template.pt:119
+#: t/skins/customer_join_template.pt:110

 #: t/skins/order_view_template.pt:43
 #: t/skins/order_view_template.pt:68
 #: t/skins/personalize_form.pt:63
 msgid "Zip code"
 msgstr ""
 
 #: t/skins/order_view_template.pt:43
 #: t/skins/order_view_template.pt:68
 #: t/skins/personalize_form.pt:63
 msgid "Zip code"
 msgstr ""
 

-#: t/skins/customer_join_template.pt:125
+#: t/skins/customer_join_template.pt:116

 #: t/skins/order_view_template.pt:47
 #: t/skins/order_view_template.pt:72
 #: t/skins/personalize_form.pt:69
 msgid "Country"
 msgstr ""
 
 #: t/skins/order_view_template.pt:47
 #: t/skins/order_view_template.pt:72
 #: t/skins/personalize_form.pt:69
 msgid "Country"
 msgstr ""
 

-#: t/skins/customer_join_template.pt:135
+#: t/skins/customer_join_template.pt:126

 #: t/skins/personalize_form.pt:79
 msgid "Phone"
 msgstr ""
 
 #: t/skins/personalize_form.pt:79
 msgid "Phone"
 msgstr ""
 

-#: t/skins/customer_join_template.pt:144
-msgid "I accept general conditions of sales"
-msgstr ""
-
-#: t/skins/customer_join_template.pt:152
+#: t/skins/customer_join_template.pt:136

 msgid "Register"
 msgstr ""
 
 msgid "Register"
 msgstr ""
 

-#: t/skins/customer_join_template.pt:153
+#: t/skins/customer_join_template.pt:137

 #: t/skins/photoprint_templates_edit_template.pt:142
 msgid "Cancel"
 msgstr ""
 #: t/skins/photoprint_templates_edit_template.pt:142
 msgid "Cancel"
 msgstr ""


@@ -500,6 +484,10 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
 msgid "Change"
 msgstr ""
 

+#: t/skins/photoprint_order_cancel.py:5
+msgid "Your payment has been canceled. You can retry later."
+msgstr ""
+

 #: t/skins/photoprint_order_confirm.py:7
 msgid "Your payment has been accepted by PayPal."
 msgstr ""
 #: t/skins/photoprint_order_confirm.py:7
 msgid "Your payment has been accepted by PayPal."
 msgstr ""


@@ -601,6 +589,18 @@ msgstr ""
 msgid "You must enter a numeric value for the VAT rate."
 msgstr ""
 
 msgid "You must enter a numeric value for the VAT rate."
 msgstr ""
 

+#: t/utils.py:53
+msgid "Wrong private collection identifier."
+msgstr ""
+
+#: t/utils.py:56
+msgid "Collection's password does not match confirmation."
+msgstr ""
+
+#: t/utils.py:60
+msgid "Wrong collection's password."
+msgstr ""
+

 # from photoprint-manual.pot
 
 msgid "Your payment is complete."
 # from photoprint-manual.pot
 
 msgid "Your payment is complete."

diff --git a/skins/customer_add_control.py b/skins/customer_add_control.py
index 8280dbc..00b4de3 100755 (executable)
--- a/skins/customer_add_control.py
+++ b/skins/customer_add_control.py
@@ -25,7 +25,6 @@ mandatoryFields = [
        , ('billing_zipcode', _('Please enter zip code.'))
        , ('country', _('Please enter a country.'))
        , ('phone', _('Please enter a phone.'))
        , ('billing_zipcode', _('Please enter zip code.'))
        , ('country', _('Please enter a country.'))
        , ('phone', _('Please enter a phone.'))

-       , ('accept_gcs', _('Please accept general conditions of sales.'))

        ]
 
 for name, failMessage in mandatoryFields :
        ]
 
 for name, failMessage in mandatoryFields :


@@ -45,8 +44,7 @@ try:
                                                                ,'billing_city'     : kg('billing_city')
                                                                ,'billing_zipcode'      : kg('billing_zipcode')
                                                                ,'country'                      : kg('country')
                                                                ,'billing_city'     : kg('billing_city')
                                                                ,'billing_zipcode'      : kg('billing_zipcode')
                                                                ,'country'                      : kg('country')

-                                                               ,'phone'                        : kg('phone')
-                                                               ,'accept_gcs'           : kg('accep_gcs')} )
+                                                               ,'phone'                        : kg('phone')} )

 except ValueError, errmsg:
        return context.setStatus(False, _(errmsg))
 
 except ValueError, errmsg:
        return context.setStatus(False, _(errmsg))
 

diff --git a/skins/customer_join_form.py b/skins/customer_join_form.py
index f5f0f7c..3f5beac 100755 (executable)
--- a/skins/customer_join_form.py
+++ b/skins/customer_join_form.py
@@ -39,7 +39,6 @@ continuationFields = [
        , 'member_id'
        , 'password'
        , 'confirm'
        , 'member_id'
        , 'password'
        , 'confirm'

-       , 'send_password'

        , 'collection_id'
        , 'collection_password'
        , 'collection_password_confirm'
        , 'collection_id'
        , 'collection_password'
        , 'collection_password_confirm'


@@ -47,8 +46,7 @@ continuationFields = [
        , 'billing_city'
        , 'billing_zipcode'
        , 'country'
        , 'billing_city'
        , 'billing_zipcode'
        , 'country'

-       , 'phone'
-       , 'accept_gcs']
+       , 'phone']

 
 
 for name in continuationFields :
 
 
 for name in continuationFields :

diff --git a/skins/customer_join_template.pt b/skins/customer_join_template.pt
index 503c825..ba4878a 100644 (file)
--- a/skins/customer_join_template.pt
+++ b/skins/customer_join_template.pt
@@ -56,15 +56,6 @@
               <input type="password" name="confirm" size="30" tal:attributes="value options/confirm" />
             </td>
           </tr>
               <input type="password" name="confirm" size="30" tal:attributes="value options/confirm" />
             </td>
           </tr>

-          <tr>
-            <th i18n:translate="">Mail Password?</th>
-            <td>
-              <input type="checkbox" name="send_password" id="cb_send_password"
-                     tal:attributes="checked options/send_password" />
-              <em><label for="cb_send_password" i18n:translate="">Check this box to
-                have the password mailed.</label></em>
-            </td>
-          </tr>

         </tal:case>
         <tr>
           <td colspan="2"><hr/></td>
         </tal:case>
         <tr>
           <td colspan="2"><hr/></td>


@@ -137,13 +128,6 @@
             <input type="text" name="phone" tal:attributes="value options/phone"/>
           </td>
         </tr>
             <input type="text" name="phone" tal:attributes="value options/phone"/>
           </td>
         </tr>

-        <tr>
-          <th><br/></th>
-          <td>
-            <input type="checkbox" name="accept_gcs" tal:attributes="checked python:options['accept_gcs']" />
-            <a tal:attributes="href string:$portal_url/cgv" target="_blank" i18n:translate="">I accept general conditions of sales</a>
-          </td>
-        </tr>

         <tr>
           <td>&nbsp;</td>
           <td>
         <tr>
           <td>&nbsp;</td>
           <td>

diff --git a/skins/photoprint_order_cancel.py b/skins/photoprint_order_cancel.py
new file mode 100644 (file)
index 0000000..d5b5f81
--- /dev/null
+++ b/skins/photoprint_order_cancel.py
@@ -0,0 +1,6 @@
+##parameters=token=None
+from Products.photoprint.utils import Message as _
+if token :
+    context.ppCancel(token)
+context.setStatus(False, _('Your payment has been canceled. You can retry later.'))
+return context.order_view()
\ No newline at end of file