[getpaid commit] r2715 - First draft for multiple payment processor support in PayPal
0 views
Skip to first unread message
codesite...@google.com
Jun 29, 2009, 9:16:40 AM6/29/09
to getpaid...@groups.google.com
Author: mi...@redinnovation.com
Date: Mon Jun 29 05:55:17 2009
New Revision: 2715
Added:
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/admin.py
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/button.py
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/configure.zcml
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/pay.py
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/paymentprocessors.zcml
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/resources/
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/resources/AcceptanceMark_60x38.gif
(contents, props changed)
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/resources/US_AU_btn.gif
(contents, props changed)
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/templates/button.pt
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/templates/checkout-review-pay.pt
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/templates/pay.pt
Modified:
getpaid.paypal/branches/standard/src/getpaid/paypal/README.txt
getpaid.paypal/branches/standard/src/getpaid/paypal/configure.zcml
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/en/LC_MESSAGES/getpaid.paypal.mo
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/en/LC_MESSAGES/getpaid.paypal.po
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/es/LC_MESSAGES/getpaid.paypal.mo
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/es/LC_MESSAGES/getpaid.paypal.po
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/getpaid.paypal.pot
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/it/LC_MESSAGES/getpaid.paypal.mo
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/it/LC_MESSAGES/getpaid.paypal.po
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/nl/LC_MESSAGE/getpaid.paypal.mo
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/nl/LC_MESSAGE/getpaid.paypal.po
getpaid.paypal/branches/standard/src/getpaid/paypal/overrides.zcml
Log:
First draft for multiple payment processor support in PayPal
Modified: getpaid.paypal/branches/standard/src/getpaid/paypal/README.txt
==============================================================================
--- getpaid.paypal/branches/standard/src/getpaid/paypal/README.txt
(original)
+++ getpaid.paypal/branches/standard/src/getpaid/paypal/README.txt Mon Jun
29 05:55:17 2009
@@ -1,7 +1,5 @@
-You will need to set this as your payment processor in the getpaid admin
-interface (Payment Options)
+This package provides PayPal checkout support for PloneGetPaid.
+
+For PayPal logo usage see
https://cms.paypal.com/us/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_api_WPButtonIntegration
-Last step is to enter your paypal account info in Payment Processor
-Settings.
-Enjoy!
Added: getpaid.paypal/branches/standard/src/getpaid/paypal/browser/admin.py
==============================================================================
--- (empty file)
+++ getpaid.paypal/branches/standard/src/getpaid/paypal/browser/admin.py
Mon Jun 29 05:55:17 2009
@@ -0,0 +1,15 @@
+"""
+
+ Site setup screens contributed by this payment processor.
+
+"""
+
+# Views we are going to subclass are imported from here
+from Products.PloneGetPaid.browser import admin as base
+
+class PaymentProcessor(base.PaymentProcessor):
+ """ Simple wrapper to render payment processor settings screen using a
certain payment processor """
+
+ def getPaymentProcessorName(self):
+ # Match getpaid.core.interfaces.IPaymentProcessor name
+ return "Paypal Website Payments Standard"
\ No newline at end of file
Added: getpaid.paypal/branches/standard/src/getpaid/paypal/browser/button.py
==============================================================================
--- (empty file)
+++ getpaid.paypal/branches/standard/src/getpaid/paypal/browser/button.py
Mon Jun 29 05:55:17 2009
@@ -0,0 +1,5 @@
+from Products.PloneGetPaid.browser.checkout import BasePaymentMethodButton
+
+class PayPalPaymentButton(BasePaymentMethodButton):
+ """ Render PayPal button on payment method step in checkout wizard """
+ pass
\ No newline at end of file
Added:
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/configure.zcml
==============================================================================
--- (empty file)
+++
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/configure.zcml
Mon Jun 29 05:55:17 2009
@@ -0,0 +1,14 @@
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:five="http://namespaces.zope.org/five"
+ xmlns:i18n="http://namespaces.zope.org/i18n"
+ xmlns:zcml="http://namespaces.zope.org/zcml"
+ >
+
+ <!-- Include payment processors directives only if
getpaid.paymentprocessor package is present.
+
+ This allows backwads compatibility in GetPaid payment processor design.
+
+ -->
+ <include zcml:condition="installed getpaid.paymentprocessors"
file="paymentprocessors.zcml" />
+
+</configure>
Added: getpaid.paypal/branches/standard/src/getpaid/paypal/browser/pay.py
==============================================================================
--- (empty file)
+++ getpaid.paypal/branches/standard/src/getpaid/paypal/browser/pay.py Mon
Jun 29 05:55:17 2009
@@ -0,0 +1,159 @@
+import urllib
+
+# Zope imports
+from zope.component import getUtility, getAdapter
+from Products.Five.browser.pagetemplatefile import ZopeTwoPageTemplateFile
+
+# Plone imports
+from Products.CMFCore.utils import getToolByName
+
+# GetPaid imports
+import getpaid.core.interfaces
+from getpaid.core.interfaces import IPaymentProcessor
+from getpaid.paymentprocessors.interfaces import IPaymentMethodInformation
+from Products.PloneGetPaid.browser import checkout as base
+
+from Products.Five.browser import BrowserView
+from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
+from zope.component import getUtility
+
+from Products.PloneGetPaid.interfaces import IGetPaidManagementOptions
+from getpaid.core.interfaces import IShoppingCartUtility, IOrderManager
+from getpaid.core.order import Order
+from getpaid.core import payment
+
+from cPickle import loads, dumps
+from AccessControl import getSecurityManager
+
+from getpaid.paypal.paypal import PaypalStandardProcessor
+from getpaid.paypal.interfaces import IPaypalStandardOptions
+
+_sites = {
+ "Sandbox": "www.sandbox.paypal.com",
+ "Production": "www.paypal.com",
+ }
+
+
+class CheckoutReviewAndPay(base.CheckoutReviewAndPay):
+ """ Null payment method review and pay page.
+
+ 1) Render purchase summary
+
+ 2) Render a <form> which handles the actual payment process.
+ The <form> target is another view (CompletePaymentAndThankYou).
+
+ <form> can be async (managed outside the workflow)
+ or sync (managed by base.CheckoutReviewAndPay.makePayment)
+
+ TODO: Cart is destroyed on the last wizard step - fix this
+
+ """
+
+ template = ZopeTwoPageTemplateFile("templates/pay.pt")
+
+ def renderPaypalForm(self, order):
+ options = IPaypalStandardOptions( self.context )
+ siteroot =
getToolByName(self.context, "portal_url").getPortalObject()
+ manage_options = IGetPaidManagementOptions( siteroot )
+ cartitems = []
+ idx = 1
+ _button_form = """<form style="display:inline;"
action="https://%(site)s/cgi-bin/webscr" method="post" id="paypal-button">
+<input type="hidden" name="cmd" value="_cart" />
+<input type="hidden" name="upload" value="1" />
+<input type="hidden" name="business" value="%(merchant_id)s" />
+<input type="hidden" name="currency_code" value="%(currency)s" />
+<input type="hidden" name="return" value="%(return_url)s" />
+<input type="hidden" name="cbt" value="Return to %(store_name)s" />
+<input type="hidden" name="rm" value="2" />
+<input type="hidden" name="notify_url" value="%(IPN_url)s" />
+<input type="hidden" name="invoice" value="%(order_id)s" />
+<input type="hidden" name="no_note" value="1" />
+%(cart)s
+<input type="image" src="http://%(site)s/en_US/i/btn/x-click-but01.gif"
+ name="submit"
+ alt="Make payments with PayPal - it's fast, free and secure!" />
+</form>
+"""
+ _button_cart = """<input type="hidden" name="item_name_%(idx)s"
value="%(item_name)s" />
+<input type="hidden" name="item_number_%(idx)s" value="%(item_number)s" />
+<input type="hidden" name="amount_%(idx)s" value="%(amount)s" />
+<input type="hidden" name="quantity_%(idx)s" value="%(quantity)s" />
+"""
+
+ for item in order.shopping_cart.values():
+ v = _button_cart % {"idx": idx,
+ "item_name": item.name,
+ "item_number" : item.product_code,
+ "amount": item.cost,
+ "quantity": item.quantity,}
+ cartitems.append(v)
+ idx += 1
+ siteURL = siteroot.absolute_url()
+ # having to do some magic with the URL passed to Paypal so their
system replaies properly
+ returnURL = "%s/@@paypal-thank-you" % siteURL
+ IPNURL = "%s/%s" % (siteURL,
urllib.quote_plus("@@getpaid-paypal-ipnreactor"))
+ formvals = {
+ "site": _sites[options.server_url],
+ "merchant_id": options.merchant_id,
+ "cart": ''.join(cartitems),
+ "return_url": returnURL,
+ "currency": options.currency,
+ "IPN_url" : IPNURL,
+ "order_id" : order.order_id,
+ "store_name": manage_options.store_name,
+ }
+ return _button_form % formvals
+
+ def prepareOrder(self, processor_id):
+
+ # processor id = Paypal Website Payments Standard
+
+ site_root =
getToolByName(self.context, "portal_url").getPortalObject()
+
+ manage_options = IGetPaidManagementOptions( self.context )
+
+ # we'll get the order_manager, create the new order, and store it.
+ # createOrder() is defined in
base.CheckoutReviewAndPay.createOrder()
+ order = self.createOrder()
+
+ order.finance_workflow.fireTransition('create')
+
+ # register the payment processor name to make the workflow
handlers happy
+ order.processor_id = processor_id
+
+ # TODO: This should happen after the payment has been accepted?
+ order_manager = getUtility( IOrderManager )
+ order_manager.store(order)
+
+ # have to wait for the order to be created and the cart added for
this to work
+ order.finance_workflow.fireTransition('authorize')
+
+ # save html for button - we'll destroy the cart later on
+
+ #
+ # TODO: Fix this... cart_post_button is not suitable name here
+ #
+
+ processor = getAdapter(site_root,
getpaid.core.interfaces.IPaymentProcessor, processor_id)
+
+ return order
+
+
+
+ def getForm(self):
+ """ Return the form code which takes to PayPal to complete the
payment """
+
+ payment_processor_name = self.wizard.getActivePaymentProcessor()
+
+ site_root =
getToolByName(self.context, "portal_url").getPortalObject()
+ processor = getAdapter(site_root,
getpaid.core.interfaces.IPaymentProcessor, payment_processor_name)
+
+ # TODO: This destroyes cart and authorizes order even
+ # though the user has not paid yet... FIX
+ order = self.prepareOrder(payment_processor_name)
+
+ html = self.renderPaypalForm(order)
+
+ return html
+
+ return processor.cart_post_button(order)
\ No newline at end of file
Added:
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/paymentprocessors.zcml
==============================================================================
--- (empty file)
+++
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/paymentprocessors.zcml
Mon Jun 29 05:55:17 2009
@@ -0,0 +1,93 @@
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:five="http://namespaces.zope.org/five"
+ xmlns:i18n="http://namespaces.zope.org/i18n"
+
xmlns:paymentprocessors="http://namespaces.plonegetpaid.com/paymentprocessors"
+ xmlns:browser="http://namespaces.zope.org/browser"
+ i18n:domain="getpaid.paypal"
+
+ >
+
+ <!-- This file shows how to set up a payment processor using
+ getpaid.paymentprocessors registry.
+
+ The payment processor consists of
+
+ - Payment processor registry entry
+
+ - Associated browser pages and HTML snippets
+
+ After adding the payment processor egg to your buildout,
+ you need to enable the payment processor on GetPaid settings screen.
+
+ -->
+
+ <!-- Depend on this package - enable new paymentprocessor directives -->
+ <include package="getpaid.paymentprocessors" />
+
+ <!-- Register payment processor "nullpayment"
+
+ For explanation of attributes, please see
+ getpaid.paymentprocessors.directives.IRegisterPaymentProcessorDirective
+ interface.
+
+ name must match one in getpaid.core.interfaces.IPaymentProcessor
adapter declaration.
+ -->
+ <paymentprocessors:registerProcessor
+ name="Paypal Website Payments Standard"
+ i18n_name="Paypal Website Payments Standard"
+ selection_view="paypal-button"
+ review_pay_view="paypal-review-pay"
+ settings_view="paypal-settings"
+ thank_you_view="paypal-thank-you"
+ />
+
+ <!-- This BrowserView is rendered on the payment method selection screen.
+
+ Special BasePaymentMethodButton browser view base class is used to here
to
+ enable checkout wizard specific context information in template.
+ -->
+ <browser:page
+ for="getpaid.core.interfaces.IStore"
+ name="paypal-button"
+ class=".button.PayPalPaymentButton"
+ permission="zope2.View"
+ template="templates/button.pt"
+ />
+
+ <!-- This BrowserView is rendered after the payment has been completed -->
+ <browser:page
+ for="*"
+ name="paypal-thank-you"
+
class="getpaid.paypal.browser.getpaidthankyou.GetpaidPaypalThankyouView"
+ template="templates/paypalthankyou.pt"
+ permission="zope2.View"
+ />
+
+ <!--
+
+ Payment processor specific review and pay page.
+
+ -->
+ <browser:page
+ for="getpaid.core.interfaces.IStore"
+ name="paypal-review-pay"
+ permission="zope2.View"
+ class=".pay.CheckoutReviewAndPay"
+ />
+
+ <!-- This form is rendered on admin screen and it allows you to tune
payment processor settings -->
+ <browser:page
+ for="getpaid.core.interfaces.IStore"
+ name="paypal-settings"
+ class=".admin.PaymentProcessor"
+ permission="cmf.ManagePortal"
+ />
+
+ <!-- Register static media
+
+
https://cms.paypal.com/us/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_api_WPButtonIntegration
+
+ -->
+ <browser:resourceDirectory name="getpaid.paypal" directory="resources"
/>
+
+</configure>
Added:
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/resources/AcceptanceMark_60x38.gif
==============================================================================
Binary file. No diff available.
Added:
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/resources/US_AU_btn.gif
==============================================================================
Binary file. No diff available.
Added:
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/templates/button.pt
==============================================================================
--- (empty file)
+++
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/templates/button.pt
Mon Jun 29 05:55:17 2009
@@ -0,0 +1,15 @@
+<tr i18n:domain="getpaid.paypal" tal:define="processor view/getProcessor">
+
+ <td>
+ <input name="form.payment_processor" type="radio" tal:attributes="value
processor/name">
+ </td>
+
+ <td >
+ <img tal:attributes="src
string:${view/site_url}/++resource++getpaid.paypal/US_AU_btn.gif"
alt="PayPal" i18n:attributes="alt" />
+ </td>
+
+ <td i18n:translate="checkout_with_paypal">
+ Checkout with PayPal.
+ </td>
+</tr>
+
Added:
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/templates/checkout-review-pay.pt
==============================================================================
--- (empty file)
+++
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/templates/checkout-review-pay.pt
Mon Jun 29 05:55:17 2009
@@ -0,0 +1,106 @@
+<metal:page
use-macro="context/@@getpaid-content-template/macros/content_space"
+ i18n:domain="plonegetpaid">
+ <metal:block fill-slot="getpaid_content">
+
+ <script language="javascript">
+ function swapVisibility(fromWho, toWho){
+ window.document.getElementById(fromWho).style.display = 'none';
+ window.document.getElementById(toWho).style.display = 'inline'
+ }
+ </script>
+
+ <h3 i18n:translate="heading_checkout"> Checkout </h3>
+
+ <form action="."
+ tal:attributes="action request/URL"
+ method="post"
+ enctype="multipart/form-data">
+
+ <div class="hidden_fields"
+ tal:content="structure view/hidden_inputs"> </div>
+
+ <div class="portalMessage" tal:content="view/status"
tal:condition="view/status"> </div>
+ <div metal:use-macro="here/global_statusmessage/macros/portal_message">
+ Portal status message
+ </div>
+
+ <div>
+ <div style="float:left; width:30%">
+ <fieldset tal:define="widgets python:
view.getWidgetsBySectionName('billing_address')">
+ <legend i18n:translate=""> Billing Address </legend>
+ <div metal:use-macro="context/@@getpaid-form-valuesonly/fieldset">
</div>
+ </fieldset>
+ </div>
+ <div style="float: left; padding-left: 3em; width: 30%;"
+ tal:define="ship_same_billing request/form.ship_same_billing|
nothing;
+ shipping_address python: ship_same_billing
and 'billing_address' or 'shipping_address'">
+ <fieldset tal:define="widgets python:
view.getWidgetsBySectionName(shipping_address)">
+ <legend i18n:translate=""> Mailing Address </legend>
+ <tal:block tal:repeat="widget widgets">
+ <tal:sameAsBill tal:condition="not:repeat/widget/start">
+ <span class="widget" tal:content="structure widget"/><br/>
+ </tal:sameAsBill>
+ </tal:block>
+ </fieldset>
+ </div>
+ </div>
+
+ <div class="visualClear"><!-- --></div>
+
+
+ <div class="cart-listing">
+ <fieldset>
+ <legend i18n:translate=""> Shopping Cart </legend>
+ <div tal:replace="structure view/renderCart">cart</div>
+
+ <tal:cond condition="view/isPlone3">
+ <div tal:replace="structure
provider:getpaid.belowcartresume" />
+ </tal:cond>
+
+
+ <div id="save_order_template_entry" style="display: none">
+ <label for="order_template_entry_name"
id="order_template_entry_name_label" i18n:translate="">Order template
name</label>
+ <div class="formHelp"
+ i18n:translate=""
id="order_template_entry_name_help_text">A name you can remember this order
template by.</div>
+ <input type="text" id="order_template_entry_name"
name="order_template_entry_name" >
+ </div>
+
+
+
+ <input type="button" id="save_order_template"
class="standalone" name="save_order_template" value="Save this order as a
template"
onclick="swapVisibility('save_order_template','save_order_template_entry')"
i18n:attributes="value" />
+
+
+ </fieldset>
+
+
+
+ </div>
+
+ <div>
+ <fieldset tal:define="widgets python:
view.getWidgetsBySectionName('payment')">
+ <form tal:attributes="action ${context/@@portal_state/portal_url}/@@">
+
+ </form>
+
+ </fieldset>
+ </div>
+
+ <div id="actionsView">
+ <span class="actionButtons"
+ tal:condition="view/availableActions">
+ <tal:loop tal:repeat="action view/availableActions">
+ <input type="submit" class="button context"
+ id="" name="" value=""
+ tal:attributes="id action/__name__;
+ name action/__name__;
+ value python:str(action.label);"
+ i18n:attributes="value" />
+ </tal:loop>
+ </span>
+ </div>
+
+ </form>
+ <metal:legal use-macro="context/@@legal-disclaimers-links/links" />
+
+ </metal:block>
+</metal:page>
Added:
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/templates/pay.pt
==============================================================================
--- (empty file)
+++
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/templates/pay.pt
Mon Jun 29 05:55:17 2009
@@ -0,0 +1,16 @@
+<metal:page
use-macro="context/@@getpaid-content-template/macros/content_space"
+ i18n:domain="getpaid.paypal">
+
+ <metal:block fill-slot="getpaid_content">
+
+ <h3 i18n:translate="heading_checkout">Checkout</h3>
+
+ <p class="redirect-message">
+ You will be soon taken to PayPal site to complete your payment. If
+ nothing happens please click the button below.
+ </p>
+
+ <form tal:replace="structure view/getForm" />
+
+ </metal:block>
+</metal:page>
Modified: getpaid.paypal/branches/standard/src/getpaid/paypal/configure.zcml
==============================================================================
--- getpaid.paypal/branches/standard/src/getpaid/paypal/configure.zcml
(original)
+++ getpaid.paypal/branches/standard/src/getpaid/paypal/configure.zcml Mon
Jun 29 05:55:17 2009
@@ -1,10 +1,13 @@
<configure xmlns="http://namespaces.zope.org/zope"
xmlns:browser="http://namespaces.zope.org/browser"
- xmlns:i18n="http://namespaces.zope.org/i18n">
+ xmlns:i18n="http://namespaces.zope.org/i18n"
+ xmlns:zcml="http://namespaces.zope.org/zcml"
+ >
<i18n:registerTranslations directory="locales" />
<include package=".ipn" />
+ <include package=".browser" />
<adapter
for="Products.CMFCore.interfaces.ISiteRoot"
@@ -16,5 +19,6 @@
provides="getpaid.core.interfaces.IPaymentProcessor"
name="Paypal Website Payments Standard"
factory=".paypal.PaypalStandardProcessor" />
-
+
+
</configure>
Modified:
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/en/LC_MESSAGES/getpaid.paypal.mo
==============================================================================
Binary files. No diff available.
Modified:
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/en/LC_MESSAGES/getpaid.paypal.po
==============================================================================
---
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/en/LC_MESSAGES/getpaid.paypal.po
(original)
+++
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/en/LC_MESSAGES/getpaid.paypal.po
Mon Jun 29 05:55:17 2009
@@ -2,7 +2,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GetPaid VERSION\n"
-"POT-Creation-Date: 2007-10-02 19:24+0000\n"
+"POT-Creation-Date: 2009-05-04 08:02+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -16,11 +16,15 @@
"Domain: getpaid.paypal\n"
"X-Is-Fallback-For: en-au en-bz en-ca en-ie en-jm en-nz en-ph en-za en-tt
en-gb en-us en-zw\n"
-#: ./interfaces.py:24
+#: ./interfaces.py:34
+msgid "Currency"
+msgstr ""
+
+#: ./interfaces.py:31
msgid "Paypal Id"
msgstr ""
-#: ./interfaces.py:20
+#: ./interfaces.py:27
msgid "Paypal Website Payments Server"
msgstr ""
Modified:
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/es/LC_MESSAGES/getpaid.paypal.mo
==============================================================================
Binary files. No diff available.
Modified:
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/es/LC_MESSAGES/getpaid.paypal.po
==============================================================================
---
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/es/LC_MESSAGES/getpaid.paypal.po
(original)
+++
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/es/LC_MESSAGES/getpaid.paypal.po
Mon Jun 29 05:55:17 2009
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GetPaid VERSION\n"
-"POT-Creation-Date: 2007-10-02 19:24+0000\n"
+"POT-Creation-Date: 2009-05-04 08:02+0000\n"
"PO-Revision-Date: 2007-09-27 08:40-0300\n"
"Last-Translator: Juan Pablo Giménez <j...@rcom.com.ar>\n"
"Language-Team: Juan Pablo Giménez <j...@rcom.com.ar>\n"
@@ -15,11 +15,15 @@
"Domain: getpaid.paypal\n"
"X-Is-Fallback-For: es-ar es-bo es-cl es-co es-cr es-do es-ec es-es es-sv
es-gt es-hn es-mx es-ni es-pa es-py es-pe es-pr es-us es-uy es-ve\n"
-#: ./interfaces.py:24
+#: ./interfaces.py:34
+msgid "Currency"
+msgstr ""
+
+#: ./interfaces.py:31
msgid "Paypal Id"
msgstr "Id de Paypal"
-#: ./interfaces.py:20
+#: ./interfaces.py:27
msgid "Paypal Website Payments Server"
msgstr "Servidor web de pagos de Paypal"
Modified:
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/getpaid.paypal.pot
==============================================================================
---
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/getpaid.paypal.pot
(original)
+++
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/getpaid.paypal.pot
Mon Jun 29 05:55:17 2009
@@ -2,7 +2,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GetPaid VERSION\n"
-"POT-Creation-Date: 2007-10-02 19:24+0000\n"
+"POT-Creation-Date: 2009-05-04 08:02+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -15,11 +15,15 @@
"Preferred-Encodings: utf-8 latin1\n"
"Domain: getpaid.paypal\n"
-#: ./interfaces.py:24
+#: ./interfaces.py:34
+msgid "Currency"
+msgstr ""
+
+#: ./interfaces.py:31
msgid "Paypal Id"
msgstr ""
-#: ./interfaces.py:20
+#: ./interfaces.py:27
msgid "Paypal Website Payments Server"
msgstr ""
Modified:
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/it/LC_MESSAGES/getpaid.paypal.mo
==============================================================================
Binary files. No diff available.
Modified:
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/it/LC_MESSAGES/getpaid.paypal.po
==============================================================================
---
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/it/LC_MESSAGES/getpaid.paypal.po
(original)
+++
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/it/LC_MESSAGES/getpaid.paypal.po
Mon Jun 29 05:55:17 2009
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GetPaid VERSION\n"
-"POT-Creation-Date: 2007-10-02 19:24+0000\n"
+"POT-Creation-Date: 2009-05-04 08:02+0000\n"
"PO-Revision-Date: 2007-10-02 19:24+0000\n"
"Last-Translator: Fabio Corneti <in...@corneti.com>\n"
"Language-Team: Fabio Corneti <in...@corneti.com>\n"
@@ -14,11 +14,15 @@
"Preferred-Encodings: utf-8 latin1\n"
"Domain: getpaid.paypal\n"
-#: ./interfaces.py:24
+#: ./interfaces.py:34
+msgid "Currency"
+msgstr ""
+
+#: ./interfaces.py:31
msgid "Paypal Id"
msgstr "ID Paypal"
-#: ./interfaces.py:20
+#: ./interfaces.py:27
msgid "Paypal Website Payments Server"
msgstr "Server Paypal per i pagamenti"
Modified:
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/nl/LC_MESSAGE/getpaid.paypal.mo
==============================================================================
Binary files. No diff available.
Modified:
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/nl/LC_MESSAGE/getpaid.paypal.po
==============================================================================
---
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/nl/LC_MESSAGE/getpaid.paypal.po
(original)
+++
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/nl/LC_MESSAGE/getpaid.paypal.po
Mon Jun 29 05:55:17 2009
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GetPaid VERSION\n"
-"POT-Creation-Date: 2007-10-02 17:37+0000\n"
+"POT-Creation-Date: 2009-05-04 08:02+0000\n"
"PO-Revision-Date: 2007-10-02 19:34+0000\n"
"Last-Translator: Jean-Paul Ladage <j.la...@zestsoftware.nl>\n"
"Language-Team: Plone Nederland <plon...@lists.plone.org>\n"
@@ -17,11 +17,15 @@
"Preferred-Encodings: utf-8 latin1\n"
"Domain: getpaid.paypal\n"
-#: ./interfaces.py:24
+#: ./interfaces.py:34
+msgid "Currency"
+msgstr ""
+
+#: ./interfaces.py:31
msgid "Paypal Id"
msgstr "Paypal nummer"
-#: ./interfaces.py:20
+#: ./interfaces.py:27
msgid "Paypal Website Payments Server"
msgstr "Paypal Website transactie server"
Modified: getpaid.paypal/branches/standard/src/getpaid/paypal/overrides.zcml
==============================================================================
--- getpaid.paypal/branches/standard/src/getpaid/paypal/overrides.zcml
(original)
+++ getpaid.paypal/branches/standard/src/getpaid/paypal/overrides.zcml Mon
Jun 29 05:55:17 2009
@@ -1,3 +1,9 @@
-<configure xmlns="http://namespaces.zope.org/zope">
- <include package=".browser" file="overrides.zcml" />
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:zcml="http://namespaces.zope.org/zcml"
+ >
+
+ <!-- Overrides are only needed if old style payment processor subsystem
is used -->
+
+ <include zcml:condition="not-installed getpaid.paymentprocessors"
package=".browser" file="overrides.zcml" />
+
</configure>
Date: Mon Jun 29 05:55:17 2009
New Revision: 2715
Added:
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/admin.py
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/button.py
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/configure.zcml
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/pay.py
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/paymentprocessors.zcml
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/resources/
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/resources/AcceptanceMark_60x38.gif
(contents, props changed)
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/resources/US_AU_btn.gif
(contents, props changed)
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/templates/button.pt
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/templates/checkout-review-pay.pt
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/templates/pay.pt
Modified:
getpaid.paypal/branches/standard/src/getpaid/paypal/README.txt
getpaid.paypal/branches/standard/src/getpaid/paypal/configure.zcml
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/en/LC_MESSAGES/getpaid.paypal.mo
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/en/LC_MESSAGES/getpaid.paypal.po
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/es/LC_MESSAGES/getpaid.paypal.mo
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/es/LC_MESSAGES/getpaid.paypal.po
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/getpaid.paypal.pot
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/it/LC_MESSAGES/getpaid.paypal.mo
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/it/LC_MESSAGES/getpaid.paypal.po
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/nl/LC_MESSAGE/getpaid.paypal.mo
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/nl/LC_MESSAGE/getpaid.paypal.po
getpaid.paypal/branches/standard/src/getpaid/paypal/overrides.zcml
Log:
First draft for multiple payment processor support in PayPal
Modified: getpaid.paypal/branches/standard/src/getpaid/paypal/README.txt
==============================================================================
--- getpaid.paypal/branches/standard/src/getpaid/paypal/README.txt
(original)
+++ getpaid.paypal/branches/standard/src/getpaid/paypal/README.txt Mon Jun
29 05:55:17 2009
@@ -1,7 +1,5 @@
-You will need to set this as your payment processor in the getpaid admin
-interface (Payment Options)
+This package provides PayPal checkout support for PloneGetPaid.
+
+For PayPal logo usage see
https://cms.paypal.com/us/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_api_WPButtonIntegration
-Last step is to enter your paypal account info in Payment Processor
-Settings.
-Enjoy!
Added: getpaid.paypal/branches/standard/src/getpaid/paypal/browser/admin.py
==============================================================================
--- (empty file)
+++ getpaid.paypal/branches/standard/src/getpaid/paypal/browser/admin.py
Mon Jun 29 05:55:17 2009
@@ -0,0 +1,15 @@
+"""
+
+ Site setup screens contributed by this payment processor.
+
+"""
+
+# Views we are going to subclass are imported from here
+from Products.PloneGetPaid.browser import admin as base
+
+class PaymentProcessor(base.PaymentProcessor):
+ """ Simple wrapper to render payment processor settings screen using a
certain payment processor """
+
+ def getPaymentProcessorName(self):
+ # Match getpaid.core.interfaces.IPaymentProcessor name
+ return "Paypal Website Payments Standard"
\ No newline at end of file
Added: getpaid.paypal/branches/standard/src/getpaid/paypal/browser/button.py
==============================================================================
--- (empty file)
+++ getpaid.paypal/branches/standard/src/getpaid/paypal/browser/button.py
Mon Jun 29 05:55:17 2009
@@ -0,0 +1,5 @@
+from Products.PloneGetPaid.browser.checkout import BasePaymentMethodButton
+
+class PayPalPaymentButton(BasePaymentMethodButton):
+ """ Render PayPal button on payment method step in checkout wizard """
+ pass
\ No newline at end of file
Added:
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/configure.zcml
==============================================================================
--- (empty file)
+++
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/configure.zcml
Mon Jun 29 05:55:17 2009
@@ -0,0 +1,14 @@
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:five="http://namespaces.zope.org/five"
+ xmlns:i18n="http://namespaces.zope.org/i18n"
+ xmlns:zcml="http://namespaces.zope.org/zcml"
+ >
+
+ <!-- Include payment processors directives only if
getpaid.paymentprocessor package is present.
+
+ This allows backwads compatibility in GetPaid payment processor design.
+
+ -->
+ <include zcml:condition="installed getpaid.paymentprocessors"
file="paymentprocessors.zcml" />
+
+</configure>
Added: getpaid.paypal/branches/standard/src/getpaid/paypal/browser/pay.py
==============================================================================
--- (empty file)
+++ getpaid.paypal/branches/standard/src/getpaid/paypal/browser/pay.py Mon
Jun 29 05:55:17 2009
@@ -0,0 +1,159 @@
+import urllib
+
+# Zope imports
+from zope.component import getUtility, getAdapter
+from Products.Five.browser.pagetemplatefile import ZopeTwoPageTemplateFile
+
+# Plone imports
+from Products.CMFCore.utils import getToolByName
+
+# GetPaid imports
+import getpaid.core.interfaces
+from getpaid.core.interfaces import IPaymentProcessor
+from getpaid.paymentprocessors.interfaces import IPaymentMethodInformation
+from Products.PloneGetPaid.browser import checkout as base
+
+from Products.Five.browser import BrowserView
+from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
+from zope.component import getUtility
+
+from Products.PloneGetPaid.interfaces import IGetPaidManagementOptions
+from getpaid.core.interfaces import IShoppingCartUtility, IOrderManager
+from getpaid.core.order import Order
+from getpaid.core import payment
+
+from cPickle import loads, dumps
+from AccessControl import getSecurityManager
+
+from getpaid.paypal.paypal import PaypalStandardProcessor
+from getpaid.paypal.interfaces import IPaypalStandardOptions
+
+_sites = {
+ "Sandbox": "www.sandbox.paypal.com",
+ "Production": "www.paypal.com",
+ }
+
+
+class CheckoutReviewAndPay(base.CheckoutReviewAndPay):
+ """ Null payment method review and pay page.
+
+ 1) Render purchase summary
+
+ 2) Render a <form> which handles the actual payment process.
+ The <form> target is another view (CompletePaymentAndThankYou).
+
+ <form> can be async (managed outside the workflow)
+ or sync (managed by base.CheckoutReviewAndPay.makePayment)
+
+ TODO: Cart is destroyed on the last wizard step - fix this
+
+ """
+
+ template = ZopeTwoPageTemplateFile("templates/pay.pt")
+
+ def renderPaypalForm(self, order):
+ options = IPaypalStandardOptions( self.context )
+ siteroot =
getToolByName(self.context, "portal_url").getPortalObject()
+ manage_options = IGetPaidManagementOptions( siteroot )
+ cartitems = []
+ idx = 1
+ _button_form = """<form style="display:inline;"
action="https://%(site)s/cgi-bin/webscr" method="post" id="paypal-button">
+<input type="hidden" name="cmd" value="_cart" />
+<input type="hidden" name="upload" value="1" />
+<input type="hidden" name="business" value="%(merchant_id)s" />
+<input type="hidden" name="currency_code" value="%(currency)s" />
+<input type="hidden" name="return" value="%(return_url)s" />
+<input type="hidden" name="cbt" value="Return to %(store_name)s" />
+<input type="hidden" name="rm" value="2" />
+<input type="hidden" name="notify_url" value="%(IPN_url)s" />
+<input type="hidden" name="invoice" value="%(order_id)s" />
+<input type="hidden" name="no_note" value="1" />
+%(cart)s
+<input type="image" src="http://%(site)s/en_US/i/btn/x-click-but01.gif"
+ name="submit"
+ alt="Make payments with PayPal - it's fast, free and secure!" />
+</form>
+"""
+ _button_cart = """<input type="hidden" name="item_name_%(idx)s"
value="%(item_name)s" />
+<input type="hidden" name="item_number_%(idx)s" value="%(item_number)s" />
+<input type="hidden" name="amount_%(idx)s" value="%(amount)s" />
+<input type="hidden" name="quantity_%(idx)s" value="%(quantity)s" />
+"""
+
+ for item in order.shopping_cart.values():
+ v = _button_cart % {"idx": idx,
+ "item_name": item.name,
+ "item_number" : item.product_code,
+ "amount": item.cost,
+ "quantity": item.quantity,}
+ cartitems.append(v)
+ idx += 1
+ siteURL = siteroot.absolute_url()
+ # having to do some magic with the URL passed to Paypal so their
system replaies properly
+ returnURL = "%s/@@paypal-thank-you" % siteURL
+ IPNURL = "%s/%s" % (siteURL,
urllib.quote_plus("@@getpaid-paypal-ipnreactor"))
+ formvals = {
+ "site": _sites[options.server_url],
+ "merchant_id": options.merchant_id,
+ "cart": ''.join(cartitems),
+ "return_url": returnURL,
+ "currency": options.currency,
+ "IPN_url" : IPNURL,
+ "order_id" : order.order_id,
+ "store_name": manage_options.store_name,
+ }
+ return _button_form % formvals
+
+ def prepareOrder(self, processor_id):
+
+ # processor id = Paypal Website Payments Standard
+
+ site_root =
getToolByName(self.context, "portal_url").getPortalObject()
+
+ manage_options = IGetPaidManagementOptions( self.context )
+
+ # we'll get the order_manager, create the new order, and store it.
+ # createOrder() is defined in
base.CheckoutReviewAndPay.createOrder()
+ order = self.createOrder()
+
+ order.finance_workflow.fireTransition('create')
+
+ # register the payment processor name to make the workflow
handlers happy
+ order.processor_id = processor_id
+
+ # TODO: This should happen after the payment has been accepted?
+ order_manager = getUtility( IOrderManager )
+ order_manager.store(order)
+
+ # have to wait for the order to be created and the cart added for
this to work
+ order.finance_workflow.fireTransition('authorize')
+
+ # save html for button - we'll destroy the cart later on
+
+ #
+ # TODO: Fix this... cart_post_button is not suitable name here
+ #
+
+ processor = getAdapter(site_root,
getpaid.core.interfaces.IPaymentProcessor, processor_id)
+
+ return order
+
+
+
+ def getForm(self):
+ """ Return the form code which takes to PayPal to complete the
payment """
+
+ payment_processor_name = self.wizard.getActivePaymentProcessor()
+
+ site_root =
getToolByName(self.context, "portal_url").getPortalObject()
+ processor = getAdapter(site_root,
getpaid.core.interfaces.IPaymentProcessor, payment_processor_name)
+
+ # TODO: This destroyes cart and authorizes order even
+ # though the user has not paid yet... FIX
+ order = self.prepareOrder(payment_processor_name)
+
+ html = self.renderPaypalForm(order)
+
+ return html
+
+ return processor.cart_post_button(order)
\ No newline at end of file
Added:
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/paymentprocessors.zcml
==============================================================================
--- (empty file)
+++
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/paymentprocessors.zcml
Mon Jun 29 05:55:17 2009
@@ -0,0 +1,93 @@
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:five="http://namespaces.zope.org/five"
+ xmlns:i18n="http://namespaces.zope.org/i18n"
+
xmlns:paymentprocessors="http://namespaces.plonegetpaid.com/paymentprocessors"
+ xmlns:browser="http://namespaces.zope.org/browser"
+ i18n:domain="getpaid.paypal"
+
+ >
+
+ <!-- This file shows how to set up a payment processor using
+ getpaid.paymentprocessors registry.
+
+ The payment processor consists of
+
+ - Payment processor registry entry
+
+ - Associated browser pages and HTML snippets
+
+ After adding the payment processor egg to your buildout,
+ you need to enable the payment processor on GetPaid settings screen.
+
+ -->
+
+ <!-- Depend on this package - enable new paymentprocessor directives -->
+ <include package="getpaid.paymentprocessors" />
+
+ <!-- Register payment processor "nullpayment"
+
+ For explanation of attributes, please see
+ getpaid.paymentprocessors.directives.IRegisterPaymentProcessorDirective
+ interface.
+
+ name must match one in getpaid.core.interfaces.IPaymentProcessor
adapter declaration.
+ -->
+ <paymentprocessors:registerProcessor
+ name="Paypal Website Payments Standard"
+ i18n_name="Paypal Website Payments Standard"
+ selection_view="paypal-button"
+ review_pay_view="paypal-review-pay"
+ settings_view="paypal-settings"
+ thank_you_view="paypal-thank-you"
+ />
+
+ <!-- This BrowserView is rendered on the payment method selection screen.
+
+ Special BasePaymentMethodButton browser view base class is used to here
to
+ enable checkout wizard specific context information in template.
+ -->
+ <browser:page
+ for="getpaid.core.interfaces.IStore"
+ name="paypal-button"
+ class=".button.PayPalPaymentButton"
+ permission="zope2.View"
+ template="templates/button.pt"
+ />
+
+ <!-- This BrowserView is rendered after the payment has been completed -->
+ <browser:page
+ for="*"
+ name="paypal-thank-you"
+
class="getpaid.paypal.browser.getpaidthankyou.GetpaidPaypalThankyouView"
+ template="templates/paypalthankyou.pt"
+ permission="zope2.View"
+ />
+
+ <!--
+
+ Payment processor specific review and pay page.
+
+ -->
+ <browser:page
+ for="getpaid.core.interfaces.IStore"
+ name="paypal-review-pay"
+ permission="zope2.View"
+ class=".pay.CheckoutReviewAndPay"
+ />
+
+ <!-- This form is rendered on admin screen and it allows you to tune
payment processor settings -->
+ <browser:page
+ for="getpaid.core.interfaces.IStore"
+ name="paypal-settings"
+ class=".admin.PaymentProcessor"
+ permission="cmf.ManagePortal"
+ />
+
+ <!-- Register static media
+
+
https://cms.paypal.com/us/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_api_WPButtonIntegration
+
+ -->
+ <browser:resourceDirectory name="getpaid.paypal" directory="resources"
/>
+
+</configure>
Added:
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/resources/AcceptanceMark_60x38.gif
==============================================================================
Binary file. No diff available.
Added:
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/resources/US_AU_btn.gif
==============================================================================
Binary file. No diff available.
Added:
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/templates/button.pt
==============================================================================
--- (empty file)
+++
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/templates/button.pt
Mon Jun 29 05:55:17 2009
@@ -0,0 +1,15 @@
+<tr i18n:domain="getpaid.paypal" tal:define="processor view/getProcessor">
+
+ <td>
+ <input name="form.payment_processor" type="radio" tal:attributes="value
processor/name">
+ </td>
+
+ <td >
+ <img tal:attributes="src
string:${view/site_url}/++resource++getpaid.paypal/US_AU_btn.gif"
alt="PayPal" i18n:attributes="alt" />
+ </td>
+
+ <td i18n:translate="checkout_with_paypal">
+ Checkout with PayPal.
+ </td>
+</tr>
+
Added:
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/templates/checkout-review-pay.pt
==============================================================================
--- (empty file)
+++
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/templates/checkout-review-pay.pt
Mon Jun 29 05:55:17 2009
@@ -0,0 +1,106 @@
+<metal:page
use-macro="context/@@getpaid-content-template/macros/content_space"
+ i18n:domain="plonegetpaid">
+ <metal:block fill-slot="getpaid_content">
+
+ <script language="javascript">
+ function swapVisibility(fromWho, toWho){
+ window.document.getElementById(fromWho).style.display = 'none';
+ window.document.getElementById(toWho).style.display = 'inline'
+ }
+ </script>
+
+ <h3 i18n:translate="heading_checkout"> Checkout </h3>
+
+ <form action="."
+ tal:attributes="action request/URL"
+ method="post"
+ enctype="multipart/form-data">
+
+ <div class="hidden_fields"
+ tal:content="structure view/hidden_inputs"> </div>
+
+ <div class="portalMessage" tal:content="view/status"
tal:condition="view/status"> </div>
+ <div metal:use-macro="here/global_statusmessage/macros/portal_message">
+ Portal status message
+ </div>
+
+ <div>
+ <div style="float:left; width:30%">
+ <fieldset tal:define="widgets python:
view.getWidgetsBySectionName('billing_address')">
+ <legend i18n:translate=""> Billing Address </legend>
+ <div metal:use-macro="context/@@getpaid-form-valuesonly/fieldset">
</div>
+ </fieldset>
+ </div>
+ <div style="float: left; padding-left: 3em; width: 30%;"
+ tal:define="ship_same_billing request/form.ship_same_billing|
nothing;
+ shipping_address python: ship_same_billing
and 'billing_address' or 'shipping_address'">
+ <fieldset tal:define="widgets python:
view.getWidgetsBySectionName(shipping_address)">
+ <legend i18n:translate=""> Mailing Address </legend>
+ <tal:block tal:repeat="widget widgets">
+ <tal:sameAsBill tal:condition="not:repeat/widget/start">
+ <span class="widget" tal:content="structure widget"/><br/>
+ </tal:sameAsBill>
+ </tal:block>
+ </fieldset>
+ </div>
+ </div>
+
+ <div class="visualClear"><!-- --></div>
+
+
+ <div class="cart-listing">
+ <fieldset>
+ <legend i18n:translate=""> Shopping Cart </legend>
+ <div tal:replace="structure view/renderCart">cart</div>
+
+ <tal:cond condition="view/isPlone3">
+ <div tal:replace="structure
provider:getpaid.belowcartresume" />
+ </tal:cond>
+
+
+ <div id="save_order_template_entry" style="display: none">
+ <label for="order_template_entry_name"
id="order_template_entry_name_label" i18n:translate="">Order template
name</label>
+ <div class="formHelp"
+ i18n:translate=""
id="order_template_entry_name_help_text">A name you can remember this order
template by.</div>
+ <input type="text" id="order_template_entry_name"
name="order_template_entry_name" >
+ </div>
+
+
+
+ <input type="button" id="save_order_template"
class="standalone" name="save_order_template" value="Save this order as a
template"
onclick="swapVisibility('save_order_template','save_order_template_entry')"
i18n:attributes="value" />
+
+
+ </fieldset>
+
+
+
+ </div>
+
+ <div>
+ <fieldset tal:define="widgets python:
view.getWidgetsBySectionName('payment')">
+ <form tal:attributes="action ${context/@@portal_state/portal_url}/@@">
+
+ </form>
+
+ </fieldset>
+ </div>
+
+ <div id="actionsView">
+ <span class="actionButtons"
+ tal:condition="view/availableActions">
+ <tal:loop tal:repeat="action view/availableActions">
+ <input type="submit" class="button context"
+ id="" name="" value=""
+ tal:attributes="id action/__name__;
+ name action/__name__;
+ value python:str(action.label);"
+ i18n:attributes="value" />
+ </tal:loop>
+ </span>
+ </div>
+
+ </form>
+ <metal:legal use-macro="context/@@legal-disclaimers-links/links" />
+
+ </metal:block>
+</metal:page>
Added:
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/templates/pay.pt
==============================================================================
--- (empty file)
+++
getpaid.paypal/branches/standard/src/getpaid/paypal/browser/templates/pay.pt
Mon Jun 29 05:55:17 2009
@@ -0,0 +1,16 @@
+<metal:page
use-macro="context/@@getpaid-content-template/macros/content_space"
+ i18n:domain="getpaid.paypal">
+
+ <metal:block fill-slot="getpaid_content">
+
+ <h3 i18n:translate="heading_checkout">Checkout</h3>
+
+ <p class="redirect-message">
+ You will be soon taken to PayPal site to complete your payment. If
+ nothing happens please click the button below.
+ </p>
+
+ <form tal:replace="structure view/getForm" />
+
+ </metal:block>
+</metal:page>
Modified: getpaid.paypal/branches/standard/src/getpaid/paypal/configure.zcml
==============================================================================
--- getpaid.paypal/branches/standard/src/getpaid/paypal/configure.zcml
(original)
+++ getpaid.paypal/branches/standard/src/getpaid/paypal/configure.zcml Mon
Jun 29 05:55:17 2009
@@ -1,10 +1,13 @@
<configure xmlns="http://namespaces.zope.org/zope"
xmlns:browser="http://namespaces.zope.org/browser"
- xmlns:i18n="http://namespaces.zope.org/i18n">
+ xmlns:i18n="http://namespaces.zope.org/i18n"
+ xmlns:zcml="http://namespaces.zope.org/zcml"
+ >
<i18n:registerTranslations directory="locales" />
<include package=".ipn" />
+ <include package=".browser" />
<adapter
for="Products.CMFCore.interfaces.ISiteRoot"
@@ -16,5 +19,6 @@
provides="getpaid.core.interfaces.IPaymentProcessor"
name="Paypal Website Payments Standard"
factory=".paypal.PaypalStandardProcessor" />
-
+
+
</configure>
Modified:
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/en/LC_MESSAGES/getpaid.paypal.mo
==============================================================================
Binary files. No diff available.
Modified:
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/en/LC_MESSAGES/getpaid.paypal.po
==============================================================================
---
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/en/LC_MESSAGES/getpaid.paypal.po
(original)
+++
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/en/LC_MESSAGES/getpaid.paypal.po
Mon Jun 29 05:55:17 2009
@@ -2,7 +2,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GetPaid VERSION\n"
-"POT-Creation-Date: 2007-10-02 19:24+0000\n"
+"POT-Creation-Date: 2009-05-04 08:02+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -16,11 +16,15 @@
"Domain: getpaid.paypal\n"
"X-Is-Fallback-For: en-au en-bz en-ca en-ie en-jm en-nz en-ph en-za en-tt
en-gb en-us en-zw\n"
-#: ./interfaces.py:24
+#: ./interfaces.py:34
+msgid "Currency"
+msgstr ""
+
+#: ./interfaces.py:31
msgid "Paypal Id"
msgstr ""
-#: ./interfaces.py:20
+#: ./interfaces.py:27
msgid "Paypal Website Payments Server"
msgstr ""
Modified:
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/es/LC_MESSAGES/getpaid.paypal.mo
==============================================================================
Binary files. No diff available.
Modified:
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/es/LC_MESSAGES/getpaid.paypal.po
==============================================================================
---
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/es/LC_MESSAGES/getpaid.paypal.po
(original)
+++
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/es/LC_MESSAGES/getpaid.paypal.po
Mon Jun 29 05:55:17 2009
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GetPaid VERSION\n"
-"POT-Creation-Date: 2007-10-02 19:24+0000\n"
+"POT-Creation-Date: 2009-05-04 08:02+0000\n"
"PO-Revision-Date: 2007-09-27 08:40-0300\n"
"Last-Translator: Juan Pablo Giménez <j...@rcom.com.ar>\n"
"Language-Team: Juan Pablo Giménez <j...@rcom.com.ar>\n"
@@ -15,11 +15,15 @@
"Domain: getpaid.paypal\n"
"X-Is-Fallback-For: es-ar es-bo es-cl es-co es-cr es-do es-ec es-es es-sv
es-gt es-hn es-mx es-ni es-pa es-py es-pe es-pr es-us es-uy es-ve\n"
-#: ./interfaces.py:24
+#: ./interfaces.py:34
+msgid "Currency"
+msgstr ""
+
+#: ./interfaces.py:31
msgid "Paypal Id"
msgstr "Id de Paypal"
-#: ./interfaces.py:20
+#: ./interfaces.py:27
msgid "Paypal Website Payments Server"
msgstr "Servidor web de pagos de Paypal"
Modified:
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/getpaid.paypal.pot
==============================================================================
---
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/getpaid.paypal.pot
(original)
+++
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/getpaid.paypal.pot
Mon Jun 29 05:55:17 2009
@@ -2,7 +2,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GetPaid VERSION\n"
-"POT-Creation-Date: 2007-10-02 19:24+0000\n"
+"POT-Creation-Date: 2009-05-04 08:02+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -15,11 +15,15 @@
"Preferred-Encodings: utf-8 latin1\n"
"Domain: getpaid.paypal\n"
-#: ./interfaces.py:24
+#: ./interfaces.py:34
+msgid "Currency"
+msgstr ""
+
+#: ./interfaces.py:31
msgid "Paypal Id"
msgstr ""
-#: ./interfaces.py:20
+#: ./interfaces.py:27
msgid "Paypal Website Payments Server"
msgstr ""
Modified:
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/it/LC_MESSAGES/getpaid.paypal.mo
==============================================================================
Binary files. No diff available.
Modified:
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/it/LC_MESSAGES/getpaid.paypal.po
==============================================================================
---
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/it/LC_MESSAGES/getpaid.paypal.po
(original)
+++
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/it/LC_MESSAGES/getpaid.paypal.po
Mon Jun 29 05:55:17 2009
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GetPaid VERSION\n"
-"POT-Creation-Date: 2007-10-02 19:24+0000\n"
+"POT-Creation-Date: 2009-05-04 08:02+0000\n"
"PO-Revision-Date: 2007-10-02 19:24+0000\n"
"Last-Translator: Fabio Corneti <in...@corneti.com>\n"
"Language-Team: Fabio Corneti <in...@corneti.com>\n"
@@ -14,11 +14,15 @@
"Preferred-Encodings: utf-8 latin1\n"
"Domain: getpaid.paypal\n"
-#: ./interfaces.py:24
+#: ./interfaces.py:34
+msgid "Currency"
+msgstr ""
+
+#: ./interfaces.py:31
msgid "Paypal Id"
msgstr "ID Paypal"
-#: ./interfaces.py:20
+#: ./interfaces.py:27
msgid "Paypal Website Payments Server"
msgstr "Server Paypal per i pagamenti"
Modified:
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/nl/LC_MESSAGE/getpaid.paypal.mo
==============================================================================
Binary files. No diff available.
Modified:
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/nl/LC_MESSAGE/getpaid.paypal.po
==============================================================================
---
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/nl/LC_MESSAGE/getpaid.paypal.po
(original)
+++
getpaid.paypal/branches/standard/src/getpaid/paypal/locales/nl/LC_MESSAGE/getpaid.paypal.po
Mon Jun 29 05:55:17 2009
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GetPaid VERSION\n"
-"POT-Creation-Date: 2007-10-02 17:37+0000\n"
+"POT-Creation-Date: 2009-05-04 08:02+0000\n"
"PO-Revision-Date: 2007-10-02 19:34+0000\n"
"Last-Translator: Jean-Paul Ladage <j.la...@zestsoftware.nl>\n"
"Language-Team: Plone Nederland <plon...@lists.plone.org>\n"
@@ -17,11 +17,15 @@
"Preferred-Encodings: utf-8 latin1\n"
"Domain: getpaid.paypal\n"
-#: ./interfaces.py:24
+#: ./interfaces.py:34
+msgid "Currency"
+msgstr ""
+
+#: ./interfaces.py:31
msgid "Paypal Id"
msgstr "Paypal nummer"
-#: ./interfaces.py:20
+#: ./interfaces.py:27
msgid "Paypal Website Payments Server"
msgstr "Paypal Website transactie server"
Modified: getpaid.paypal/branches/standard/src/getpaid/paypal/overrides.zcml
==============================================================================
--- getpaid.paypal/branches/standard/src/getpaid/paypal/overrides.zcml
(original)
+++ getpaid.paypal/branches/standard/src/getpaid/paypal/overrides.zcml Mon
Jun 29 05:55:17 2009
@@ -1,3 +1,9 @@
-<configure xmlns="http://namespaces.zope.org/zope">
- <include package=".browser" file="overrides.zcml" />
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:zcml="http://namespaces.zope.org/zcml"
+ >
+
+ <!-- Overrides are only needed if old style payment processor subsystem
is used -->
+
+ <include zcml:condition="not-installed getpaid.paymentprocessors"
package=".browser" file="overrides.zcml" />
+
</configure>
Reply all
Reply to author
Forward
0 new messages