summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
3c2f684)
Mise en place du script d'annulation d'un paiement PayPal.
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 ""
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
-#: 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 ""
+#: 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 ""
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 ""
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"
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"
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"
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."
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é."
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 :"
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"
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 ""
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 ""
+#: 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 ""
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."
, ('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 :
,'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))
, 'member_id'
, 'password'
, 'confirm'
, 'member_id'
, 'password'
, 'confirm'
, 'collection_id'
, 'collection_password'
, 'collection_password_confirm'
, 'collection_id'
, 'collection_password'
, 'collection_password_confirm'
, 'billing_city'
, 'billing_zipcode'
, 'country'
, 'billing_city'
, 'billing_zipcode'
, 'country'
- , 'phone'
- , 'accept_gcs']
for name in continuationFields :
for name in continuationFields :
<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>
<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> </td>
<td>
<tr>
<td> </td>
<td>
--- /dev/null
+##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