Author: nilo
Date: Thu Oct 23 10:08:04 2008
New Revision: 6879
Log:
merged fixes and features from the trunk
Added:
gocept.vendo/branches/paypal/src/gocept/vendo/i18n/
gocept.vendo/branches/paypal/src/gocept/vendo/i18n/de/
gocept.vendo/branches/paypal/src/gocept/vendo/i18n/de/LC_MESSAGES/ (props
changed)
gocept.vendo/branches/paypal/src/gocept/vendo/i18n/de/LC_MESSAGES/gocept.vendo.po
gocept.vendo/branches/paypal/src/gocept/vendo/i18n/gocept.vendo.pot
gocept.vendo/branches/paypal/src/gocept/vendo/orderevent.py
Modified:
gocept.vendo/branches/paypal/src/gocept/vendo/browser/allproducts.pt
gocept.vendo/branches/paypal/src/gocept/vendo/browser/callback.pt
gocept.vendo/branches/paypal/src/gocept/vendo/browser/cart.pt
gocept.vendo/branches/paypal/src/gocept/vendo/browser/cart_macros.pt
gocept.vendo/branches/paypal/src/gocept/vendo/browser/checkout.pt
gocept.vendo/branches/paypal/src/gocept/vendo/browser/finish_checkout.pt
gocept.vendo/branches/paypal/src/gocept/vendo/browser/popup.pt
gocept.vendo/branches/paypal/src/gocept/vendo/configure.zcml
gocept.vendo/branches/paypal/src/gocept/vendo/content/order.py
gocept.vendo/branches/paypal/src/gocept/vendo/content/shippingmethod.py
gocept.vendo/branches/paypal/src/gocept/vendo/content/shop.py
gocept.vendo/branches/paypal/src/gocept/vendo/order.py
gocept.vendo/branches/paypal/src/gocept/vendo/portlets/cart.pt
gocept.vendo/branches/paypal/src/gocept/vendo/vendo_ordertool/formatPrice.py
gocept.vendo/branches/paypal/src/gocept/vendo/vendo_ordertool/getOrdersForTimespan.py
gocept.vendo/branches/paypal/src/gocept/vendo/vendo_ordertool/otGetOrders.py
gocept.vendo/branches/paypal/src/gocept/vendo/vendo_ordertool/ot_view_orders.pt
gocept.vendo/branches/paypal/src/gocept/vendo/vendo_ordertool/viewDetails.pt
Modified: gocept.vendo/branches/paypal/src/gocept/vendo/browser/allproducts.pt
==============================================================================
---
gocept.vendo/branches/paypal/src/gocept/vendo/browser/allproducts.pt (original)
+++ gocept.vendo/branches/paypal/src/gocept/vendo/browser/allproducts.pt Thu
Oct 23 10:08:04 2008
(at)(at) -43,7 +43,7 (at)(at)
<td>
<select name="amount:record:key"
tal:attributes="name
string:amount.${variation/UID}:record">
- <option value="0">Quantity</option>
+ <option value="0"
i18n:translate="allprods_quantity">Quantity</option>
<tal:op repeat="val python:range(1,11)">
<option tal:attributes="value val"
tal:content="val" />
</tal:op>
Modified: gocept.vendo/branches/paypal/src/gocept/vendo/browser/callback.pt
==============================================================================
---
gocept.vendo/branches/paypal/src/gocept/vendo/browser/callback.pt (original)
+++ gocept.vendo/branches/paypal/src/gocept/vendo/browser/callback.pt Thu Oct
23 10:08:04 2008
(at)(at) -9,7 +9,7 (at)(at)
<metal:main fill-slot="main">
<tal:main-macro metal:define-macro="main" tal:define="cart view/cart">
- <div id="order-finshed">
+ <div id="order-finshed" i18n:translate="order_thanks_msg">
Thank you for your order. Your payment was successful.
</div>
</tal:main-macro>
Modified: gocept.vendo/branches/paypal/src/gocept/vendo/browser/cart.pt
==============================================================================
--- gocept.vendo/branches/paypal/src/gocept/vendo/browser/cart.pt (original)
+++ gocept.vendo/branches/paypal/src/gocept/vendo/browser/cart.pt Thu Oct 23
10:08:04 2008
(at)(at) -9,7 +9,7 (at)(at)
<metal:main fill-slot="main">
<tal:main-macro metal:define-macro="main">
- <h1 class="documentFirstHeading">
+ <h1 class="documentFirstHeading"
i18n:translate="cart_overview_headline">
Shopping Cart (overview)
</h1>
(at)(at) -21,11 +21,11 (at)(at)
<table id="vendocart" cellspacing="0" cellpadding="0">
<thead>
<tr>
- <th>Pos.</th>
- <th>Product</th>
- <th>Amount</th>
- <th>Price</th>
- <th>Total</th>
+ <th i18n:translate="">Pos.</th>
+ <th i18n:translate="">Product</th>
+ <th i18n:translate="">Amount</th>
+ <th i18n:translate="">Price</th>
+ <th i18n:translate="">Total</th>
<th></th>
</tr>
</thead>
(at)(at) -49,13 +49,13 (at)(at)
</tr>
<tr>
<td></td>
- <td colspan="3">Total</td>
+ <td colspan="3" i18n:translate="">Total</td>
<td tal:content="cart/get_sub_total_price/(at)(at)pricedisplay"
/>
<td></td>
</tr>
<tr>
<td></td>
- <td>Shipping</td>
+ <td i18n:translate="">Shipping</td>
<td colspan="2" tal:define="shipping_methods
cart/get_shipping_methods">
<tal:onemethod condition="python: len(shipping_methods) ==
1">
<span tal:replace="python: shipping_methods[0]['title']"
/>
(at)(at) -64,7 +64,7 (at)(at)
</tal:onemethod>
<select name="shipping_method_id" tal:condition="python:
len(shipping_methods) != 1"
tal:define="shipping_id cart/get_shipping_id">
- <option value="" tal:condition="not: shipping_id">
+ <option value="" tal:condition="not: shipping_id"
i18n:translate="">
Select ShippingMethod
</option>
<option tal:repeat="shipping_method shipping_methods"
(at)(at) -80,7 +80,7 (at)(at)
<tr tal:condition="cart/get_vat_rate">
<td></td>
<td colspan="3">
- Tax (<span tal:replace="cart/get_vat_rate" /> %)
+ <span i18n:translate="">Tax</span> (<span
tal:replace="cart/get_vat_rate" /> %)
</td>
<td tal:content="cart/get_vat/(at)(at)pricedisplay" />
<td></td>
(at)(at) -88,7 +88,7 (at)(at)
<tr>
<td></td>
<td colspan="3">
- <strong>Total amount to pay<strong>
+ <strong i18n:translate="">Total amount to
pay</strong>
</td>
<td><strong
tal:content="cart/get_total_price/(at)(at)pricedisplay" /></td>
<td></td>
(at)(at) -96,9 +96,9 (at)(at)
</tbody>
</table>
<input type="submit" class="context" name="form.button.Continue"
- value="Continue" />
+ value="Continue" i18n:attributes="value"/>
<input type="submit" class="context" name="form.button.Change"
- value="Change" />
+ value="Change" i18n:attributes="value"/>
</form>
</tal:main-macro>
</metal:main>
Modified: gocept.vendo/branches/paypal/src/gocept/vendo/browser/cart_macros.pt
==============================================================================
---
gocept.vendo/branches/paypal/src/gocept/vendo/browser/cart_macros.pt (original)
+++ gocept.vendo/branches/paypal/src/gocept/vendo/browser/cart_macros.pt Thu
Oct 23 10:08:04 2008
(at)(at) -4,16 +4,18 (at)(at)
<!-- * Expected variable: * -->
<!-- * cart::ICart object * -->
<!-- ********************** -->
+<html
+ i18n:domain="gocept.vendo">
<div metal:define-macro="display_cart">
<table id="vendocart" cellpadding="0" cellspacing="0">
<thead>
<tr>
- <td>Pos.</td>
- <td>Product</td>
- <td>Amount</td>
- <td>Price</td>
- <td>Total</td>
+ <td i18n:translate="">Pos.</td>
+ <td i18n:translate="">Product</td>
+ <td i18n:translate="">Amount</td>
+ <td i18n:translate="">Price</td>
+ <td i18n:translate="">Total</td>
</tr>
</thead>
<tbody>
(at)(at) -26,27 +28,27 (at)(at)
</tr>
<tr>
<td></td>
- <td colspan="3">Total</td>
+ <td colspan="3" i18n:translate="">Total</td>
<td tal:content="cart/get_sub_total_price/(at)(at)pricedisplay"
/>
<td></td>
</tr>
<tr>
<td></td>
- <td>Shipping</td>
+ <td i18n:translate="">Shipping</td>
<td colspan="2" tal:content="cart/get_shipping_method" />
<td tal:content="cart/get_shipping_price/(at)(at)pricedisplay"
/>
</tr>
- <tr>
+ <tr tal:condition="cart/get_vat_rate">
<td></td>
<td colspan="3">
- Tax (<span tal:replace="cart/get_vat_rate" /> %)
+ <span i18n:translate="">Tax</span> (<span
tal:replace="cart/get_vat_rate" /> %)
</td>
<td tal:content="cart/get_vat/(at)(at)pricedisplay" />
</tr>
<tr>
<td></td>
<td colspan="3">
- <strong>Total (including shipping and tax)</strong>
+ <strong i18n:translate="">Total (including shipping and
tax)</strong>
</td>
<td><strong
tal:content="cart/get_total_price/(at)(at)pricedisplay" /></td>
</tr>
(at)(at) -76,3 +78,5 (at)(at)
</div>
+
+</html>
Modified: gocept.vendo/branches/paypal/src/gocept/vendo/browser/checkout.pt
==============================================================================
---
gocept.vendo/branches/paypal/src/gocept/vendo/browser/checkout.pt (original)
+++ gocept.vendo/branches/paypal/src/gocept/vendo/browser/checkout.pt Thu Oct
23 10:08:04 2008
(at)(at) -9,7 +9,7 (at)(at)
<metal:main fill-slot="main">
<tal:main-macro metal:define-macro="main" tal:define="cart view/cart">
- <h1 class="documentFirstHeading">
+ <h1 class="documentFirstHeading" i18n:translate="">
Shopping Cart
</h1>
<div metal:use-macro="context/(at)(at)cart_macros/display_cart" />
(at)(at) -20,7 +20,7 (at)(at)
tal:define="cart view/cart; errors view/errors">
<table><tr><td>
<div id="shipping_address">
- <h3>Shipping address:</h3>
+ <h3 i18n:translate="">Shipping address:</h3>
<table tal:define="address cart/get_shipping_address"
id="shipping_address">
<tr>
(at)(at) -28,7 +28,7 (at)(at)
<div
tal:attributes="class python: errors.get('shipping_firstname',\
None) and 'field error' or 'field'">
- <label for="firstname">
+ <label for="firstname" i18n:translate="">
First Name:
</label>
<span tal:replace="python: 'firstname' in
address.required_fields\
(at)(at) -48,7 +48,7 (at)(at)
<div
tal:attributes="class python: errors.get('shipping_lastname',\
None) and 'field error' or 'field'">
- <label for="lastname">
+ <label for="lastname" i18n:translate="">
Last Name:
</label>
<span tal:replace="python: 'lastname' in
address.required_fields\
(at)(at) -68,7 +68,7 (at)(at)
<div
tal:attributes="class python: errors.get('shipping_company',\
None) and 'field error' or 'field'">
- <label for="company">
+ <label for="company" i18n:translate="">
Company:
</label>
<span tal:replace="python: 'company' in
address.required_fields\
(at)(at) -88,7 +88,7 (at)(at)
<div
tal:attributes="class python: errors.get('shipping_street',\
None) and 'field error' or 'field'">
- <label for="street">
+ <label for="street" i18n:translate="">
Address:
</label>
<span tal:replace="python: 'street' in
address.required_fields\
(at)(at) -108,7 +108,7 (at)(at)
<div
tal:attributes="class python: errors.get('shipping_street2',\
None) and 'field error' or 'field'">
- <label for="street2">
+ <label for="street2" i18n:translate="">
Address:
</label>
<span tal:replace="python: 'street2' in
address.required_fields\
(at)(at) -128,7 +128,7 (at)(at)
<div
tal:attributes="class python: errors.get('shipping_city',\
None) and 'field error' or 'field'">
- <label for="city">
+ <label for="city" i18n:translate="">
Town/City:
</label>
<span tal:replace="python: 'city' in address.required_fields\
(at)(at) -148,7 +148,7 (at)(at)
<div
tal:attributes="class python: errors.get('shipping_zip',\
None) and 'field error' or 'field'">
- <label for="zip">
+ <label for="zip" i18n:translate="">
Postcode:
</label>
<span tal:replace="python: 'zip' in address.required_fields\
(at)(at) -168,7 +168,7 (at)(at)
<div
tal:attributes="class python: errors.get('shipping_country',\
None) and 'field error' or 'field'">
- <label for="country">
+ <label for="country" i18n:translate="">
Country:
</label>
<span tal:replace="python: 'country' in
address.required_fields\
(at)(at) -210,7 +210,7 (at)(at)
<div id="countyfield" style="visibility:hidden"
tal:attributes="class python: errors.get('shipping_county',\
None) and 'field error' or 'field'">
- <label for="shipping-county">
+ <label for="shipping-county" i18n:translate="">
County:
</label> *<br />
<div class="fieldErrorBox"
(at)(at) -229,7 +229,7 (at)(at)
<div
tal:attributes="class python: errors.get('shipping_phone',\
None) and 'field error' or 'field'">
- <label for="phone">
+ <label for="phone" i18n:translate="">
Telephone:
</label>
<span tal:replace="python: 'phone' in
address.required_fields\
(at)(at) -249,7 +249,7 (at)(at)
<div
tal:attributes="class python: errors.get('shipping_mail',\
None) and 'field error' or 'field'">
- <label for="mail">
+ <label for="mail" i18n:translate="">
Email:
</label>
<span tal:replace="python: 'mail' in address.required_fields\
(at)(at) -272,7 +272,7 (at)(at)
<input type="checkbox" name="invoice_same_as_shipping"
value="Selected"
tal:attributes="checked python: cart.get_invoice_same_as_shipping()\
and 'CHECKED' or ''" />
- Invoice same as shipping address
+ <span i18n:translate="">Invoice same as shipping
address</span>
<table tal:define="address cart/get_invoice_address"
id="invoice_address">
<tr>
(at)(at) -280,7 +280,7 (at)(at)
<div
tal:attributes="class python: errors.get('invoice_firstname',\
None) and 'field error' or 'field'">
- <label for="firstname">
+ <label for="firstname" i18n:translate="">
First Name:
</label>
<span tal:replace="python: 'firstname' in
address.required_fields\
(at)(at) -300,7 +300,7 (at)(at)
<div
tal:attributes="class python: errors.get('invoice_lastname',\
None) and 'field error' or 'field'">
- <label for="lastname">
+ <label for="lastname" i18n:translate="">
Last Name:
</label>
<span tal:replace="python: 'lastname' in
address.required_fields\
(at)(at) -320,7 +320,7 (at)(at)
<div
tal:attributes="class python: errors.get('invoice_company',\
None) and 'field error' or 'field'">
- <label for="company">
+ <label for="company" i18n:translate="">
Company:
</label>
<span tal:replace="python: 'company' in
address.required_fields\
(at)(at) -340,7 +340,7 (at)(at)
<div
tal:attributes="class python: errors.get('invoice_street',\
None) and 'field error' or 'field'">
- <label for="street">
+ <label for="street" i18n:translate="">
Address:
</label>
<span tal:replace="python: 'street' in
address.required_fields\
(at)(at) -360,7 +360,7 (at)(at)
<div
tal:attributes="class python: errors.get('invoice_street2',\
None) and 'field error' or 'field'">
- <label for="street2">
+ <label for="street2" i18n:translate="">
Address:
</label>
<span tal:replace="python: 'street2' in
address.required_fields\
(at)(at) -380,7 +380,7 (at)(at)
<div
tal:attributes="class python: errors.get('invoice_city',\
None) and 'field error' or 'field'">
- <label for="city">
+ <label for="city" i18n:translate="">
Town/City:
</label>
<span tal:replace="python: 'city' in address.required_fields\
(at)(at) -400,7 +400,7 (at)(at)
<div
tal:attributes="class python: errors.get('invoice_zip',\
None) and 'field error' or 'field'">
- <label for="zip">
+ <label for="zip" i18n:translate="">
Postcode:
</label>
<span tal:replace="python: 'zip' in address.required_fields\
(at)(at) -420,7 +420,7 (at)(at)
<div
tal:attributes="class python: errors.get('invoice_country',\
None) and 'field error' or 'field'">
- <label for="country">
+ <label for="country" i18n:translate="">
Country:
</label>
<span tal:replace="python: 'country' in
address.required_fields\
(at)(at) -454,7 +454,7 (at)(at)
<div id="countyfield-inv" style="visibility:hidden"
tal:attributes="class python: errors.get('invoice_county',\
None) and 'field error' or 'field'">
- <label for="invoice-county">
+ <label for="invoice-county" i18n:translate="">
County:
</label> *<br />
<div class="fieldErrorBox"
(at)(at) -472,7 +472,7 (at)(at)
<div
tal:attributes="class python: errors.get('invoice_phone',\
None) and 'field error' or 'field'">
- <label for="phone">
+ <label for="phone" i18n:translate="">
Telephone:
</label>
<span tal:replace="python: 'phone' in
address.required_fields\
(at)(at) -492,7 +492,7 (at)(at)
<div
tal:attributes="class python: errors.get('invoice_mail',\
None) and 'field error' or 'field'">
- <label for="mail">
+ <label for="mail" i18n:translate="">
Email:
</label>
<span tal:replace="python: 'mail' in address.required_fields\
(at)(at) -513,21 +513,21 (at)(at)
<div
tal:attributes="class python: errors.get('terms_and_conditions',\
None) and 'field error' or 'field'">
- <div class="fieldErrorBox"
+ <div i18n:translate="" class="fieldErrorBox"
tal:condition="python: errors.has_key('terms_and_conditions')">
Please accept the terms and conditions.
</div>
<input type="checkbox" name="terms_and_conditions" value="Selected"
tal:attributes="checked python: cart.get_accept_terms() and\
'CHECKED' or ''" />
- I've read the <a href="#" tal:attributes="onclick
string:window.open('${view/agb_url}/popup', 'Terms and Conditions',
'height=800,width=500,menubar=no,toolbar=no,status=no,location=no')">terms
and conditions</a>
- and accept them.
+ <span i18n:translate="">I've read the <a
i18n:translate="" i18n:name="tac_link" href="#" tal:attributes="onclick
string:window.open('${view/agb_url}/popup', 'TermsAndConditions',
'height=800,width=500,menubar=no,toolbar=no,status=no,location=no,scrollbars=yes')">terms
and conditions</a>
+ and accept them.</span>
</div>
<input type="hidden" name="form.submitted" value="1" />
<input type="submit" class="context" name="form.button.CheckOut"
- value="CheckOut" />
+ value="CheckOut" i18n:attributes="value"/>
<input type="submit" class="context" name="form.button.Change"
- value="Change" />
+ value="Change" i18n:attributes="value" />
</form>
<script type="text/javascript">
checkCountry(document.getElementById('shipping-country').value,
'countyfield');
Modified:
gocept.vendo/branches/paypal/src/gocept/vendo/browser/finish_checkout.pt
==============================================================================
---
gocept.vendo/branches/paypal/src/gocept/vendo/browser/finish_checkout.pt (original)
+++
gocept.vendo/branches/paypal/src/gocept/vendo/browser/finish_checkout.pt Thu
Oct 23 10:08:04 2008
(at)(at) -19,10 +19,10 (at)(at)
<input type="submit" id="editcart" name="change_cart" value="Edit cart"
/>
<hr />
<tal:shipping define="address cart/shipping_address">
- <h3 tal:condition="not: cart/get_invoice_same_as_shipping">
+ <h3 i18n:translate="" tal:condition="not:
cart/get_invoice_same_as_shipping">
Shipping Address
</h3>
- <h3 tal:condition="cart/get_invoice_same_as_shipping">
+ <h3 i18n:translate=""
tal:condition="cart/get_invoice_same_as_shipping">
Shipping and Invoice Address
</h3>
<div metal:use-macro="context/(at)(at)cart_macros/display_address"
/>
(at)(at) -30,17 +30,17 (at)(at)
<tal:invoice define="address cart/invoice_address"
tal:condition="not: cart/get_invoice_same_as_shipping">
- <h3 >
+ <h3 i18n:translate="">
Invoice Address
</h3>
<div metal:use-macro="context/(at)(at)cart_macros/display_address"
/>
</tal:invoice>
<input type="submit" name="change_address" value="Edit address" />
</form>
- <h3>Proceed Checkout</h3>
+ <h3 i18n:translate="">Proceed Checkout</h3>
<form method="post" tal:attributes="
action view/paypal_url" id="paypalform">
- <input type="submit" name="form.button.Pay" value="Continue"
/>
+ <input i18n:attributes="value" type="submit"
name="form.button.Pay" value="Continue" />
</form>
</tal:main-macro>
</metal:main>
Modified: gocept.vendo/branches/paypal/src/gocept/vendo/browser/popup.pt
==============================================================================
--- gocept.vendo/branches/paypal/src/gocept/vendo/browser/popup.pt (original)
+++ gocept.vendo/branches/paypal/src/gocept/vendo/browser/popup.pt Thu Oct 23
10:08:04 2008
(at)(at) -2,5 +2,12 (at)(at)
<head>
<div tal:replace="structure provider:plone.htmlhead" />
</head>
- <body tal:content="structure context/getText" />
+ <body style="padding:10px;">
+ <p class="body_18" align="center" tal:content="context/Title" />
+ <p align="center" class="body_10bold" tal:content="context/Description"
/>
+ <br/>
+ <div class="body_10">
+ <span tal:replace="structure context/getText" />
+ </div>
+ </body>
</html>
Modified: gocept.vendo/branches/paypal/src/gocept/vendo/configure.zcml
==============================================================================
--- gocept.vendo/branches/paypal/src/gocept/vendo/configure.zcml (original)
+++ gocept.vendo/branches/paypal/src/gocept/vendo/configure.zcml Thu Oct 23
10:08:04 2008
(at)(at) -1,6 +1,7 (at)(at)
<configure
xmlns="http://namespaces.zope.org/zope"
xmlns:five="http://namespaces.zope.org/five"
+ xmlns:i18n="http://namespaces.zope.org/i18n"
xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
i18n_domain="gocept.vendo">
(at)(at) -22,8 +23,22 (at)(at)
<adapter factory=".shipping.ShippingProvider" />
<adapter factory=".order.OrderFactory" />
<adapter factory=".payment.PayPalDataProvider" />
+
+ <interface
+ interface=".orderevent.IOrderAddedEvent"
+ type="plone.contentrules.rule.interfaces.IRuleEventType"
+ name="New Vendo Order"
+ />
+
+ <subscriber
+ for=".orderevent.IOrderAddedEvent"
+ handler=".orderevent.neworder"
+ />
<subscriber
handler=".eventhandler.onObjectAdded"
/>
+ <i18n:registerTranslations directory="i18n" />
+
+
</configure>
Modified: gocept.vendo/branches/paypal/src/gocept/vendo/content/order.py
==============================================================================
--- gocept.vendo/branches/paypal/src/gocept/vendo/content/order.py (original)
+++ gocept.vendo/branches/paypal/src/gocept/vendo/content/order.py Thu Oct 23
10:08:04 2008
(at)(at) -45,7 +45,7 (at)(at)
widget=atapi.ComputedWidget(label="Subtotal"),
),
atapi.ComputedField('vat',
- expression='context.vat_sum',
+ expression='context.vat',
widget=atapi.ComputedWidget(label="VAT sum"),
),
atapi.ComputedField('vat_rate',
Modified:
gocept.vendo/branches/paypal/src/gocept/vendo/content/shippingmethod.py
==============================================================================
---
gocept.vendo/branches/paypal/src/gocept/vendo/content/shippingmethod.py (original)
+++ gocept.vendo/branches/paypal/src/gocept/vendo/content/shippingmethod.py Thu
Oct 23 10:08:04 2008
(at)(at) -17,7 +17,7 (at)(at)
VendoShippingMethodSchema = schemata.ATContentTypeSchema.copy() +\
atapi.Schema((
atapi.FixedPointField('price',
- required=True,
+ required=False,
searchable=False,
storage=atapi.AnnotationStorage(),
widget=atapi.DecimalWidget(
Modified: gocept.vendo/branches/paypal/src/gocept/vendo/content/shop.py
==============================================================================
--- gocept.vendo/branches/paypal/src/gocept/vendo/content/shop.py (original)
+++ gocept.vendo/branches/paypal/src/gocept/vendo/content/shop.py Thu Oct 23
10:08:04 2008
(at)(at) -86,7 +86,7 (at)(at)
required=True,
searchable=False,
storage=atapi.AnnotationStorage(),
- widget=atapi.PasswordWidget(
+ widget=atapi.StringWidget(
label=_(u'Paypal Password'),
description=_(u'Your PayPal password.')
)
Added:
gocept.vendo/branches/paypal/src/gocept/vendo/i18n/de/LC_MESSAGES/gocept.vendo.po
==============================================================================
--- (empty file)
+++
gocept.vendo/branches/paypal/src/gocept/vendo/i18n/de/LC_MESSAGES/gocept.vendo.po Thu
Oct 23 10:08:04 2008
(at)(at) -0,0 +1,571 (at)(at)
+# Gettext Message File for gocept.vendo
+# Sebastian Wehrmann <sw(at)gocept.com>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: gocept.vendo\n"
+"POT-Creation-Date: Mon Aug 11 11:24:50 2008\n"
+"PO-Revision-Date: 2008-08-11 11:33+0100\n"
+"Last-Translator: Sebastian Wehrmann <sw(at)gocept.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language-Code: de\n"
+"Language-Name: German\n"
+"Preferred-Encodings: utf-8 latin1\n"
+"Domain: gocept.vendo\n"
+
+#: src/gocept/vendo/browser/allproducts.pt:65
+msgid "Quantity"
+msgstr "Anzahl"
+
+#: src/gocept/vendo/browser/cart.pt:101
+#: src/gocept/vendo/browser/productvariation.pt:12
+#: src/gocept/vendo/browser/productvariation.pt:16
+msgid "${DYNAMIC_CONTENT}"
+msgstr "${DYNAMIC_CONTENT}"
+
+#: src/gocept/vendo/browser/cart.pt:11
+msgid "Shopping Cart (overview)"
+msgstr "Warenkorb (Übersicht)"
+
+#. Default: "Continue"
+#: src/gocept/vendo/browser/cart.pt:112
+msgid "continue-button"
+msgstr "Weiter"
+
+#. Default: "Change"
+#: src/gocept/vendo/browser/cart.pt:114
+#: src/gocept/vendo/browser/checkout.pt:578
+msgid "change-button"
+msgstr "Daten ändern"
+
+#: src/gocept/vendo/browser/cart.pt:66
+msgid "Select ShippingMethod"
+msgstr "Versandart auswählen"
+
+#: src/gocept/vendo/browser/cart.pt:82
+msgid "Tax"
+msgstr "Steuer"
+
+#: src/gocept/vendo/browser/cart.pt:90
+#: src/gocept/vendo/browser/cart_macros.pt:50
+msgid "Total amount to pay"
+msgstr "Zu zahlender Betrag"
+
+#: src/gocept/vendo/browser/cart.pt:97
+#: src/gocept/vendo/browser/cart_macros.pt:56
+msgid "Payment"
+msgstr "Bezahlung"
+
+#: src/gocept/vendo/browser/cart_macros.pt:43
+msgid "Tax (${vat-rate} %)"
+msgstr "Mwst (${vat-rate}%)"
+
+#: src/gocept/vendo/browser/checkout.pt:111
+#: src/gocept/vendo/browser/checkout.pt:383
+msgid "Address:"
+msgstr "Adresse:"
+
+#: src/gocept/vendo/browser/checkout.pt:131
+#: src/gocept/vendo/browser/checkout.pt:403
+msgid "Address (extra):"
+msgstr "Adresse (Zusatz):"
+
+#: src/gocept/vendo/browser/checkout.pt:151
+#: src/gocept/vendo/browser/checkout.pt:423
+msgid "Town/City:"
+msgstr "Stadt:"
+
+#: src/gocept/vendo/browser/checkout.pt:171
+#: src/gocept/vendo/browser/checkout.pt:443
+msgid "Postcode:"
+msgstr "PLZ:"
+
+#: src/gocept/vendo/browser/checkout.pt:191
+#: src/gocept/vendo/browser/checkout.pt:463
+msgid "Country:"
+msgstr "Land:"
+
+#: src/gocept/vendo/browser/checkout.pt:23
+msgid "Shipping address:"
+msgstr "Lieferadresse:"
+
+#: src/gocept/vendo/browser/checkout.pt:233
+#: src/gocept/vendo/browser/checkout.pt:497
+msgid "County:"
+msgstr "Bundesland:"
+
+#: src/gocept/vendo/browser/checkout.pt:252
+#: src/gocept/vendo/browser/checkout.pt:515
+msgid "Telephone:"
+msgstr "Telefonnummer:"
+
+#: src/gocept/vendo/browser/checkout.pt:272
+#: src/gocept/vendo/browser/checkout.pt:535
+msgid "Email:"
+msgstr "E-Mail-Adresse"
+
+#: src/gocept/vendo/browser/checkout.pt:291
+msgid "Invoice address:"
+msgstr "Rechnungsadresse:"
+
+#: src/gocept/vendo/browser/checkout.pt:295
+msgid "Invoice same as shipping address"
+msgstr "Rechnungsadresse und Lieferadresse sind gleich"
+
+#: src/gocept/vendo/browser/checkout.pt:31
+#: src/gocept/vendo/browser/checkout.pt:303
+msgid "First Name:"
+msgstr "Vorname:"
+
+#: src/gocept/vendo/browser/checkout.pt:51
+#: src/gocept/vendo/browser/checkout.pt:323
+msgid "Last Name:"
+msgstr "Nachname:"
+
+#: src/gocept/vendo/browser/checkout.pt:556
+msgid "Please accept the terms and conditions."
+msgstr "Ich habe die AGB gelesen und erkenne Sie an."
+
+#: src/gocept/vendo/browser/checkout.pt:565
+msgid "terms and conditions"
+msgstr "Allgemeinen Geschäftsbedingungen"
+
+#: src/gocept/vendo/browser/checkout.pt:565
+msgid "I've read the ${tac-link} and accept them."
+msgstr "Ich habe die ${tac-link} gelesen und bin mit ihnen einverstanden."
+
+#. Default: "Continue"
+#: src/gocept/vendo/browser/checkout.pt:576
+msgid "checkout-button"
+msgstr "Bezahlvorgang abschließen"
+
+#: src/gocept/vendo/browser/checkout.pt:71
+#: src/gocept/vendo/browser/checkout.pt:343
+msgid "Programprovider:"
+msgstr "Programmanbieter:"
+
+#: src/gocept/vendo/browser/checkout.pt:91
+#: src/gocept/vendo/browser/checkout.pt:363
+msgid "Providerarea:"
+msgstr "Anbieterstelle:"
+
+#: src/gocept/vendo/browser/finish_checkout.pt:12
+msgid "Order Summary"
+msgstr "Übersicht Bestellung"
+
+#. Default: "Edit cart"
+#: src/gocept/vendo/browser/finish_checkout.pt:19
+msgid "edit-cart-button"
+msgstr "Warenkorb ändern"
+
+#: src/gocept/vendo/browser/finish_checkout.pt:23
+msgid "Shipping Address"
+msgstr "Lieferanschrift"
+
+#: src/gocept/vendo/browser/finish_checkout.pt:26
+msgid "Shipping and Invoice Address"
+msgstr "Liefer- und Rechnungsanschrift"
+
+#: src/gocept/vendo/browser/finish_checkout.pt:34
+msgid "Invoice Address"
+msgstr "Rechnungsanschrift"
+
+#. Default: "Edit address"
+#: src/gocept/vendo/browser/finish_checkout.pt:39
+msgid "change-address-button"
+msgstr "Adressdaten ändern"
+
+#: src/gocept/vendo/browser/finish_checkout.pt:41
+msgid "Finish Checkout"
+msgstr "Bezahlvorgang abschließen"
+
+#. Default: "Finish Checkout"
+#: src/gocept/vendo/browser/finish_checkout.pt:42
+msgid "finish-checkout"
+msgstr "Einkauf abschließen"
+
+#: src/gocept/vendo/browser/finished_checkout.pt:11
+msgid "Thank you for your order."
+msgstr "Vielen Dank für Ihre Bestellung."
+
+#: src/gocept/vendo/browser/finished_checkout.pt:12
+msgid "You will shortly recive an order acceptance by email."
+msgstr "Sie erhalten in Kürze eine Bestätigung per E-Mail."
+
+#. Default: "utf-8"
+#: src/gocept/vendo/browser/product.py:30
+msgid "%i %s added to cart."
+msgstr "%i %s in den Warenkorb gelegt."
+
+#: src/gocept/vendo/browser/productvariation.pt:22
+msgid "Price per unit: ${price} €"
+msgstr "Stückpreis: ${price} €"
+
+#: src/gocept/vendo/browser/productvariation.pt:30
+msgid "Add to cart"
+msgstr "In den Warenkorb"
+
+#: src/gocept/vendo/content/order.py:111
+msgid "Item"
+msgstr "Position"
+
+#: src/gocept/vendo/content/order.py:118
+msgid "Item ID"
+msgstr "Positionsnummer"
+
+#: src/gocept/vendo/content/order.py:125
+#: src/gocept/vendo/vendo_ordertool/viewDetails.pt:40
+msgid "Amount"
+msgstr "Anzahl"
+
+#: src/gocept/vendo/content/order.py:132
+#: src/gocept/vendo/content/product.py:105
+#: src/gocept/vendo/vendo_ordertool/viewDetails.pt:41
+msgid "Price"
+msgstr "Preis"
+
+#: src/gocept/vendo/content/order.py:139
+#: src/gocept/vendo/vendo_ordertool/viewDetails.pt:42
+msgid "Sum"
+msgstr "Summe"
+
+#: src/gocept/vendo/content/order.py:36
+msgid "Payment order number"
+msgstr "Bezahlvorgangsnummer"
+
+#: src/gocept/vendo/content/order.py:43
+msgid "Shipping Method"
+msgstr "Versandart auswählen"
+
+#: src/gocept/vendo/content/order.py:50
+#: src/gocept/vendo/browser/cart.pt:57
+#: src/gocept/vendo/browser/cart_macros.pt:36
+msgid "Shipping"
+msgstr "Versand"
+
+#: src/gocept/vendo/content/order.py:57
+msgid "Subtotal"
+msgstr "Untertitel"
+
+#: src/gocept/vendo/content/order.py:64
+msgid "VAT sum"
+msgstr "Summe MwSt."
+
+#: src/gocept/vendo/content/order.py:71
+msgid "VAT rate"
+msgstr "MwSt."
+
+#: src/gocept/vendo/content/order.py:78
+#: src/gocept/vendo/browser/cart.pt:27
+#: src/gocept/vendo/browser/cart.pt:51
+#: src/gocept/vendo/browser/cart_macros.pt:17
+#: src/gocept/vendo/browser/cart_macros.pt:30
+#: src/gocept/vendo/portlets/cart.pt:15
+msgid "Total"
+msgstr "Summe"
+
+#: src/gocept/vendo/content/product.py:106
+msgid "Enter the price of this product variation"
+msgstr "Der Standardpreis dieses Produktes."
+
+#: src/gocept/vendo/content/product.py:126
+msgid "Variation name"
+msgstr "Variationsbezeichnung"
+
+#: src/gocept/vendo/content/product.py:22
+#: src/gocept/vendo/interfaces/product.py:13
+msgid "Subtitle"
+msgstr "Untertitel"
+
+#: src/gocept/vendo/content/product.py:23
+msgid "Enter a subtitle"
+msgstr "Bitte geben Sie einen Untertitel an."
+
+#: src/gocept/vendo/content/product.py:29
+msgid "SKU id"
+msgstr "SKU Nummer"
+
+#: src/gocept/vendo/content/product.py:30
+msgid "Enter the stock keeping unit id"
+msgstr "SKU"
+
+#: src/gocept/vendo/content/product.py:36
+msgid "Small image"
+msgstr "Vorschaubild"
+
+#: src/gocept/vendo/content/product.py:37
+msgid "Choose a small image showing the product"
+msgstr "Wählen Sie ein kleines Bild des Produkts aus."
+
+#: src/gocept/vendo/content/product.py:43
+msgid "Detailed image"
+msgstr "Bild"
+
+#: src/gocept/vendo/content/product.py:44
+msgid "Choose a detailed image describing the product"
+msgstr "Wählen Sie ein detailliertes Bild dieses Produktes aus."
+
+#: src/gocept/vendo/content/product.py:50
+msgid "Long description"
+msgstr "Ausführliche Beschreibung"
+
+#: src/gocept/vendo/content/product.py:51
+msgid "Enter a detailed description for this product"
+msgstr "Geben Sie eine ausführliche Beschreibung des Produktes ein."
+
+#: src/gocept/vendo/content/product.py:57
+#: src/gocept/vendo/interfaces/product.py:24
+msgid "Variation type"
+msgstr "Art der Variation."
+
+#: src/gocept/vendo/content/product.py:58
+msgid "Enter the type of the variations, e.g. \"size\" or
\"color\""
+msgstr "Die Art der Variation (z.B. Größe, Farbe)"
+
+#: src/gocept/vendo/content/product.py:65
+msgid "Product name"
+msgstr "Produktbezeichnung"
+
+#: src/gocept/vendo/content/product.py:69
+#: src/gocept/vendo/content/product.py:130
+msgid "Short description"
+msgstr "Kurzbeschreibung"
+
+#: src/gocept/vendo/content/product.py:98
+msgid "Sub-SKU id"
+msgstr "Unter SKU Nummer"
+
+#: src/gocept/vendo/content/product.py:99
+msgid "Enter addition for the sku of this variation"
+msgstr "Geben Sie den Zusatz für die SKU dieser Variation an"
+
+#: src/gocept/vendo/content/shippingmethod.py:24
+#: src/gocept/vendo/interfaces/shippingmethod.py:13
+msgid "Shipping price"
+msgstr "Versandkosten"
+
+#: src/gocept/vendo/content/shippingmethod.py:25
+msgid "Set the price for shipping to these
destinations."
+msgstr "Bitte die Kosten für den Versand in folgende Länder angeben:"
+
+#: src/gocept/vendo/content/shippingmethod.py:35
+#: src/gocept/vendo/interfaces/shippingmethod.py:15
+msgid "Destination Countries"
+msgstr "Versandziele"
+
+#: src/gocept/vendo/content/shippingmethod.py:36
+msgid "Countries this method is available
for"
+msgstr "Länder, in die verschickt wird"
+
+#: src/gocept/vendo/content/shippingmethod.py:43
+msgid "Shippingmethod name"
+msgstr "Versandmethode"
+
+#: src/gocept/vendo/content/shippingmethod.py:47
+msgid "Shippingmethod
description"
+msgstr "Beschreibung"
+
+#: src/gocept/vendo/content/shop.py:24
+#: src/gocept/vendo/interfaces/shop.py:13
+msgid "Curreny"
+msgstr "Währung"
+
+#: src/gocept/vendo/content/shop.py:25
+#: src/gocept/vendo/interfaces/shop.py:14
+msgid "The currency for this shop"
+msgstr "Die Währung dieses Shops"
+
+#: src/gocept/vendo/content/shop.py:34
+#: src/gocept/vendo/interfaces/shop.py:15
+msgid "Shipping Countries"
+msgstr "Versandziele"
+
+#: src/gocept/vendo/content/shop.py:35
+#: src/gocept/vendo/interfaces/shop.py:16
+msgid "Countries this shop is shipping to"
+msgstr "Länder, in die versendet wird."
+
+#: src/gocept/vendo/content/shop.py:43
+#: src/gocept/vendo/interfaces/shop.py:17
+msgid "Country"
+msgstr "Land"
+
+#: src/gocept/vendo/content/shop.py:44
+#: src/gocept/vendo/interfaces/shop.py:18
+msgid "Country of this shop"
+msgstr "Das Land dieses Shops"
+
+#: src/gocept/vendo/content/shop.py:52
+#: src/gocept/vendo/interfaces/shop.py:19
+msgid "Shop VAT Rate"
+msgstr "MwSt."
+
+#: src/gocept/vendo/content/shop.py:53
+#: src/gocept/vendo/interfaces/shop.py:20
+msgid "Set the VAT rate for this shop"
+msgstr "Mehrwertsteuer-Satz dieses Shops"
+
+#: src/gocept/vendo/content/shop.py:61
+#: src/gocept/vendo/interfaces/shop.py:21
+msgid "Shop Prefix"
+msgstr "Shop-Präfix"
+
+#: src/gocept/vendo/content/shop.py:62
+msgid "Global prefix to be used by shop to
allow multiple shops per site"
+msgstr "Interner, globaler Präfix für diesen Shop. Erlaubt die Verwendung
mehrerer Shops auf einer Plone Seite."
+
+#: src/gocept/vendo/content/shop.py:71
+msgid "Terms and conditions"
+msgstr "Allgemeine Geschäftsbedingungen"
+
+#: src/gocept/vendo/content/shop.py:72
+msgid "Select the terms and conditions"
+msgstr "Bitte wählen Sie die AGB's aus."
+
+#: src/gocept/vendo/content/shop.py:78
+msgid "Shop name"
+msgstr "Name des Shops"
+
+#: src/gocept/vendo/content/shop.py:82
+msgid "Shop description"
+msgstr "Beschreibung des Shops"
+
+#: src/gocept/vendo/interfaces/product.py:14
+msgid "Enter a subtitle."
+msgstr "Bitte geben Sie einen Untertitel an."
+
+#: src/gocept/vendo/interfaces/product.py:15
+msgid "Stock keeping unit id"
+msgstr "SKU"
+
+#: src/gocept/vendo/interfaces/product.py:16
+msgid "Unique id describing this product."
+msgstr "Eindeutige ID für dieses Produkt."
+
+#: src/gocept/vendo/interfaces/product.py:17
+msgid "small image"
+msgstr "Vorschaubild"
+
+#: src/gocept/vendo/interfaces/product.py:18
+msgid "Thumbnail of the product."
+msgstr "Vorschaubild für dieses Produkt."
+
+#: src/gocept/vendo/interfaces/product.py:19
+msgid "detailed image"
+msgstr "Bild"
+
+#: src/gocept/vendo/interfaces/product.py:20
+msgid "Image of the product."
+msgstr "Detailliertes Bild für dieses Produkt."
+
+#: src/gocept/vendo/interfaces/product.py:21
+msgid "long description"
+msgstr "Beschreibung"
+
+#: src/gocept/vendo/interfaces/product.py:22
+msgid "A detailed description of
the product."
+msgstr "Ausführliche Beschreibung des Produktes."
+
+#: src/gocept/vendo/interfaces/product.py:25
+msgid "Type of the variations, e.g.
size/color."
+msgstr "Die Art der Variation (z.B. Größe, Farbe)"
+
+#: src/gocept/vendo/interfaces/product.py:30
+msgid "Sub Stock keeping unit id"
+msgstr "VSKU"
+
+#: src/gocept/vendo/interfaces/product.py:31
+msgid "Unique id descr. this variation."
+msgstr "Eindeutige ID für diese Variation."
+
+#: src/gocept/vendo/interfaces/product.py:32
+msgid "default price"
+msgstr "Standardpreis"
+
+#: src/gocept/vendo/interfaces/product.py:33
+msgid "Default price of the product."
+msgstr "Der Standardpreis dieses Produktes."
+
+#: src/gocept/vendo/interfaces/product.py:34
+msgid "Singular unit name"
+msgstr "Einheit Einzahl"
+
+#: src/gocept/vendo/interfaces/product.py:35
+msgid "Plural unit name"
+msgstr "Einheit Mehrzahl"
+
+#: src/gocept/vendo/interfaces/shippingmethod.py:14
+msgid "Price for shipping."
+msgstr "Versandpreis"
+
+#: src/gocept/vendo/interfaces/shippingmethod.py:16
+msgid "Countries this method is available
for"
+msgstr "Länder, in die verschickt wird."
+
+#: src/gocept/vendo/interfaces/shop.py:22
+msgid "Global prefix to be used by shop to
allow multiple shops per site"
+msgstr "Interner, globaler Präfix für diesen Shop. Erlaubt die Verwendung
mehrerer Shops auf einer Plone Seite."
+
+#: src/gocept/vendo/interfaces/shop.py:24
+msgid "Terms Conditions"
+msgstr "AGB"
+
+#: src/gocept/vendo/interfaces/shop.py:25
+msgid "Set the terms condtions."
+msgstr "Setzen Sie die Allgemeinen Geschäftsbedingungen."
+
+#: src/gocept/vendo/portlets/cart.pt:12
+msgid "Total items in your cart"
+msgstr "Positionen in ihrem Warenkorb"
+
+#: src/gocept/vendo/portlets/cart.pt:18
+msgid "view cart"
+msgstr "Zum Warenkorb"
+
+#: src/gocept/vendo/portlets/cart.py:42
+#: src/gocept/vendo/browser/checkout.pt:12
+#: src/gocept/vendo/portlets/cart.pt:7
+msgid "Shopping Cart"
+msgstr "Warenkorb"
+
+#: src/gocept/vendo/portlets/cart.py:78
+msgid "Add Cart portlet"
+msgstr "Warenkorb Portlet hinzufügen."
+
+#: src/gocept/vendo/portlets/cart.py:79
+msgid "Portlet for a shopping cart."
+msgstr "Warenkorb Portlet."
+
+#: src/gocept/vendo/portlets/cart.py:92
+msgid "Edit Cart portlet"
+msgstr "Warenkorb Portlet bearbeiten"
+
+#: src/gocept/vendo/portlets/cart.py:93
+msgid "This portlet displays a shopping cart."
+msgstr "Dieses Portlet stellt einen Warenkorb zur Verfügung."
+
+#: src/gocept/vendo/vendo_ordertool/viewDetails.pt:38
+msgid "Pos."
+msgstr "Pos."
+
+#: src/gocept/vendo/vendo_ordertool/viewDetails.pt:39
+msgid "Product"
+msgstr "Produkt"
+
+#~ msgid "Prepayment"
+#~ msgstr "Vorauskasse"
+#~ msgid "Direct debit"
+#~ msgstr "Lastschrift"
+#~ msgid "Company:"
+#~ msgstr "Firma:"
+#~ msgid "CheckOut"
+#~ msgstr "Bezahlvorgang abschließen"
+#~ msgid "Tax (${DYNAMIC_CONTENT} %)"
+#~ msgstr "MwSt. (${DYNAMIC_CONTENT} %)"
+#~ msgid "Change"
+#~ msgstr "Ändern"
+#~ msgid "<strong>Total amount to pay<strong>
</strong></strong>"
+#~ msgstr "<strong>Zu zahlender Betrag<strong>
</strong></strong>"
+
Added: gocept.vendo/branches/paypal/src/gocept/vendo/i18n/gocept.vendo.pot
==============================================================================
--- (empty file)
+++ gocept.vendo/branches/paypal/src/gocept/vendo/i18n/gocept.vendo.pot Thu Oct
23 10:08:04 2008
(at)(at) -0,0 +1,564 (at)(at)
+##############################################################################
+#
+# Copyright (c) 2003-2004 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+msgid ""
+msgstr ""
+"Project-Id-Version: Development/Unknown\n"
+"POT-Creation-Date: Mon Aug 11 11:24:50 2008\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL(at)ADDRESS>\n"
+"Language-Team: Zope 3 Developers <zope3-dev(at)zope.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: zope/app/locales/extract.py\n"
+
+#: src/gocept/vendo/browser/allproducts.pt:65
+msgid "Quantity"
+msgstr ""
+
+#: src/gocept/vendo/browser/cart.pt:101
+#: src/gocept/vendo/browser/productvariation.pt:12
+#: src/gocept/vendo/browser/productvariation.pt:16
+msgid "${DYNAMIC_CONTENT}"
+msgstr ""
+
+#: src/gocept/vendo/browser/cart.pt:11
+msgid "Shopping Cart (overview)"
+msgstr ""
+
+#: src/gocept/vendo/browser/cart.pt:112
+#. Default: "Continue"
+msgid "continue-button"
+msgstr ""
+
+#: src/gocept/vendo/browser/cart.pt:114
+#: src/gocept/vendo/browser/checkout.pt:578
+#. Default: "Change"
+msgid "change-button"
+msgstr ""
+
+#: src/gocept/vendo/browser/cart.pt:66
+msgid "Select ShippingMethod"
+msgstr ""
+
+#: src/gocept/vendo/browser/cart.pt:82
+msgid "Tax"
+msgstr ""
+
+#: src/gocept/vendo/browser/cart.pt:90
+#: src/gocept/vendo/browser/cart_macros.pt:50
+msgid "Total amount to pay"
+msgstr ""
+
+#: src/gocept/vendo/browser/cart.pt:97
+#: src/gocept/vendo/browser/cart_macros.pt:56
+msgid "Payment"
+msgstr ""
+
+#: src/gocept/vendo/browser/cart_macros.pt:43
+msgid "Tax (${vat-rate} %)"
+msgstr ""
+
+#: src/gocept/vendo/browser/checkout.pt:111
+#: src/gocept/vendo/browser/checkout.pt:383
+msgid "Address:"
+msgstr ""
+
+#: src/gocept/vendo/browser/checkout.pt:131
+#: src/gocept/vendo/browser/checkout.pt:403
+msgid "Address (extra):"
+msgstr ""
+
+#: src/gocept/vendo/browser/checkout.pt:151
+#: src/gocept/vendo/browser/checkout.pt:423
+msgid "Town/City:"
+msgstr ""
+
+#: src/gocept/vendo/browser/checkout.pt:171
+#: src/gocept/vendo/browser/checkout.pt:443
+msgid "Postcode:"
+msgstr ""
+
+#: src/gocept/vendo/browser/checkout.pt:191
+#: src/gocept/vendo/browser/checkout.pt:463
+msgid "Country:"
+msgstr ""
+
+#: src/gocept/vendo/browser/checkout.pt:23
+msgid "Shipping address:"
+msgstr ""
+
+#: src/gocept/vendo/browser/checkout.pt:233
+#: src/gocept/vendo/browser/checkout.pt:497
+msgid "County:"
+msgstr ""
+
+#: src/gocept/vendo/browser/checkout.pt:252
+#: src/gocept/vendo/browser/checkout.pt:515
+msgid "Telephone:"
+msgstr ""
+
+#: src/gocept/vendo/browser/checkout.pt:272
+#: src/gocept/vendo/browser/checkout.pt:535
+msgid "Email:"
+msgstr ""
+
+#: src/gocept/vendo/browser/checkout.pt:291
+msgid "Invoice address:"
+msgstr ""
+
+#: src/gocept/vendo/browser/checkout.pt:295
+msgid "Invoice same as shipping address"
+msgstr ""
+
+#: src/gocept/vendo/browser/checkout.pt:31
+#: src/gocept/vendo/browser/checkout.pt:303
+msgid "First Name:"
+msgstr ""
+
+#: src/gocept/vendo/browser/checkout.pt:51
+#: src/gocept/vendo/browser/checkout.pt:323
+msgid "Last Name:"
+msgstr ""
+
+#: src/gocept/vendo/browser/checkout.pt:556
+msgid "Please accept the terms and conditions."
+msgstr ""
+
+#: src/gocept/vendo/browser/checkout.pt:565
+msgid "terms and conditions"
+msgstr ""
+
+#: src/gocept/vendo/browser/checkout.pt:565
+msgid "I've read the ${tac-link} and accept them."
+msgstr ""
+
+#: src/gocept/vendo/browser/checkout.pt:576
+#. Default: "Continue"
+msgid "checkout-button"
+msgstr ""
+
+#: src/gocept/vendo/browser/checkout.pt:71
+#: src/gocept/vendo/browser/checkout.pt:343
+msgid "Programprovider:"
+msgstr ""
+
+#: src/gocept/vendo/browser/checkout.pt:91
+#: src/gocept/vendo/browser/checkout.pt:363
+msgid "Providerarea:"
+msgstr ""
+
+#: src/gocept/vendo/browser/finish_checkout.pt:12
+msgid "Order Summary"
+msgstr ""
+
+#: src/gocept/vendo/browser/finish_checkout.pt:19
+#. Default: "Edit cart"
+msgid "edit-cart-button"
+msgstr ""
+
+#: src/gocept/vendo/browser/finish_checkout.pt:23
+msgid "Shipping Address"
+msgstr ""
+
+#: src/gocept/vendo/browser/finish_checkout.pt:26
+msgid "Shipping and Invoice Address"
+msgstr ""
+
+#: src/gocept/vendo/browser/finish_checkout.pt:34
+msgid "Invoice Address"
+msgstr ""
+
+#: src/gocept/vendo/browser/finish_checkout.pt:39
+#. Default: "Edit address"
+msgid "change-address-button"
+msgstr ""
+
+#: src/gocept/vendo/browser/finish_checkout.pt:41
+msgid "Finish Checkout"
+msgstr ""
+
+#: src/gocept/vendo/browser/finish_checkout.pt:42
+#. Default: "Finish Checkout"
+msgid "finish-checkout"
+msgstr ""
+
+#: src/gocept/vendo/browser/finished_checkout.pt:11
+msgid "Thank you for your order."
+msgstr ""
+
+#: src/gocept/vendo/browser/finished_checkout.pt:12
+msgid "You will shortly recive an order acceptance by email."
+msgstr ""
+
+#: src/gocept/vendo/browser/product.py:30
+#. Default: "utf-8"
+msgid "%i %s added to cart."
+msgstr ""
+
+#: src/gocept/vendo/browser/productvariation.pt:22
+msgid "Price per unit: ${price} €"
+msgstr ""
+
+#: src/gocept/vendo/browser/productvariation.pt:30
+msgid "Add to cart"
+msgstr ""
+
+#: src/gocept/vendo/content/order.py:111
+msgid "Item"
+msgstr ""
+
+#: src/gocept/vendo/content/order.py:118
+msgid "Item ID"
+msgstr ""
+
+#: src/gocept/vendo/content/order.py:125
+#: src/gocept/vendo/vendo_ordertool/viewDetails.pt:40
+msgid "Amount"
+msgstr ""
+
+#: src/gocept/vendo/content/order.py:132
+#: src/gocept/vendo/content/product.py:105
+#: src/gocept/vendo/vendo_ordertool/viewDetails.pt:41
+msgid "Price"
+msgstr ""
+
+#: src/gocept/vendo/content/order.py:139
+#: src/gocept/vendo/vendo_ordertool/viewDetails.pt:42
+msgid "Sum"
+msgstr ""
+
+#: src/gocept/vendo/content/order.py:36
+msgid "Payment order number"
+msgstr ""
+
+#: src/gocept/vendo/content/order.py:43
+msgid "Shipping Method"
+msgstr ""
+
+#: src/gocept/vendo/content/order.py:50
+#: src/gocept/vendo/browser/cart.pt:57
+#: src/gocept/vendo/browser/cart_macros.pt:36
+msgid "Shipping"
+msgstr ""
+
+#: src/gocept/vendo/content/order.py:57
+msgid "Subtotal"
+msgstr ""
+
+#: src/gocept/vendo/content/order.py:64
+msgid "VAT sum"
+msgstr ""
+
+#: src/gocept/vendo/content/order.py:71
+msgid "VAT rate"
+msgstr ""
+
+#: src/gocept/vendo/content/order.py:78
+#: src/gocept/vendo/browser/cart.pt:27
+#: src/gocept/vendo/browser/cart.pt:51
+#: src/gocept/vendo/browser/cart_macros.pt:17
+#: src/gocept/vendo/browser/cart_macros.pt:30
+#: src/gocept/vendo/portlets/cart.pt:15
+msgid "Total"
+msgstr ""
+
+#: src/gocept/vendo/content/product.py:106
+msgid "Enter the price of this product variation"
+msgstr ""
+
+#: src/gocept/vendo/content/product.py:126
+msgid "Variation name"
+msgstr ""
+
+#: src/gocept/vendo/content/product.py:22
+#: src/gocept/vendo/interfaces/product.py:13
+msgid "Subtitle"
+msgstr ""
+
+#: src/gocept/vendo/content/product.py:23
+msgid "Enter a subtitle"
+msgstr ""
+
+#: src/gocept/vendo/content/product.py:29
+msgid "SKU id"
+msgstr ""
+
+#: src/gocept/vendo/content/product.py:30
+msgid "Enter the stock keeping unit id"
+msgstr ""
+
+#: src/gocept/vendo/content/product.py:36
+msgid "Small image"
+msgstr ""
+
+#: src/gocept/vendo/content/product.py:37
+msgid "Choose a small image showing the product"
+msgstr ""
+
+#: src/gocept/vendo/content/product.py:43
+msgid "Detailed image"
+msgstr ""
+
+#: src/gocept/vendo/content/product.py:44
+msgid "Choose a detailed image describing the product"
+msgstr ""
+
+#: src/gocept/vendo/content/product.py:50
+msgid "Long description"
+msgstr ""
+
+#: src/gocept/vendo/content/product.py:51
+msgid "Enter a detailed description for this product"
+msgstr ""
+
+#: src/gocept/vendo/content/product.py:57
+#: src/gocept/vendo/interfaces/product.py:24
+msgid "Variation type"
+msgstr ""
+
+#: src/gocept/vendo/content/product.py:58
+msgid "Enter the type of the variations, e.g. \"size\" or
\"color\""
+msgstr ""
+
+#: src/gocept/vendo/content/product.py:65
+msgid "Product name"
+msgstr ""
+
+#: src/gocept/vendo/content/product.py:69
+#: src/gocept/vendo/content/product.py:130
+msgid "Short description"
+msgstr ""
+
+#: src/gocept/vendo/content/product.py:98
+msgid "Sub-SKU id"
+msgstr ""
+
+#: src/gocept/vendo/content/product.py:99
+msgid "Enter addition for the sku of this variation"
+msgstr ""
+
+#: src/gocept/vendo/content/shippingmethod.py:24
+#: src/gocept/vendo/interfaces/shippingmethod.py:13
+msgid "Shipping price"
+msgstr ""
+
+#: src/gocept/vendo/content/shippingmethod.py:25
+msgid "Set the price for shipping to these
destinations."
+msgstr ""
+
+#: src/gocept/vendo/content/shippingmethod.py:35
+#: src/gocept/vendo/interfaces/shippingmethod.py:15
+msgid "Destination Countries"
+msgstr ""
+
+#: src/gocept/vendo/content/shippingmethod.py:36
+msgid "Countries this method is available
for"
+msgstr ""
+
+#: src/gocept/vendo/content/shippingmethod.py:43
+msgid "Shippingmethod name"
+msgstr ""
+
+#: src/gocept/vendo/content/shippingmethod.py:47
+msgid "Shippingmethod
description"
+msgstr ""
+
+#: src/gocept/vendo/content/shop.py:24
+#: src/gocept/vendo/interfaces/shop.py:13
+msgid "Curreny"
+msgstr ""
+
+#: src/gocept/vendo/content/shop.py:25
+#: src/gocept/vendo/interfaces/shop.py:14
+msgid "The currency for this shop"
+msgstr ""
+
+#: src/gocept/vendo/content/shop.py:34
+#: src/gocept/vendo/interfaces/shop.py:15
+msgid "Shipping Countries"
+msgstr ""
+
+#: src/gocept/vendo/content/shop.py:35
+#: src/gocept/vendo/interfaces/shop.py:16
+msgid "Countries this shop is shipping to"
+msgstr ""
+
+#: src/gocept/vendo/content/shop.py:43
+#: src/gocept/vendo/interfaces/shop.py:17
+msgid "Country"
+msgstr ""
+
+#: src/gocept/vendo/content/shop.py:44
+#: src/gocept/vendo/interfaces/shop.py:18
+msgid "Country of this shop"
+msgstr ""
+
+#: src/gocept/vendo/content/shop.py:52
+#: src/gocept/vendo/interfaces/shop.py:19
+msgid "Shop VAT Rate"
+msgstr ""
+
+#: src/gocept/vendo/content/shop.py:53
+#: src/gocept/vendo/interfaces/shop.py:20
+msgid "Set the VAT rate for this shop"
+msgstr ""
+
+#: src/gocept/vendo/content/shop.py:61
+#: src/gocept/vendo/interfaces/shop.py:21
+msgid "Shop Prefix"
+msgstr ""
+
+#: src/gocept/vendo/content/shop.py:62
+msgid "Global prefix to be used by shop to
allow multiple shops per site"
+msgstr ""
+
+#: src/gocept/vendo/content/shop.py:71
+msgid "Terms and conditions"
+msgstr ""
+
+#: src/gocept/vendo/content/shop.py:72
+msgid "Select the terms and conditions"
+msgstr ""
+
+#: src/gocept/vendo/content/shop.py:78
+msgid "Shop name"
+msgstr ""
+
+#: src/gocept/vendo/content/shop.py:82
+msgid "Shop description"
+msgstr ""
+
+#: src/gocept/vendo/interfaces/product.py:14
+msgid "Enter a subtitle."
+msgstr ""
+
+#: src/gocept/vendo/interfaces/product.py:15
+msgid "Stock keeping unit id"
+msgstr ""
+
+#: src/gocept/vendo/interfaces/product.py:16
+msgid "Unique id describing this product."
+msgstr ""
+
+#: src/gocept/vendo/interfaces/product.py:17
+msgid "small image"
+msgstr ""
+
+#: src/gocept/vendo/interfaces/product.py:18
+msgid "Thumbnail of the product."
+msgstr ""
+
+#: src/gocept/vendo/interfaces/product.py:19
+msgid "detailed image"
+msgstr ""
+
+#: src/gocept/vendo/interfaces/product.py:20
+msgid "Image of the product."
+msgstr ""
+
+#: src/gocept/vendo/interfaces/product.py:21
+msgid "long description"
+msgstr ""
+
+#: src/gocept/vendo/interfaces/product.py:22
+msgid "A detailed description of
the product."
+msgstr ""
+
+#: src/gocept/vendo/interfaces/product.py:25
+msgid "Type of the variations, e.g.
size/color."
+msgstr ""
+
+#: src/gocept/vendo/interfaces/product.py:30
+msgid "Sub Stock keeping unit id"
+msgstr ""
+
+#: src/gocept/vendo/interfaces/product.py:31
+msgid "Unique id descr. this variation."
+msgstr ""
+
+#: src/gocept/vendo/interfaces/product.py:32
+msgid "default price"
+msgstr ""
+
+#: src/gocept/vendo/interfaces/product.py:33
+msgid "Default price of the product."
+msgstr ""
+
+#: src/gocept/vendo/interfaces/product.py:34
+msgid "Singular unit name"
+msgstr ""
+
+#: src/gocept/vendo/interfaces/product.py:35
+msgid "Plural unit name"
+msgstr ""
+
+#: src/gocept/vendo/interfaces/shippingmethod.py:14
+msgid "Price for shipping."
+msgstr ""
+
+#: src/gocept/vendo/interfaces/shippingmethod.py:16
+msgid "Countries this method is available
for"
+msgstr ""
+
+#: src/gocept/vendo/interfaces/shop.py:22
+msgid "Global prefix to be used by shop to
allow multiple shops per site"
+msgstr ""
+
+#: src/gocept/vendo/interfaces/shop.py:24
+msgid "Terms Conditions"
+msgstr ""
+
+#: src/gocept/vendo/interfaces/shop.py:25
+msgid "Set the terms condtions."
+msgstr ""
+
+#: src/gocept/vendo/portlets/cart.pt:12
+msgid "Total items in your cart"
+msgstr ""
+
+#: src/gocept/vendo/portlets/cart.pt:18
+msgid "view cart"
+msgstr ""
+
+#: src/gocept/vendo/portlets/cart.py:42
+#: src/gocept/vendo/browser/checkout.pt:12
+#: src/gocept/vendo/portlets/cart.pt:7
+msgid "Shopping Cart"
+msgstr ""
+
+#: src/gocept/vendo/portlets/cart.py:78
+msgid "Add Cart portlet"
+msgstr ""
+
+#: src/gocept/vendo/portlets/cart.py:79
+msgid "Portlet for a shopping cart."
+msgstr ""
+
+#: src/gocept/vendo/portlets/cart.py:92
+msgid "Edit Cart portlet"
+msgstr ""
+
+#: src/gocept/vendo/portlets/cart.py:93
+msgid "This portlet displays a shopping cart."
+msgstr ""
+
+#: src/gocept/vendo/vendo_ordertool/viewDetails.pt:38
+msgid "Pos."
+msgstr ""
+
+#: src/gocept/vendo/vendo_ordertool/viewDetails.pt:39
+msgid "Product"
+msgstr ""
+
Modified: gocept.vendo/branches/paypal/src/gocept/vendo/order.py
==============================================================================
--- gocept.vendo/branches/paypal/src/gocept/vendo/order.py (original)
+++ gocept.vendo/branches/paypal/src/gocept/vendo/order.py Thu Oct 23 10:08:04
2008
(at)(at) -4,6 +4,7 (at)(at)
from zope.component import adapts, getUtility
from OFS.SimpleItem import SimpleItem
from Products.CMFCore.utils import getToolByName
+import zope.event
from gocept.sequence.interfaces import ISequenceGenerator
(at)(at) -11,6 +12,8 (at)(at)
from gocept.vendo.interfaces.shop import IVendoShop, IShopUtility
from gocept.vendo.interfaces.cart import ICart
from gocept.vendo.utils import unrestrictedInvokeFactory
+import gocept.vendo.orderevent
+
class OrderFactory(object):
""" Adapter providing functionality to convert a cart to an order. """
(at)(at) -36,7 +39,7 (at)(at)
orderitem_id = '%03i' % sqgen.getNextValue()
orderitem = unrestrictedInvokeFactory(order, 'VendoOrderItem',
orderitem_id)
- orderitem.item_title = title,
+ orderitem.item_title = title
orderitem.full_sku = sku
orderitem.amount = amount
orderitem.price = price
(at)(at) -56,6 +59,7 (at)(at)
order.total = cart.get_total_price()
order.shipping_address =
copy.copy(cart.get_shipping_address().aq_base)
order.invoice_address = copy.copy(cart.get_invoice_address().aq_base)
+ order.invoice_same_as_shipping = cart.get_invoice_same_as_shipping()
for cartitem in cart.get_items():
self._create_order_item(order,
cartitem.get('title'),
(at)(at) -64,4 +68,8 (at)(at)
cartitem.get('price'),
cartitem.get('sum'),
cartitem.get('unit'))
+ zope.event.notify(gocept.vendo.orderevent.OrderAddedEvent(
+ order.__of__(self.context)))
+
+
return
Added: gocept.vendo/branches/paypal/src/gocept/vendo/orderevent.py
==============================================================================
--- (empty file)
+++ gocept.vendo/branches/paypal/src/gocept/vendo/orderevent.py Thu Oct 23
10:08:04 2008
(at)(at) -0,0 +1,24 (at)(at)
+import plone.app.contentrules.handlers
+import zope.component.interfaces
+import zope.interface
+
+class IOrderAddedEvent(zope.component.interfaces.IObjectEvent):
+ """event to notify about new orders"""
+
+class OrderAddedEvent(object):
+ zope.interface.implements(IOrderAddedEvent)
+
+ # for repr backward compatibility. In the next release cycle, we'll
+ # provide a testing framework that addresses repr migration.
+ __module__ = 'gocept.vendo.orderevent'
+
+ def __init__(self, object):
+ self.object = object
+
+#
+# this is a handler for plone.app.contentrules
+#
+
+def neworder(event):
+ plone.app.contentrules.handlers.execute(event.object, event)
+
Modified: gocept.vendo/branches/paypal/src/gocept/vendo/portlets/cart.pt
==============================================================================
--- gocept.vendo/branches/paypal/src/gocept/vendo/portlets/cart.pt (original)
+++ gocept.vendo/branches/paypal/src/gocept/vendo/portlets/cart.pt Thu Oct 23
10:08:04 2008
(at)(at) -4,16 +4,16 (at)(at)
<dt class="portletHeader">
<span class="portletTopLeft"></span>
- Shopping Cart
+ <span i18n:translate="">Shopping Cart</span>
<span class="portletTopRight"></span>
</dt>
<dd class="portletItem">
- Total items in your cart: <span tal:replace="cart/get_total_amount"
/>
+ <span i18n:translate="">Total items in your cart:</span>
<span tal:replace="cart/get_total_amount" />
<br />
- Total: <span tal:replace="cart/get_sub_total_price" />
+ <span i18n:translate="">Total:</span> <span
tal:replace="cart/get_sub_total_price" />
<br />
- <a tal:attributes="href string:/${shop/absolute_url}/cart_view">
+ <a tal:attributes="href string:/${shop/absolute_url}/cart_view"
i18n:translate="">
CheckOut
</a>
</dd>
Modified:
gocept.vendo/branches/paypal/src/gocept/vendo/vendo_ordertool/formatPrice.py
==============================================================================
---
gocept.vendo/branches/paypal/src/gocept/vendo/vendo_ordertool/formatPrice.py (original)
+++
gocept.vendo/branches/paypal/src/gocept/vendo/vendo_ordertool/formatPrice.py Thu
Oct 23 10:08:04 2008
(at)(at) -1,3 +1,4 (at)(at)
##parameters=price
-return '%s %s' % ('EUR', price)
+cur = context.aq_parent.getCurrency()
+return '%s %s' % (cur, price)
Modified:
gocept.vendo/branches/paypal/src/gocept/vendo/vendo_ordertool/getOrdersForTimespan.py
==============================================================================
---
gocept.vendo/branches/paypal/src/gocept/vendo/vendo_ordertool/getOrdersForTimespan.py (original)
+++
gocept.vendo/branches/paypal/src/gocept/vendo/vendo_ordertool/getOrdersForTimespan.py Thu
Oct 23 10:08:04 2008
(at)(at) -9,7 +9,9 (at)(at)
day_end = DateTime(daystr_end).toZone('GMT+2')
-catalog = context.jp.portal_catalog
-orders = catalog(portal_type='VendoOrder', created={'query': (day_start,
day_end), 'range': 'min:max'})
+catalog = context.portal_catalog
+orders = catalog(portal_type='VendoOrder',
+ path='/'.join(context.aq_parent.getPhysicalPath()),
+ created={'query': (day_start, day_end), 'range': 'min:max'})
return orders
Modified:
gocept.vendo/branches/paypal/src/gocept/vendo/vendo_ordertool/otGetOrders.py
==============================================================================
---
gocept.vendo/branches/paypal/src/gocept/vendo/vendo_ordertool/otGetOrders.py (original)
+++
gocept.vendo/branches/paypal/src/gocept/vendo/vendo_ordertool/otGetOrders.py Thu
Oct 23 10:08:04 2008
(at)(at) -1,5 +1,5 (at)(at)
req = context.REQUEST
-cat = context.jp.portal_catalog
+cat = context.portal_catalog
start = req.get('startdate')
end = req.get('enddate')
(at)(at) -7,10 +7,11 (at)(at)
start_d = DateTime('%s 00:00 US/Eastern' % start).toZone('GMT+2')
end_d = DateTime('%s 23:59 US/Eastern' % end).toZone('GMT+2')
-catalog = context.jp.portal_catalog
-countrytool = context.jp.portal_countryutils
-putils = context.jp.plone_utils
-orders = catalog(portal_type='VendoOrder', created={'query': (start_d, end_d),
'range': 'min:max'}, sort_on='created')
+path = '/'.join(context.aq_parent.getPhysicalPath())
+catalog = context.portal_catalog
+countrytool = context.portal_countryutils
+putils = context.plone_utils
+orders = catalog(portal_type='VendoOrder', created={'query': (start_d, end_d),
'range': 'min:max'}, path=path, sort_on='created')
sum = 0
res = []
Modified:
gocept.vendo/branches/paypal/src/gocept/vendo/vendo_ordertool/ot_view_orders.pt
==============================================================================
---
gocept.vendo/branches/paypal/src/gocept/vendo/vendo_ordertool/ot_view_orders.pt (original)
+++
gocept.vendo/branches/paypal/src/gocept/vendo/vendo_ordertool/ot_view_orders.pt Thu
Oct 23 10:08:04 2008
(at)(at) -120,7 +120,7 (at)(at)
<th>Name</th>
<th>Country</th>
<th>City</th>
- <th>Total (EUR)</th>
+ <th>Total (<span tal:replace="context/aq_parent/getCurrency"
/>)</th>
<th>Status</th>
</tr>
<tr tal:repeat="order orders"
Modified:
gocept.vendo/branches/paypal/src/gocept/vendo/vendo_ordertool/viewDetails.pt
==============================================================================
---
gocept.vendo/branches/paypal/src/gocept/vendo/vendo_ordertool/viewDetails.pt (original)
+++
gocept.vendo/branches/paypal/src/gocept/vendo/vendo_ordertool/viewDetails.pt Thu
Oct 23 10:08:04 2008
(at)(at) -26,8 +26,8 (at)(at)
<hr/>
<tal:orders repeat="orderid request/orders">
<tal:defines define="formatPrice nocall: here/formatPrice;
- countryname
python:here.jp.portal_countryutils.getCountryByIsoCode;
- order python:here.jp.portal_catalog(getId=orderid)[0].getObject();
+ countryname
python:here.portal_countryutils.getCountryByIsoCode;
+ order python:here.portal_catalog(getId=orderid)[0].getObject();
order_items order/contentValues;">
<h1>Order <span tal:replace="order/getId"/></h1>
(at)(at) -103,24 +103,22 (at)(at)
<span class="addrhead"
tal:condition="order/invoice_same_as_shipping">Invoice and Shipping
Address</span>
<span class="addrhead" tal:condition="python:not
order.invoice_same_as_shipping">Shipping Address</span>
<div tal:content="string:${addr/firstname}
${addr/lastname}">Hr. Franz Meyer</div>
- <div>Programmanbieter: <div
tal:replace="addr/provider">gocept</div></div>
- <div>Anbieterstelle: <div
tal:replace="addr/providerarea">gocept</div></div>
<div tal:content="addr/street">Schalaunische Str.
6</div>
<div tal:content="addr/street2">Schalaunische Str.
6</div>
<div tal:content="string:${addr/zip} ${addr/city}">06366
Koethen/Anhalt</div>
<div tal:content="python:
countryname(addr.country)"></div>
+ <div tal:content="addr/county" />
<div tal:content="addr/mail" />
</div>
<div class="addr" tal:define="addr python:(not
order.invoice_same_as_shipping) and order.invoice_address or False"
tal:condition="addr">
<span class="addrhead">Invoice Address</span>
<div tal:content="string:${addr/firstname}
${addr/lastname}">Hr. Franz Meyer</div>
- <div>Programmanbieter: <div
tal:replace="addr/provider">gocept</div></div>
- <div>Anbieterstelle: <div
tal:replace="addr/providerarea">gocept</div></div>
<div tal:content="addr/street">Schalaunische Str.
6</div>
<div tal:content="addr/street2">Schalaunische Str.
6</div>
<div tal:content="string:${addr/zip} ${addr/city}">06366
Koethen/Anhalt</div>
<div tal:content="python:
countryname(addr.country)"></div>
+ <div tal:content="addr/county" />
<div tal:content="addr/mail" />
</div>
|
