|
/
Zope
/
gocept svn checkins
/
Archive
/
2008
/
2008-08
/
SVN: r6392 - in gocept.vendo/trunk/src/gocept/vendo: browser i18n i18n/de/LC_MESSAGES
[
SVN: r6377 - httop / Christian Theune ... ]
[
SVN: r6411 - gocept.infrastructure/trunk/portage-g... ]
SVN: r6392 - in gocept.vendo/trunk/src/gocept/vendo: browser i18n i18n/de/LC_MESSAGES
Sebastian Wehrmann <sw(at)gocept.com> |
2008-08-04 13:21:58 |
[ FULL ]
|
Author: sweh
Date: Mon Aug 4 13:21:57 2008
New Revision: 6392
Log:
added a notification about a sendet mail after order completion
Modified:
gocept.vendo/trunk/src/gocept/vendo/browser/finished_checkout.pt
gocept.vendo/trunk/src/gocept/vendo/i18n/de/LC_MESSAGES/gocept.vendo.po
gocept.vendo/trunk/src/gocept/vendo/i18n/gocept.vendo.pot
Modified: gocept.vendo/trunk/src/gocept/vendo/browser/finished_checkout.pt
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/browser/finished_checkout.pt (original)
+++ gocept.vendo/trunk/src/gocept/vendo/browser/finished_checkout.pt Mon Aug 4
13:21:57 2008
(at)(at) -9,6 +9,9 (at)(at)
<metal:main fill-slot="main">
<h3 i18n:translate="">Thank you for your order.</h3>
+ <div i18n:translate="">
+ You will shortly recive an order acceptance by email.
+ </div>
</metal:main>
</body>
Modified:
gocept.vendo/trunk/src/gocept/vendo/i18n/de/LC_MESSAGES/gocept.vendo.po
==============================================================================
---
gocept.vendo/trunk/src/gocept/vendo/i18n/de/LC_MESSAGES/gocept.vendo.po (original)
+++ gocept.vendo/trunk/src/gocept/vendo/i18n/de/LC_MESSAGES/gocept.vendo.po Mon
Aug 4 13:21:57 2008
(at)(at) -3,8 +3,8 (at)(at)
msgid ""
msgstr ""
"Project-Id-Version: gocept.vendo\n"
-"POT-Creation-Date: Mon Jul 28 10:36:36 2008\n"
-"PO-Revision-Date: 2008-07-28 10:37+0100\n"
+"POT-Creation-Date: Mon Aug 4 13:12:53 2008\n"
+"PO-Revision-Date: 2008-08-04 13:20+0100\n"
"Last-Translator: Sebastian Wehrmann <sw(at)gocept.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
(at)(at) -184,6 +184,10 (at)(at)
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."
+
#: src/gocept/vendo/browser/productvariation.pt:12
#: src/gocept/vendo/browser/productvariation.pt:16
msgid "${DYNAMIC_CONTENT}"
Modified: gocept.vendo/trunk/src/gocept/vendo/i18n/gocept.vendo.pot
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/i18n/gocept.vendo.pot (original)
+++ gocept.vendo/trunk/src/gocept/vendo/i18n/gocept.vendo.pot Mon Aug 4
13:21:57 2008
(at)(at) -14,7 +14,7 (at)(at)
msgid ""
msgstr ""
"Project-Id-Version: Development/Unknown\n"
-"POT-Creation-Date: Mon Jul 28 10:36:36 2008\n"
+"POT-Creation-Date: Mon Aug 4 13:12:53 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"
(at)(at) -192,6 +192,10 (at)(at)
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/productvariation.pt:12
#: src/gocept/vendo/browser/productvariation.pt:16
msgid "${DYNAMIC_CONTENT}"
|
SVN: r6395 - gocept.vendo/trunk/src/gocept/vendo/content
Sebastian Wehrmann <sw(at)gocept.com> |
2008-08-05 13:39:38 |
[ FULL ]
|
Author: sweh
Date: Tue Aug 5 13:39:36 2008
New Revision: 6395
Log:
allow OODocuments for AGB selection
Modified:
gocept.vendo/trunk/src/gocept/vendo/content/shop.py
Modified: gocept.vendo/trunk/src/gocept/vendo/content/shop.py
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/content/shop.py (original)
+++ gocept.vendo/trunk/src/gocept/vendo/content/shop.py Tue Aug 5 13:39:36
2008
(at)(at) -67,7 +67,7 (at)(at)
required=False,
relationship='terms_condition',
storage=atapi.AnnotationStorage(),
- allowed_types=('Document', 'File'),
+ allowed_types=('Document', 'File', 'OODocument'),
widget=atapi.ReferenceWidget(
label=_(u'Terms and conditions'),
description=_(u'Select the terms and conditions')
|
SVN: r6396 - in gocept.vendo/trunk/src/gocept/vendo: browser content
Sebastian Wehrmann <sw(at)gocept.com> |
2008-08-05 14:18:00 |
[ FULL ]
|
Author: sweh
Date: Tue Aug 5 14:17:58 2008
New Revision: 6396
Log:
allow all content types as agb resources
add scrolling bar to agb popup
prevent browser from following the # link when clicking on agb
Modified:
gocept.vendo/trunk/src/gocept/vendo/browser/checkout.pt
gocept.vendo/trunk/src/gocept/vendo/content/shop.py
Modified: gocept.vendo/trunk/src/gocept/vendo/browser/checkout.pt
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/browser/checkout.pt (original)
+++ gocept.vendo/trunk/src/gocept/vendo/browser/checkout.pt Tue Aug 5 14:17:58
2008
(at)(at) -522,13 +522,14 (at)(at)
<input type="checkbox" name="terms_and_conditions" value="Selected"
tal:attributes="checked python: cart.get_accept_terms() and\
'CHECKED' or ''" />
- <span i18n:translate="">I've read the <a href="#"
+ <span i18n:translate="">I've read the <a href="#"
i18n:name="tac-link"
i18n:translate=""
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
+
'height=800,width=500,menubar=no,toolbar=no,status=no,location=no,scrollbars=1');;
+ return false;;">terms
and conditions</a> and accept them.</span>
</div>
<input type="hidden" name="form.submitted" value="1" />
Modified: gocept.vendo/trunk/src/gocept/vendo/content/shop.py
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/content/shop.py (original)
+++ gocept.vendo/trunk/src/gocept/vendo/content/shop.py Tue Aug 5 14:17:58
2008
(at)(at) -67,7 +67,6 (at)(at)
required=False,
relationship='terms_condition',
storage=atapi.AnnotationStorage(),
- allowed_types=('Document', 'File', 'OODocument'),
widget=atapi.ReferenceWidget(
label=_(u'Terms and conditions'),
description=_(u'Select the terms and conditions')
|
SVN: r6398 - in gocept.vendo/trunk/src/gocept/vendo: . browser i18n i18n/de/LC_MESSAGES
Sebastian Wehrmann <sw(at)gocept.com> |
2008-08-05 16:52:53 |
[ FULL ]
|
Author: sweh
Date: Tue Aug 5 16:52:51 2008
New Revision: 6398
Log:
added programprovider and providerarea to addressform
removed company from addressform
added translations
Modified:
gocept.vendo/trunk/src/gocept/vendo/address.py
gocept.vendo/trunk/src/gocept/vendo/browser/cart_macros.pt
gocept.vendo/trunk/src/gocept/vendo/browser/checkout.pt
gocept.vendo/trunk/src/gocept/vendo/browser/checkout.py
gocept.vendo/trunk/src/gocept/vendo/i18n/de/LC_MESSAGES/gocept.vendo.po
gocept.vendo/trunk/src/gocept/vendo/i18n/gocept.vendo.pot
Modified: gocept.vendo/trunk/src/gocept/vendo/address.py
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/address.py (original)
+++ gocept.vendo/trunk/src/gocept/vendo/address.py Tue Aug 5 16:52:51 2008
(at)(at) -27,7 +27,8 (at)(at)
""" set all values to None. """
self.firstname = None
self.lastname = None
- self.company = None
+ self.provider = None
+ self.providerarea = None
self.street = None
self.street2 = None
self.city = None
(at)(at) -53,7 +54,6 (at)(at)
>>> data = {'firstname': 'Sebastian',
... 'lastname': 'Wehrmann',
- ... 'company': 'gocept',
... 'mail': 'sw(at)gocept.com',
... 'city': 'Halle',
... }
(at)(at) -74,7 +74,8 (at)(at)
"""
self.firstname = data.get('firstname', None)
self.lastname = data.get('lastname', None)
- self.company = data.get('company', None)
+ self.provider = data.get('provider', None)
+ self.providerarea = data.get('providerarea', None)
self.street = data.get('street', None)
self.street2 = data.get('street2', None)
self.city = data.get('city', None)
(at)(at) -103,7 +104,6 (at)(at)
>>> from gocept.vendo.address import Address
>>> data = {'firstname': 'Sebastian',
... 'lastname': 'Wehrmann',
- ... 'company': 'gocept',
... 'mail': 'swgocept.com',
... 'city': 'Halle',
... }
Modified: gocept.vendo/trunk/src/gocept/vendo/browser/cart_macros.pt
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/browser/cart_macros.pt (original)
+++ gocept.vendo/trunk/src/gocept/vendo/browser/cart_macros.pt Tue Aug 5
16:52:51 2008
(at)(at) -65,15 +65,15 (at)(at)
<div metal:define-macro="display_address" class="disp_address">
<span tal:content="address/firstname" /> <span
tal:content="address/lastname"/><br/>
- <tal:line condition="address/company"><span
tal:content="address/company" /><br/></tal:line>
<tal:line condition="address/street"><span
tal:content="address/street" /><br/></tal:line>
<tal:line condition="address/street2"><span
tal:content="address/street2" /><br/></tal:line>
- <tal:line condition="address/city"><span
tal:content="address/city" /><br/></tal:line>
- <tal:line condition="address/zip"><span tal:content="address/zip"
/><br/></tal:line>
+ <span tal:content="address/zip" /> <span
tal:content="address/city" /><br/>
<tal:line condition="address/country"><span
tal:content="python:context.portal_countryutils.getCountryByIsoCode(address.country).name"
/><br/></tal:line>
<tal:line condition="address/county"><span
tal:content="address/county" /><br/></tal:line>
<tal:line condition="address/phone"><span
tal:content="address/phone" /><br/></tal:line>
<tal:line condition="address/mail"><span
tal:content="address/mail" /><br/></tal:line>
+ <tal:line condition="address/provider"><span
tal:content="address/provider" /><br/></tal:line>
+ <tal:line condition="address/providerarea"><span
tal:content="address/providerarea" /><br/></tal:line>
</div>
</html>
Modified: gocept.vendo/trunk/src/gocept/vendo/browser/checkout.pt
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/browser/checkout.pt (original)
+++ gocept.vendo/trunk/src/gocept/vendo/browser/checkout.pt Tue Aug 5 16:52:51
2008
(at)(at) -66,20 +66,40 (at)(at)
<tr>
<td>
<div
- tal:attributes="class python: errors.get('shipping_company',\
+ tal:attributes="class python: errors.get('shipping_provider',\
None) and 'field error' or 'field'">
- <label for="company" i18n:translate="">
- Company:
+ <label for="provider" i18n:translate="">
+ Programprovider:
</label>
- <span tal:replace="python: 'company' in
address.required_fields\
+ <span tal:replace="python: 'provider' in
address.required_fields\
and '*' or ''" /><br />
<div class="fieldErrorBox"
- tal:condition="python: errors.has_key('shipping_company')"
- tal:content="errors/shipping_company">
- shipping_company requires input
+ tal:condition="python: errors.has_key('shipping_provider')"
+ tal:content="errors/shipping_provider">
+ shipping_provider requires input
</div>
- <input type="text" name="shipping_address.company:record"
- tal:attributes="value address/company" />
+ <input type="text" name="shipping_address.provider:record"
+ tal:attributes="value address/provider" />
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <div
+ tal:attributes="class python:
errors.get('shipping_providerarea',\
+ None) and 'field error' or 'field'">
+ <label for="provider" i18n:translate="">
+ Providerarea:
+ </label>
+ <span tal:replace="python: 'providerarea' in
address.required_fields\
+ and '*' or ''" /><br />
+ <div class="fieldErrorBox"
+ tal:condition="python:
errors.has_key('shipping_providerarea')"
+ tal:content="errors/shipping_providerarea">
+ shipping_providerarea requires input
+ </div>
+ <input type="text"
name="shipping_address.providerarea:record"
+ tal:attributes="value address/providerarea" />
</div>
</td>
</tr>
(at)(at) -318,20 +338,40 (at)(at)
<tr>
<td>
<div
- tal:attributes="class python: errors.get('invoice_company',\
+ tal:attributes="class python: errors.get('invoice_provider',\
+ None) and 'field error' or 'field'">
+ <label for="provider" i18n:translate="">
+ Programprovider:
+ </label>
+ <span tal:replace="python: 'provider' in
address.required_fields\
+ and '*' or ''" /><br />
+ <div class="fieldErrorBox"
+ tal:condition="python: errors.has_key('invoice_provider')"
+ tal:content="errors/invoice_provider">
+ invoice_provider requires input
+ </div>
+ <input type="text" name="invoice_address.provider:record"
+ tal:attributes="value address/provider" />
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <div
+ tal:attributes="class python:
errors.get('invoice_providerarea',\
None) and 'field error' or 'field'">
- <label for="company" i18n:translate="">
- Company:
+ <label for="provider" i18n:translate="">
+ Providerarea:
</label>
- <span tal:replace="python: 'company' in
address.required_fields\
+ <span tal:replace="python: 'providerarea' in
address.required_fields\
and '*' or ''" /><br />
<div class="fieldErrorBox"
- tal:condition="python: errors.has_key('invoice_company')"
- tal:content="errors/invoice_company">
- invoice_company requires input
+ tal:condition="python: errors.has_key('invoice_providerarea')"
+ tal:content="errors/invoice_providerarea">
+ invoice_providerarea requires input
</div>
- <input type="text" name="invoice_address.company:record"
- tal:attributes="value address/company" />
+ <input type="text" name="invoice_address.providerarea:record"
+ tal:attributes="value address/providerarea" />
</div>
</td>
</tr>
Modified: gocept.vendo/trunk/src/gocept/vendo/browser/checkout.py
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/browser/checkout.py (original)
+++ gocept.vendo/trunk/src/gocept/vendo/browser/checkout.py Tue Aug 5 16:52:51
2008
(at)(at) -84,6 +84,9 (at)(at)
payment_address = {}
payment_address['firstname'] = shipping_address.firstname
payment_address['lastname'] = shipping_address.lastname
+ payment_address['provider'] = shipping_address.provider
+ payment_address['providerarea'] = shipping_address.providerarea
+ payment_address['lastname'] = shipping_address.lastname
payment_address['street'] = shipping_address.street
payment_address['street2'] = shipping_address.street2
payment_address['city'] = shipping_address.city
(at)(at) -91,7 +94,7 (at)(at)
payment_address['country'] = shipping_address.country
payment_address['county'] = shipping_address.county
payment_address['zip'] = shipping_address.zip
-
+
self.payment_address = payment_address
form = self.request.form
response = self.request.RESPONSE
Modified:
gocept.vendo/trunk/src/gocept/vendo/i18n/de/LC_MESSAGES/gocept.vendo.po
==============================================================================
---
gocept.vendo/trunk/src/gocept/vendo/i18n/de/LC_MESSAGES/gocept.vendo.po (original)
+++ gocept.vendo/trunk/src/gocept/vendo/i18n/de/LC_MESSAGES/gocept.vendo.po Tue
Aug 5 16:52:51 2008
(at)(at) -3,8 +3,8 (at)(at)
msgid ""
msgstr ""
"Project-Id-Version: gocept.vendo\n"
-"POT-Creation-Date: Mon Aug 4 13:12:53 2008\n"
-"PO-Revision-Date: 2008-08-04 13:20+0100\n"
+"POT-Creation-Date: Tue Aug 5 16:47:30 2008\n"
+"PO-Revision-Date: 2008-08-05 16:49+0100\n"
"Last-Translator: Sebastian Wehrmann <sw(at)gocept.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
(at)(at) -53,7 +53,7 (at)(at)
#. Default: "Change"
#: src/gocept/vendo/browser/cart.pt:99
-#: src/gocept/vendo/browser/checkout.pt:537
+#: src/gocept/vendo/browser/checkout.pt:578
msgid "change-button"
msgstr "Daten ändern"
(at)(at) -62,88 +62,93 (at)(at)
msgstr "Mwst (${vat-rate}%)"
#: src/gocept/vendo/browser/checkout.pt:111
-#: src/gocept/vendo/browser/checkout.pt:363
+#: 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:131
-#: src/gocept/vendo/browser/checkout.pt:383
+#: 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:151
-#: src/gocept/vendo/browser/checkout.pt:403
+#: src/gocept/vendo/browser/checkout.pt:171
+#: src/gocept/vendo/browser/checkout.pt:443
msgid "Postcode:"
msgstr "PLZ:"
-#: src/gocept/vendo/browser/checkout.pt:171
-#: src/gocept/vendo/browser/checkout.pt:423
+#: src/gocept/vendo/browser/checkout.pt:191
+#: src/gocept/vendo/browser/checkout.pt:463
msgid "Country:"
msgstr "Land:"
-#: src/gocept/vendo/browser/checkout.pt:213
-#: src/gocept/vendo/browser/checkout.pt:457
-msgid "County:"
-msgstr "Bundesland:"
-
#: src/gocept/vendo/browser/checkout.pt:23
msgid "Shipping address:"
msgstr "Lieferadresse:"
-#: src/gocept/vendo/browser/checkout.pt:232
-#: src/gocept/vendo/browser/checkout.pt:475
+#: 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:252
-#: src/gocept/vendo/browser/checkout.pt:495
+#: 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:271
+#: src/gocept/vendo/browser/checkout.pt:291
msgid "Invoice address:"
msgstr "Rechnungsadresse:"
-#: src/gocept/vendo/browser/checkout.pt:275
+#: 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:283
+#: 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:303
+#: src/gocept/vendo/browser/checkout.pt:323
msgid "Last Name:"
msgstr "Nachname:"
-#: src/gocept/vendo/browser/checkout.pt:516
+#: 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:525
+#: src/gocept/vendo/browser/checkout.pt:565
msgid "terms and conditions"
msgstr "Allgemeinen Geschäftsbedingungen"
-#: src/gocept/vendo/browser/checkout.pt:525
+#: 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:535
+#: 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:323
-msgid "Company:"
-msgstr "Firma:"
+#: src/gocept/vendo/browser/checkout.pt:343
+msgid "Programprovider:"
+msgstr "Programmprovider:"
#: src/gocept/vendo/browser/checkout.pt:91
-#: src/gocept/vendo/browser/checkout.pt:343
-msgid "Address:"
-msgstr "Adresse:"
+#: src/gocept/vendo/browser/checkout.pt:363
+msgid "Providerarea:"
+msgstr "Anbieterstelle:"
#: src/gocept/vendo/browser/finish_checkout.pt:12
msgid "Order Summary"
(at)(at) -411,19 +416,19 (at)(at)
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:72
+#: src/gocept/vendo/content/shop.py:71
msgid "Terms and conditions"
msgstr "Allgemeine Geschäftsbedingungen"
-#: src/gocept/vendo/content/shop.py:73
+#: 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:79
+#: src/gocept/vendo/content/shop.py:78
msgid "Shop name"
msgstr "Name des Shops"
-#: src/gocept/vendo/content/shop.py:83
+#: src/gocept/vendo/content/shop.py:82
msgid "Shop description"
msgstr "Beschreibung des Shops"
(at)(at) -541,6 +546,8 (at)(at)
msgid "This portlet displays a shopping cart."
msgstr "Dieses Portlet stellt einen Warenkorb zur Verfügung."
+#~ msgid "Company:"
+#~ msgstr "Firma:"
#~ msgid "CheckOut"
#~ msgstr "Bezahlvorgang abschließen"
#~ msgid "Tax (${DYNAMIC_CONTENT} %)"
Modified: gocept.vendo/trunk/src/gocept/vendo/i18n/gocept.vendo.pot
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/i18n/gocept.vendo.pot (original)
+++ gocept.vendo/trunk/src/gocept/vendo/i18n/gocept.vendo.pot Tue Aug 5
16:52:51 2008
(at)(at) -14,7 +14,7 (at)(at)
msgid ""
msgstr ""
"Project-Id-Version: Development/Unknown\n"
-"POT-Creation-Date: Mon Aug 4 13:12:53 2008\n"
+"POT-Creation-Date: Tue Aug 5 16:47:30 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"
(at)(at) -60,7 +60,7 (at)(at)
msgstr ""
#: src/gocept/vendo/browser/cart.pt:99
-#: src/gocept/vendo/browser/checkout.pt:537
+#: src/gocept/vendo/browser/checkout.pt:578
#. Default: "Change"
msgid "change-button"
msgstr ""
(at)(at) -70,87 +70,92 (at)(at)
msgstr ""
#: src/gocept/vendo/browser/checkout.pt:111
-#: src/gocept/vendo/browser/checkout.pt:363
-msgid "Address (extra):"
+#: src/gocept/vendo/browser/checkout.pt:383
+msgid "Address:"
msgstr ""
#: src/gocept/vendo/browser/checkout.pt:131
-#: src/gocept/vendo/browser/checkout.pt:383
-msgid "Town/City:"
+#: src/gocept/vendo/browser/checkout.pt:403
+msgid "Address (extra):"
msgstr ""
#: src/gocept/vendo/browser/checkout.pt:151
-#: src/gocept/vendo/browser/checkout.pt:403
-msgid "Postcode:"
+#: src/gocept/vendo/browser/checkout.pt:423
+msgid "Town/City:"
msgstr ""
#: src/gocept/vendo/browser/checkout.pt:171
-#: src/gocept/vendo/browser/checkout.pt:423
-msgid "Country:"
+#: src/gocept/vendo/browser/checkout.pt:443
+msgid "Postcode:"
msgstr ""
-#: src/gocept/vendo/browser/checkout.pt:213
-#: src/gocept/vendo/browser/checkout.pt:457
-msgid "County:"
+#: 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:232
-#: src/gocept/vendo/browser/checkout.pt:475
-msgid "Telephone:"
+#: 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:495
+#: 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:271
+#: src/gocept/vendo/browser/checkout.pt:291
msgid "Invoice address:"
msgstr ""
-#: src/gocept/vendo/browser/checkout.pt:275
+#: 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:283
+#: src/gocept/vendo/browser/checkout.pt:303
msgid "First Name:"
msgstr ""
#: src/gocept/vendo/browser/checkout.pt:51
-#: src/gocept/vendo/browser/checkout.pt:303
+#: src/gocept/vendo/browser/checkout.pt:323
msgid "Last Name:"
msgstr ""
-#: src/gocept/vendo/browser/checkout.pt:516
+#: src/gocept/vendo/browser/checkout.pt:556
msgid "Please accept the terms and conditions."
msgstr ""
-#: src/gocept/vendo/browser/checkout.pt:525
+#: src/gocept/vendo/browser/checkout.pt:565
msgid "terms and conditions"
msgstr ""
-#: src/gocept/vendo/browser/checkout.pt:525
+#: src/gocept/vendo/browser/checkout.pt:565
msgid "I've read the ${tac-link} and accept them."
msgstr ""
-#: src/gocept/vendo/browser/checkout.pt:535
+#: 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:323
-msgid "Company:"
+#: src/gocept/vendo/browser/checkout.pt:343
+msgid "Programprovider:"
msgstr ""
#: src/gocept/vendo/browser/checkout.pt:91
-#: src/gocept/vendo/browser/checkout.pt:343
-msgid "Address:"
+#: src/gocept/vendo/browser/checkout.pt:363
+msgid "Providerarea:"
msgstr ""
#: src/gocept/vendo/browser/finish_checkout.pt:12
(at)(at) -419,19 +424,19 (at)(at)
msgid "Global prefix to be used by shop to
allow multiple shops per site"
msgstr ""
-#: src/gocept/vendo/content/shop.py:72
+#: src/gocept/vendo/content/shop.py:71
msgid "Terms and conditions"
msgstr ""
-#: src/gocept/vendo/content/shop.py:73
+#: src/gocept/vendo/content/shop.py:72
msgid "Select the terms and conditions"
msgstr ""
-#: src/gocept/vendo/content/shop.py:79
+#: src/gocept/vendo/content/shop.py:78
msgid "Shop name"
msgstr ""
-#: src/gocept/vendo/content/shop.py:83
+#: src/gocept/vendo/content/shop.py:82
msgid "Shop description"
msgstr ""
|
SVN: r6399 - in gocept.vendo/trunk/src/gocept/vendo: . browser
Sebastian Wehrmann <sw(at)gocept.com> |
2008-08-05 17:40:14 |
[ FULL ]
|
Author: sweh
Date: Tue Aug 5 17:40:12 2008
New Revision: 6399
Log:
added payment method choice to cart
Modified:
gocept.vendo/trunk/src/gocept/vendo/browser/cart.pt
gocept.vendo/trunk/src/gocept/vendo/browser/cart.py
gocept.vendo/trunk/src/gocept/vendo/browser/cart_macros.pt
gocept.vendo/trunk/src/gocept/vendo/cart.py
gocept.vendo/trunk/src/gocept/vendo/order.py
Modified: gocept.vendo/trunk/src/gocept/vendo/browser/cart.pt
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/browser/cart.pt (original)
+++ gocept.vendo/trunk/src/gocept/vendo/browser/cart.pt Tue Aug 5 17:40:12
2008
(at)(at) -92,6 +92,21 (at)(at)
<td><strong
tal:content="cart/get_total_price/(at)(at)pricedisplay" /></td>
<td></td>
</tr>
+ <tr>
+ <td></td>
+ <td i18n:translate="">Payment</td>
+ <td colspan="2"
+ tal:define="payment_methods cart/get_payment_methods">
+ <select name="payment_method_id">
+ <option tal:repeat="payment_method payment_methods"
+ tal:content="payment_method/title"
+ tal:attributes="value payment_method/id"
+ i18n:translate="">
+ Prepayment
+ </option>
+ </select>
+ </td>
+ </tr>
</tbody>
</table>
<input type="submit" class="context" name="form.button.Continue"
Modified: gocept.vendo/trunk/src/gocept/vendo/browser/cart.py
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/browser/cart.py (original)
+++ gocept.vendo/trunk/src/gocept/vendo/browser/cart.py Tue Aug 5 17:40:12
2008
(at)(at) -31,6 +31,7 (at)(at)
amounts = form.get("amounts", None)
remove = form.get("remove", None)
shipping = form.get("shipping_method_id", None)
+ payment = form.get("payment_method_id", None)
if submitted:
amounts = form.get("amounts", None)
if amounts is not None:
(at)(at) -39,6 +40,8 (at)(at)
self.cart.remove_item(remove.keys()[0])
if shipping is not None:
self.cart.set_shipping(shipping)
+ if payment is not None:
+ self.cart.set_payment(payment)
continue_button = form.get("form.button.Continue", None)
if continue_button is not None:
if amounts is None: # nothing is added to cart
Modified: gocept.vendo/trunk/src/gocept/vendo/browser/cart_macros.pt
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/browser/cart_macros.pt (original)
+++ gocept.vendo/trunk/src/gocept/vendo/browser/cart_macros.pt Tue Aug 5
17:40:12 2008
(at)(at) -51,6 +51,11 (at)(at)
</td>
<td><strong
tal:content="cart/get_total_price/(at)(at)pricedisplay" /></td>
</tr>
+ <tr>
+ <td></td>
+ <td i18n:translate="">Payment</td>
+ <td colspan="2" tal:content="cart/get_payment_method" />
+ </tr>
</tbody>
</table>
</div>
Modified: gocept.vendo/trunk/src/gocept/vendo/cart.py
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/cart.py (original)
+++ gocept.vendo/trunk/src/gocept/vendo/cart.py Tue Aug 5 17:40:12 2008
(at)(at) -60,6 +60,7 (at)(at)
def __init__(self):
self._cart_content = persistent.list.PersistentList()
self._shipping_method = None
+ self._payment_method = None
self._shipping_address = None
self._invoice_address = None
self._accept_terms = False
(at)(at) -254,6 +255,12 (at)(at)
methods.append({'title': title, 'id': id, 'price': price})
return methods
+ def get_payment_methods(self):
+ """ Return a list of payment methods. """
+ methods = [{'id': 'prepay', 'title': 'Prepayment'},
+ {'id': 'debit', 'title': 'Direct debit'}]
+ return methods
+
def get_shipping_method(self):
""" Return the title of the selected shipping. """
(at)(at) -264,6 +271,14 (at)(at)
return shipping_provider.get_shipping_title(shipping_id)
return ""
+ def get_payment_method(self):
+ """ Return the title of the selected payment. """
+ for method in self.get_payment_methods():
+ if method['id'] != self._payment_method:
+ continue
+ return method['title']
+ return None
+
def get_shipping_price(self):
""" Return the price of the selected shipping. """
(at)(at) -288,10 +303,12 (at)(at)
""" Set the shipping id in cart. """
self._shipping_method = id
+ def set_payment(self, id):
+ """ Set the payment method in cart. """
+ self._payment_method = id
+
def get_vat_rate(self):
""" Return the VATRate. """
-
- # TODO
shop = getUtility(IShopUtility)
return FixedPoint(shop.get('vat_rate'))
Modified: gocept.vendo/trunk/src/gocept/vendo/order.py
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/order.py (original)
+++ gocept.vendo/trunk/src/gocept/vendo/order.py Tue Aug 5 17:40:12 2008
(at)(at) -52,6 +52,7 (at)(at)
order = self._create_order_object()
order.ordernumber = order.getId()
order.shipping_title = cart.get_shipping_method()
+ order.payment_method = cart.get_payment_method()
order.shipping = cart.get_shipping_price()
order.sub_total = cart.get_sub_total_price()
order.vat = cart.get_vat()
|
SVN: r6400 - in gocept.vendo/trunk/src/gocept/vendo: . i18n i18n/de/LC_MESSAGES
Sebastian Wehrmann <sw(at)gocept.com> |
2008-08-05 17:52:54 |
[ FULL ]
|
Author: sweh
Date: Tue Aug 5 17:52:53 2008
New Revision: 6400
Log:
added translations for payment methods
Modified:
gocept.vendo/trunk/src/gocept/vendo/cart.py
gocept.vendo/trunk/src/gocept/vendo/i18n/de/LC_MESSAGES/gocept.vendo.po
gocept.vendo/trunk/src/gocept/vendo/i18n/gocept.vendo.pot
Modified: gocept.vendo/trunk/src/gocept/vendo/cart.py
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/cart.py (original)
+++ gocept.vendo/trunk/src/gocept/vendo/cart.py Tue Aug 5 17:52:53 2008
(at)(at) -11,6 +11,8 (at)(at)
from gocept.vendo.address import Address
from gocept.fixedpoint import FixedPoint
+from gocept.vendo import VendoMessageFactory as _
+
class CartItem(SimpleItem):
""" CartItem representing a single item in the cart
CartItem implement the ICartItem interface:
(at)(at) -257,8 +259,8 (at)(at)
def get_payment_methods(self):
""" Return a list of payment methods. """
- methods = [{'id': 'prepay', 'title': 'Prepayment'},
- {'id': 'debit', 'title': 'Direct debit'}]
+ methods = [{'id': 'prepay', 'title': _(u'Prepayment')},
+ {'id': 'debit', 'title': _(u'Direct debit')}]
return methods
def get_shipping_method(self):
Modified:
gocept.vendo/trunk/src/gocept/vendo/i18n/de/LC_MESSAGES/gocept.vendo.po
==============================================================================
---
gocept.vendo/trunk/src/gocept/vendo/i18n/de/LC_MESSAGES/gocept.vendo.po (original)
+++ gocept.vendo/trunk/src/gocept/vendo/i18n/de/LC_MESSAGES/gocept.vendo.po Tue
Aug 5 17:52:53 2008
(at)(at) -3,8 +3,8 (at)(at)
msgid ""
msgstr ""
"Project-Id-Version: gocept.vendo\n"
-"POT-Creation-Date: Tue Aug 5 16:47:30 2008\n"
-"PO-Revision-Date: 2008-08-05 16:49+0100\n"
+"POT-Creation-Date: Tue Aug 5 17:49:18 2008\n"
+"PO-Revision-Date: 2008-08-05 17:49+0100\n"
"Last-Translator: Sebastian Wehrmann <sw(at)gocept.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
(at)(at) -19,10 +19,27 (at)(at)
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:23
#: src/gocept/vendo/browser/cart_macros.pt:13
msgid "Pos."
(at)(at) -46,16 +63,10 (at)(at)
msgid "Total amount to pay"
msgstr "Zu zahlender Betrag"
-#. Default: "Continue"
#: src/gocept/vendo/browser/cart.pt:97
-msgid "continue-button"
-msgstr "Weiter"
-
-#. Default: "Change"
-#: src/gocept/vendo/browser/cart.pt:99
-#: src/gocept/vendo/browser/checkout.pt:578
-msgid "change-button"
-msgstr "Daten ändern"
+#: src/gocept/vendo/browser/cart_macros.pt:56
+msgid "Payment"
+msgstr "Bezahlung"
#: src/gocept/vendo/browser/cart_macros.pt:43
msgid "Tax (${vat-rate} %)"
(at)(at) -193,11 +204,6 (at)(at)
msgid "You will shortly recive an order acceptance by email."
msgstr "Sie erhalten in Kürze eine Bestätigung per E-Mail."
-#: src/gocept/vendo/browser/productvariation.pt:12
-#: src/gocept/vendo/browser/productvariation.pt:16
-msgid "${DYNAMIC_CONTENT}"
-msgstr "${DYNAMIC_CONTENT}"
-
#: src/gocept/vendo/browser/productvariation.pt:22
msgid "Price per unit: ${price} €"
msgstr "Stückpreis: ${price} €"
(at)(at) -206,6 +212,14 (at)(at)
msgid "Add to cart"
msgstr "In den Warenkorb"
+#: src/gocept/vendo/cart.py:262
+msgid "Prepayment"
+msgstr "Vorauskasse"
+
+#: src/gocept/vendo/cart.py:263
+msgid "Direct debit"
+msgstr "Lastschrift"
+
#: src/gocept/vendo/content/order.py:105
msgid "Item"
msgstr "Position"
Modified: gocept.vendo/trunk/src/gocept/vendo/i18n/gocept.vendo.pot
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/i18n/gocept.vendo.pot (original)
+++ gocept.vendo/trunk/src/gocept/vendo/i18n/gocept.vendo.pot Tue Aug 5
17:52:53 2008
(at)(at) -14,7 +14,7 (at)(at)
msgid ""
msgstr ""
"Project-Id-Version: Development/Unknown\n"
-"POT-Creation-Date: Tue Aug 5 16:47:30 2008\n"
+"POT-Creation-Date: Tue Aug 5 17:49:18 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"
(at)(at) -27,10 +27,27 (at)(at)
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:23
#: src/gocept/vendo/browser/cart_macros.pt:13
msgid "Pos."
(at)(at) -55,14 +72,8 (at)(at)
msgstr ""
#: src/gocept/vendo/browser/cart.pt:97
-#. Default: "Continue"
-msgid "continue-button"
-msgstr ""
-
-#: src/gocept/vendo/browser/cart.pt:99
-#: src/gocept/vendo/browser/checkout.pt:578
-#. Default: "Change"
-msgid "change-button"
+#: src/gocept/vendo/browser/cart_macros.pt:56
+msgid "Payment"
msgstr ""
#: src/gocept/vendo/browser/cart_macros.pt:43
(at)(at) -201,11 +212,6 (at)(at)
msgid "You will shortly recive an order acceptance by email."
msgstr ""
-#: src/gocept/vendo/browser/productvariation.pt:12
-#: src/gocept/vendo/browser/productvariation.pt:16
-msgid "${DYNAMIC_CONTENT}"
-msgstr ""
-
#: src/gocept/vendo/browser/productvariation.pt:22
msgid "Price per unit: ${price} €"
msgstr ""
(at)(at) -214,6 +220,14 (at)(at)
msgid "Add to cart"
msgstr ""
+#: src/gocept/vendo/cart.py:262
+msgid "Prepayment"
+msgstr ""
+
+#: src/gocept/vendo/cart.py:263
+msgid "Direct debit"
+msgstr ""
+
#: src/gocept/vendo/content/order.py:105
msgid "Item"
msgstr ""
|
SVN: r6401 - in gocept.vendo/trunk/src/gocept/vendo/i18n: . de/LC_MESSAGES
Sebastian Wehrmann <sw(at)gocept.com> |
2008-08-06 09:19:12 |
[ FULL ]
|
Author: sweh
Date: Wed Aug 6 09:19:10 2008
New Revision: 6401
Log:
translation updates
Modified:
gocept.vendo/trunk/src/gocept/vendo/i18n/de/LC_MESSAGES/gocept.vendo.po
gocept.vendo/trunk/src/gocept/vendo/i18n/gocept.vendo.pot
Modified:
gocept.vendo/trunk/src/gocept/vendo/i18n/de/LC_MESSAGES/gocept.vendo.po
==============================================================================
---
gocept.vendo/trunk/src/gocept/vendo/i18n/de/LC_MESSAGES/gocept.vendo.po (original)
+++ gocept.vendo/trunk/src/gocept/vendo/i18n/de/LC_MESSAGES/gocept.vendo.po Wed
Aug 6 09:19:10 2008
(at)(at) -3,8 +3,8 (at)(at)
msgid ""
msgstr ""
"Project-Id-Version: gocept.vendo\n"
-"POT-Creation-Date: Tue Aug 5 17:49:18 2008\n"
-"PO-Revision-Date: 2008-08-05 17:49+0100\n"
+"POT-Creation-Date: Wed Aug 6 09:17:29 2008\n"
+"PO-Revision-Date: 2008-08-06 09:18+0100\n"
"Last-Translator: Sebastian Wehrmann <sw(at)gocept.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
(at)(at) -154,7 +154,7 (at)(at)
#: src/gocept/vendo/browser/checkout.pt:71
#: src/gocept/vendo/browser/checkout.pt:343
msgid "Programprovider:"
-msgstr "Programmprovider:"
+msgstr "Programmanbieter:"
#: src/gocept/vendo/browser/checkout.pt:91
#: src/gocept/vendo/browser/checkout.pt:363
Modified: gocept.vendo/trunk/src/gocept/vendo/i18n/gocept.vendo.pot
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/i18n/gocept.vendo.pot (original)
+++ gocept.vendo/trunk/src/gocept/vendo/i18n/gocept.vendo.pot Wed Aug 6
09:19:10 2008
(at)(at) -14,7 +14,7 (at)(at)
msgid ""
msgstr ""
"Project-Id-Version: Development/Unknown\n"
-"POT-Creation-Date: Tue Aug 5 17:49:18 2008\n"
+"POT-Creation-Date: Wed Aug 6 09:17:29 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"
|
SVN: r6404 - in gocept.vendo/trunk/src/gocept/vendo: . content
Daniel Havlik <dh(at)gocept.com> |
2008-08-06 14:26:30 |
[ FULL ]
|
Author: nilo
Date: Wed Aug 6 14:26:28 2008
New Revision: 6404
Log:
added a plone.app.contentrules handler for our OrderAddedEvent
Modified:
gocept.vendo/trunk/src/gocept/vendo/configure.zcml
gocept.vendo/trunk/src/gocept/vendo/content/order.py
gocept.vendo/trunk/src/gocept/vendo/eventhandler.py
gocept.vendo/trunk/src/gocept/vendo/order.py
gocept.vendo/trunk/src/gocept/vendo/orderevent.py
Modified: gocept.vendo/trunk/src/gocept/vendo/configure.zcml
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/configure.zcml (original)
+++ gocept.vendo/trunk/src/gocept/vendo/configure.zcml Wed Aug 6 14:26:28 2008
(at)(at) -29,6 +29,11 (at)(at)
name="New Vendo Order"
/>
+ <subscriber
+ for=".orderevent.IOrderAddedEvent"
+ handler=".orderevent.neworder"
+ />
+
<i18n:registerTranslations
directory="i18n"
/>
Modified: gocept.vendo/trunk/src/gocept/vendo/content/order.py
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/content/order.py (original)
+++ gocept.vendo/trunk/src/gocept/vendo/content/order.py Wed Aug 6 14:26:28
2008
(at)(at) -91,6 +91,9 (at)(at)
_at_rename_after_creation = True
schema = VendoOrderSchema
+ def generateOrderMail(self):
+ return self.shipping_address
+
atapi.registerType(VendoOrder, PROJECTNAME)
Modified: gocept.vendo/trunk/src/gocept/vendo/eventhandler.py
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/eventhandler.py (original)
+++ gocept.vendo/trunk/src/gocept/vendo/eventhandler.py Wed Aug 6 14:26:28
2008
(at)(at) -12,7 +12,6 (at)(at)
from zope.component import queryMultiAdapter
from zope.interface import Interface
-
(at)zope.component.adapter(IVendoShop,
zope.app.container.interfaces.IObjectAddedEvent)
def onObjectAdded(object, event):
Modified: gocept.vendo/trunk/src/gocept/vendo/order.py
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/order.py (original)
+++ gocept.vendo/trunk/src/gocept/vendo/order.py Wed Aug 6 14:26:28 2008
(at)(at) -68,5 +68,6 (at)(at)
cartitem.get('price'),
cartitem.get('sum'),
cartitem.get('unit'))
-
zope.event.notify(gocept.vendo.orderevent.OrderAddedEvent(order.__of__(self.context)))
+ zope.event.notify(gocept.vendo.orderevent.OrderAddedEvent(
+ order.__of__(self.context)))
return
Modified: gocept.vendo/trunk/src/gocept/vendo/orderevent.py
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/orderevent.py (original)
+++ gocept.vendo/trunk/src/gocept/vendo/orderevent.py Wed Aug 6 14:26:28 2008
(at)(at) -1,3 +1,4 (at)(at)
+import plone.app.contentrules.handlers
import zope.component.interfaces
import zope.interface
(at)(at) -13,4 +14,11 (at)(at)
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)
+
|
SVN: r6406 - gocept.vendo/trunk/src/gocept/vendo
Daniel Havlik <dh(at)gocept.com> |
2008-08-06 15:15:34 |
[ FULL ]
|
Author: nilo
Date: Wed Aug 6 15:15:33 2008
New Revision: 6406
Log:
removing extra ,
Modified:
gocept.vendo/trunk/src/gocept/vendo/order.py
Modified: gocept.vendo/trunk/src/gocept/vendo/order.py
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/order.py (original)
+++ gocept.vendo/trunk/src/gocept/vendo/order.py Wed Aug 6 15:15:33 2008
(at)(at) -39,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
|
SVN: r6407 - gocept.vendo/trunk/src/gocept/vendo
Daniel Havlik <dh(at)gocept.com> |
2008-08-06 15:44:16 |
[ FULL ]
|
Author: nilo
Date: Wed Aug 6 15:44:14 2008
New Revision: 6407
Log:
use german strings for payment methods
Modified:
gocept.vendo/trunk/src/gocept/vendo/cart.py
Modified: gocept.vendo/trunk/src/gocept/vendo/cart.py
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/cart.py (original)
+++ gocept.vendo/trunk/src/gocept/vendo/cart.py Wed Aug 6 15:44:14 2008
(at)(at) -259,8 +259,8 (at)(at)
def get_payment_methods(self):
""" Return a list of payment methods. """
- methods = [{'id': 'prepay', 'title': _(u'Prepayment')},
- {'id': 'debit', 'title': _(u'Direct debit')}]
+ methods = [{'id': 'prepay', 'title': 'Vorkasse'},
+ {'id': 'debit', 'title': 'Lastschrift'}]
return methods
def get_shipping_method(self):
|
SVN: r6408 - gocept.vendo/trunk/src/gocept/vendo
Daniel Havlik <dh(at)gocept.com> |
2008-08-06 15:47:22 |
[ FULL ]
|
Author: nilo
Date: Wed Aug 6 15:47:20 2008
New Revision: 6408
Log:
saving invoice_same_as_shipping on the order
Modified:
gocept.vendo/trunk/src/gocept/vendo/order.py
Modified: gocept.vendo/trunk/src/gocept/vendo/order.py
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/order.py (original)
+++ gocept.vendo/trunk/src/gocept/vendo/order.py Wed Aug 6 15:47:20 2008
(at)(at) -58,6 +58,7 (at)(at)
order.vat = cart.get_vat()
order.vat_rate = cart.get_vat_rate()
order.total = cart.get_total_price()
+ order.invoide_same_as_shipping = cart.get_invoice_same_as_shipping()
order.shipping_address =
copy.copy(cart.get_shipping_address().aq_base)
order.invoice_address = copy.copy(cart.get_invoice_address().aq_base)
for cartitem in cart.get_items():
|
SVN: r6409 - gocept.vendo/trunk/src/gocept/vendo
Daniel Havlik <dh(at)gocept.com> |
2008-08-06 15:51:20 |
[ FULL ]
|
Author: nilo
Date: Wed Aug 6 15:51:18 2008
New Revision: 6409
Log:
fixed typo
Modified:
gocept.vendo/trunk/src/gocept/vendo/order.py
Modified: gocept.vendo/trunk/src/gocept/vendo/order.py
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/order.py (original)
+++ gocept.vendo/trunk/src/gocept/vendo/order.py Wed Aug 6 15:51:18 2008
(at)(at) -58,7 +58,7 (at)(at)
order.vat = cart.get_vat()
order.vat_rate = cart.get_vat_rate()
order.total = cart.get_total_price()
- order.invoide_same_as_shipping = cart.get_invoice_same_as_shipping()
+ order.invoice_same_as_shipping = cart.get_invoice_same_as_shipping()
order.shipping_address =
copy.copy(cart.get_shipping_address().aq_base)
order.invoice_address = copy.copy(cart.get_invoice_address().aq_base)
for cartitem in cart.get_items():
|
SVN: r6410 - gocept.vendo/trunk/src/gocept/vendo/content
Sebastian Wehrmann <sw(at)gocept.com> |
2008-08-06 16:01:21 |
[ FULL ]
|
Author: sweh
Date: Wed Aug 6 16:01:00 2008
New Revision: 6410
Log:
use the orderview from jugendprogramm.theme for sending the confirmation mail
Modified:
gocept.vendo/trunk/src/gocept/vendo/content/order.py
Modified: gocept.vendo/trunk/src/gocept/vendo/content/order.py
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/content/order.py (original)
+++ gocept.vendo/trunk/src/gocept/vendo/content/order.py Wed Aug 6 16:01:00
2008
(at)(at) -3,6 +3,7 (at)(at)
# $Id$
from zope.interface import implements
+import zope.component
from Products.Archetypes import atapi
from Products.ATContentTypes.content import base, folder
(at)(at) -92,7 +93,9 (at)(at)
schema = VendoOrderSchema
def generateOrderMail(self):
- return self.shipping_address
+ orderview = zope.component.getMultiAdapter(
+ (self, self.request), name="ordermail")
+ return orderview()
atapi.registerType(VendoOrder, PROJECTNAME)
|
SVN: r6412 - gocept.vendo/trunk/src/gocept/vendo/content
Daniel Havlik <dh(at)gocept.com> |
2008-08-06 23:08:40 |
[ FULL ]
|
Author: nilo
Date: Wed Aug 6 23:08:38 2008
New Revision: 6412
Log:
repaired computed field for vat
Modified:
gocept.vendo/trunk/src/gocept/vendo/content/order.py
Modified: gocept.vendo/trunk/src/gocept/vendo/content/order.py
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/content/order.py (original)
+++ gocept.vendo/trunk/src/gocept/vendo/content/order.py Wed Aug 6 23:08:38
2008
(at)(at) -59,7 +59,7 (at)(at)
),
atapi.ComputedField(
'vat',
- expression='context.vat_sum',
+ expression='context.vat',
widget=atapi.ComputedWidget(
label=_("VAT sum"),
),
|
SVN: r6413 - in gocept.vendo/trunk/src/gocept/vendo: . vendo_ordertool
Daniel Havlik <dh(at)gocept.com> |
2008-08-06 23:09:05 |
[ FULL ]
|
Author: nilo
Date: Wed Aug 6 23:09:02 2008
New Revision: 6413
Log:
added vendo_ordertool
Added:
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/dot.gif (contents,
props changed)
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/down.gif (contents,
props changed)
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/formatPrice.py
(contents, props changed)
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/fri.gif (contents,
props changed)
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/get365BackDays.py
(contents, props changed)
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/getMonthOrders.py
(contents, props changed)
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/getOrdersForTimespan.py
(contents, props changed)
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/getWeekOrders.py
(contents, props changed)
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/getYearOrders.py
(contents, props changed)
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/index_html.pt
(contents, props changed)
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/legende.gif (contents,
props changed)
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/mon.gif (contents,
props changed)
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/ordertool.css.dtml
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/ordertool_print.css.dtml
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/otGetOrders.py
(contents, props changed)
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/ot_navi_days.pt
(contents, props changed)
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/ot_start.pt (contents,
props changed)
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/ot_view_orders.pt
(contents, props changed)
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/processOrders.py
(contents, props changed)
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/sat.gif (contents,
props changed)
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/sun.gif (contents,
props changed)
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/thu.gif (contents,
props changed)
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/tue.gif (contents,
props changed)
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/up.gif (contents,
props changed)
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/viewDetails.pt
(contents, props changed)
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/wed.gif (contents,
props changed)
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/weekday-bg.gif
(contents, props changed)
Modified:
gocept.vendo/trunk/src/gocept/vendo/__init__.py
Modified: gocept.vendo/trunk/src/gocept/vendo/__init__.py
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/__init__.py (original)
+++ gocept.vendo/trunk/src/gocept/vendo/__init__.py Wed Aug 6 23:09:02 2008
(at)(at) -1,5 +1,6 (at)(at)
from zope.i18nmessageid import MessageFactory
from gocept.vendo import config
+from Products.CMFCore.DirectoryView import registerDirectory
from Products.Archetypes import atapi
import Products.CMFCore.utils
(at)(at) -14,6 +15,7 (at)(at)
content_types, constructors, ftis = atapi.process_types(
atapi.listTypes(config.PROJECTNAME),
config.PROJECTNAME)
+ registerDirectory('vendo_ordertool', globals())
for atype, constructor in zip(content_types, constructors):
Products.CMFCore.utils.ContentInit("%s: %s" % (config.PROJECTNAME,
atype.portal_type),
content_types = (atype,),
Added: gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/dot.gif
==============================================================================
Binary file. No diff available.
Added: gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/down.gif
==============================================================================
Binary file. No diff available.
Added: gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/formatPrice.py
==============================================================================
--- (empty file)
+++ gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/formatPrice.py Wed Aug
6 23:09:02 2008
(at)(at) -0,0 +1,3 (at)(at)
+##parameters=price
+return '%s %s' % ('EUR', price)
+
Added: gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/fri.gif
==============================================================================
Binary file. No diff available.
Added: gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/get365BackDays.py
==============================================================================
--- (empty file)
+++ gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/get365BackDays.py Wed
Aug 6 23:09:02 2008
(at)(at) -0,0 +1,14 (at)(at)
+import random
+
+today = DateTime().toZone('US/Eastern')
+res = []
+for x in range(365):
+ newdate = today - x
+ orders = context.getOrdersForTimespan(newdate, newdate)
+ numorders = len(orders)
+
+ if numorders > 25:
+ numorders = 'more'
+ res.append((newdate.strftime('%Y/%m/%d'), newdate.strftime('%a'),
numorders))
+
+return res
Added: gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/getMonthOrders.py
==============================================================================
--- (empty file)
+++ gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/getMonthOrders.py Wed
Aug 6 23:09:02 2008
(at)(at) -0,0 +1,63 (at)(at)
+today = DateTime().toZone('US/Eastern')
+month = today.month()
+year = today.year()
+if month == 1:
+ lastmonth = 12
+ yearstart = year - 1
+else:
+ lastmonth = month - 1
+ yearstart = year
+
+lastmonthbegin_str = '%s/%s/01 00:00 US/Eastern' % (yearstart, lastmonth)
+thismonthbegin_str = '%s/%s/01 00:00 US/Eastern' % (year, month)
+
+lastmonthend_day = int(today.dd())
+if (lastmonth in [4, 6, 9, 11]) and (lastmonthend_day > 30):
+ lastmonthend_day = 30
+if (lastmonth == 2) and (lastmonthend_day > 28):
+ lastmonthend_day = 28
+
+lastmonthend = '%s/%s/%s %s %s' % (yearstart, lastmonth, lastmonthend_day,
+ today.PreciseTime(), today.timezone())
+
+thismonthbegin_date = DateTime(thismonthbegin_str)
+thismonthend_date = today
+lastmonthbegin_date = DateTime(lastmonthbegin_str)
+lastmonthend_date = DateTime(lastmonthend)
+
+
+orders_last = context.getOrdersForTimespan(lastmonthbegin_date,
+ lastmonthend_date, exact_end=True)
+orders_this = context.getOrdersForTimespan(thismonthbegin_date,
+ thismonthend_date, exact_end=True)
+
+lastorders_num = len(orders_last)
+thisorders_num = len(orders_this)
+lastorders_sales = sum([o.getObject().getTotal() for o in orders_last])
+thisorders_sales = sum([o.getObject().getTotal() for o in orders_this])
+
+
+if lastmonthend_day == 1:
+ md = '1st'
+elif lastmonthend_day == 2:
+ md = '2nd'
+elif lastmonthend_day == 3:
+ md = '3rd'
+else:
+ md = '%sth' % lastmonthend_day
+
+if abs(lastorders_sales - thisorders_sales) < 60 * lastmonthend_day:
+ tendency = 'dot'
+elif lastorders_sales < thisorders_sales:
+ tendency = 'up'
+elif lastorders_sales > thisorders_sales:
+ tendency = 'down'
+
+return {'thisnum': thisorders_num,
+ 'thissales': thisorders_sales,
+ 'lastnum': lastorders_num,
+ 'lastsales': lastorders_sales,
+ 'monthday': md,
+ 'monthtime': today.AMPMMinutes(),
+ 'tendency': tendency
+}
Added:
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/getOrdersForTimespan.py
==============================================================================
--- (empty file)
+++
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/getOrdersForTimespan.py Wed
Aug 6 23:09:02 2008
(at)(at) -0,0 +1,15 (at)(at)
+##parameters=daystart, dayend, exact_end=False
+
+daystr_start = '%s 00:00 US/Eastern' % daystart.Date()
+day_start = DateTime(daystr_start).toZone('GMT+2')
+if exact_end:
+ day_end = dayend.toZone('GMT+2')
+else:
+ daystr_end = '%s 23:59 US/Eastern' % dayend.Date()
+ 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'})
+
+return orders
Added: gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/getWeekOrders.py
==============================================================================
--- (empty file)
+++ gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/getWeekOrders.py Wed
Aug 6 23:09:02 2008
(at)(at) -0,0 +1,56 (at)(at)
+thisweekbegin = today = DateTime().toZone('US/Eastern')
+while True:
+ if thisweekbegin.dow() == 1:
+ break
+ thisweekbegin = thisweekbegin - 1
+
+thisweekend = today
+
+lastweek1begin = thisweekbegin - 7
+lastweek1end = thisweekend - 7
+lastweek2begin = lastweek1begin - 7
+lastweek2end = lastweek1end - 7
+lastweek3begin = lastweek2begin - 7
+lastweek3end = lastweek2end - 7
+lastweek4begin = lastweek3begin - 7
+lastweek4end = lastweek3end - 7
+
+
+orders_this = context.getOrdersForTimespan(thisweekbegin, thisweekend,
exact_end=True)
+orders_last1 = context.getOrdersForTimespan(lastweek1begin, lastweek1end,
exact_end=True)
+orders_last2 = context.getOrdersForTimespan(lastweek2begin, lastweek2end,
exact_end=True)
+orders_last3 = context.getOrdersForTimespan(lastweek3begin, lastweek3end,
exact_end=True)
+orders_last4 = context.getOrdersForTimespan(lastweek4begin, lastweek4end,
exact_end=True)
+
+lastorders_num_avg = (len(orders_last1) + len(orders_last2) +
+ len(orders_last3) + len(orders_last4)) / 4
+last1orders_sales_total = sum([o.getObject().getTotal() for o in
orders_last1])
+last2orders_sales_total = sum([o.getObject().getTotal() for o in
orders_last2])
+last3orders_sales_total = sum([o.getObject().getTotal() for o in
orders_last3])
+last4orders_sales_total = sum([o.getObject().getTotal() for o in
orders_last4])
+thisorders_sales_total = sum([o.getObject().getTotal() for o in orders_this])
+
+lastorders_sales_avg = (last1orders_sales_total + last2orders_sales_total +
+ last3orders_sales_total + last4orders_sales_total) / 4
+
+
+thisorders_num = len(orders_this)
+
+if abs(thisorders_sales_total - lastorders_sales_avg) < (60 *
thisweekbegin.dow()):
+ tendency = 'dot'
+elif (thisorders_sales_total > lastorders_sales_avg):
+ tendency = 'up'
+elif (thisorders_sales_total < lastorders_sales_avg):
+ tendency = 'down'
+
+weekday = today.aDay()
+nowtime = today.AMPMMinutes()
+
+return {'thisnum': thisorders_num,
+ 'thissales': thisorders_sales_total,
+ 'lastnum': lastorders_num_avg,
+ 'lastsales': lastorders_sales_avg,
+ 'weekday': weekday,
+ 'nowtime': nowtime,
+ 'tendency': tendency
+}
Added: gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/getYearOrders.py
==============================================================================
--- (empty file)
+++ gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/getYearOrders.py Wed
Aug 6 23:09:02 2008
(at)(at) -0,0 +1,16 (at)(at)
+today = DateTime().toZone('US/Eastern')
+year = today.year()
+
+yearbegin_str = '%s/01/01 00:00 US/Eastern' % year
+yearbegin = DateTime(yearbegin_str)
+
+orders_this = context.getOrdersForTimespan(yearbegin,
+ today, exact_end=True)
+
+thisorders_num = len(orders_this)
+thisorders_sales = sum([o.getObject().getTotal() for o in orders_this])
+
+
+return {'thisnum': thisorders_num,
+ 'thissales': thisorders_sales,
+ }
Added: gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/index_html.pt
==============================================================================
--- (empty file)
+++ gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/index_html.pt Wed Aug
6 23:09:02 2008
(at)(at) -0,0 +1,4 (at)(at)
+<frameset cols="200,*" FRAMEBORDER=NO FRAMESPACING=0 BORDER=0>
+ <frame name="navi" src="ot_navi_days"/>
+ <frame name="content" src="ot_start"/>
+</frameset>
Added: gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/legende.gif
==============================================================================
Binary file. No diff available.
Added: gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/mon.gif
==============================================================================
Binary file. No diff available.
Added: gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/ordertool.css.dtml
==============================================================================
--- (empty file)
+++ gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/ordertool.css.dtml Wed
Aug 6 23:09:02 2008
(at)(at) -0,0 +1,202 (at)(at)
+div.over_div {
+ float: left;
+ height: 180px;
+ width: 200px;
+ margin-right: 20px;
+ padding: 5px;
+ border-left: 2px solid #777777;
+ border-top: 2px solid #777777;
+ border-right: 2px solid #CCCCCC;
+ border-bottom: 2px solid #CCCCCC;
+ background-color: #DDDDDD;
+ font-family: Helvetica, Verdana, Arial;
+}
+
+div.over_div h3 {
+ font-family: Helvetica, Verdana, Arial;
+ border-bottom: 1px solid #777777;
+ font-size: 14px;
+}
+
+div.over_div h3.down {
+ background-image: url('down.gif');
+ background-repeat: no-repeat;
+ background-position: 180px 0px;
+}
+div.over_div h3.up {
+ background-image: url('up.gif');
+ background-repeat: no-repeat;
+ background-position: 180px 0px;
+}
+div.over_div h3.dot {
+ background-image: url('dot.gif');
+ background-repeat: no-repeat;
+ background-position: 180px 0px;
+}
+
+
+
+div.over_div p.ordernum {
+ font-size: 38px;
+ line-height: 38px;
+ font-weight: bold;
+ text-align: center;
+ padding: 0px;
+ margin: 0px;
+}
+
+div.over_div p.sales {
+ font-size: 20px;
+ line-height: 20px;
+ font-weight: bold;
+ text-align:center;
+ padding:0px;
+ margin: 0px;
+}
+div.over_div p.last {
+ font-size: 12px;
+}
+
+p.last span.lastnum, span.lastsales {
+ font-weight: bold;
+}
+
+h1 {
+ font-family: Helvetica, Verdana, Arial;
+}
+
+table#orderlist {
+ border-left: 2px solid #777777;
+ border-top: 2px solid #777777;
+ border-right: 2px solid #CCCCCC;
+ border-bottom: 2px solid #CCCCCC;
+ background-color: #DDDDDD;
+ font-family: Helvetica, Verdana, Arial;
+ margin: 0px;
+ padding:0px;
+}
+
+table#orderlist tr td {
+ border: 1px solid #EEEEEE;
+ margin:0px;
+ padding-right: 5px;
+ padding-top: 6px;
+ padding-bottom: 3px;
+ padding-left: 5px;
+ font-size: 12px;
+}
+
+table#orderlist tr th {
+ border-bottom: 1px solid #EEEEEE;
+ border-left: 1px solid #EEEEEE;
+ border-right: 1px solid #EEEEEE;
+ margin:0px;
+ font-size: 14px;
+ vertical-align: left;
+ padding-right: 5px;
+ padding-top: 6px;
+ padding-bottom: 3px;
+ padding-left: 5px;
+}
+
+td.right {
+ vertical-align: right;
+}
+
+td.namecol {
+ width: 200px;
+}
+
+td.countrycol {
+ width: 120px;
+}
+
+td.citycol {
+ width: 200px;
+}
+
+td.statcol {
+ width: 80px;
+}
+
+td.Ordered {
+ background-color: #EEEEbb;
+}
+
+td.Shipped {
+ background-color: #bbeebb;
+}
+table#orderlist tr td.pricecol {
+ font-weight: bold;
+}
+
+table#orderlist tr td.sumrow {
+ font-size: 18px;
+ font-weight: bold;
+ border-top: 2px solid black !important;
+}
+
+table#orderlist tr td.actions {
+ border: none;
+ background-color: #FF6633 !important;
+
+}
+table#order {
+ margin-left: 20px;
+}
+
+
+table#order tr td {
+ font-family: Helvetica, Verdana, Arial;
+ font-size: 12px;
+ padding: 5px;
+ height: 20px;
+}
+
+table#order tr td.shippingDesc {
+ font-weight: bold;
+}
+table#order tr th {
+ font-family: Helvetica, Verdana, Arial;
+ font-size: 12px;
+ text-align: left;
+ padding: 5px;
+ background-color: #bbbbbb;
+}
+
+table#order tfoot tr td {
+ background-color: #dddddd;
+}
+
+span.addrhead {
+ font-size: 14px;
+ font-weight: bold;
+ margin-top: 10px;
+ line-height: 20px;
+}
+
+div.addr {
+ margin: 20px;
+ margin-top: 0px;
+ float: left;
+}
+
+div.addr div {
+ line-height: 14px;
+ font-size: 12px;
+}
+
+p.orderinf {
+ margin: 20px;
+ font-size: 12px;
+ line-height: 14px;
+}
+
+body {
+ font-family: Helvetica, Verdana, Arial;
+ padding:0;
+ margin:0;
+}
+
+
+
Added:
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/ordertool_print.css.dtml
==============================================================================
--- (empty file)
+++
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/ordertool_print.css.dtml Wed
Aug 6 23:09:02 2008
(at)(at) -0,0 +1,15 (at)(at)
+p.pagebreak {
+page-break-after:always;
+}
+
+hr {
+display: none;
+}
+
+input {
+display: none;
+}
+
+table#order tr th {
+ border-bottom: 1px solid black;
+}
Added: gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/otGetOrders.py
==============================================================================
--- (empty file)
+++ gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/otGetOrders.py Wed Aug
6 23:09:02 2008
(at)(at) -0,0 +1,53 (at)(at)
+req = context.REQUEST
+cat = context.jp.portal_catalog
+
+start = req.get('startdate')
+end = req.get('enddate')
+
+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')
+
+sum = 0
+res = []
+for o in orders:
+ order = o.getObject()
+ total = order.getTotal()
+ sum += total
+ id = o.getId
+ name = '%s %s' % (order.shipping_address.firstname,
order.shipping_address.lastname)
+ status = putils.getReviewStateTitleFor(order)
+ country_names = []
+ if order.invoice_same_as_shipping:
+ countries = [order.invoice_address.country]
+ else:
+ countries = [order.invoice_address.country,
order.shipping_address.country]
+
+ for country in countries:
+ country_names.append(countrytool.getCountryByIsoCode(country).name)
+ try:
+ country_name = '/'.join(country_names)
+ except:
+ country_name = 'Missing Country'
+ city = '%s %s' % (order.shipping_address.zip,
+ order.shipping_address.city,)
+
+ fmt = DateTime(o.created).toZone('GMT+2')
+ timefmt = '%s %s' % (fmt.Date(), fmt.Time() )
+
+ res.append({'id': id,
+ 'total': total,
+ 'name': name,
+ 'country': country_name,
+ 'city': city,
+ 'status': status,
+ 'time': timefmt
+ })
+
+
+
+return {'orders': res, 'sum': sum}
Added: gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/ot_navi_days.pt
==============================================================================
--- (empty file)
+++ gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/ot_navi_days.pt Wed Aug
6 23:09:02 2008
(at)(at) -0,0 +1,124 (at)(at)
+<html>
+<head></head>
+<body>
+<style type="text/css">
+body { padding:0;
+ margin:0;
+ overflow-x: hidden;
+ }
+
+select {
+ border: none;
+ width: 200px;
+}
+
+option.Mon {
+ background-image: url('mon.gif');
+}
+option.Tue {
+ background-image: url('tue.gif');
+}
+option.Wed {
+ background-image: url('wed.gif');
+}
+option.Thu {
+ background-image: url('thu.gif');
+}
+option.Fri {
+ background-image: url('fri.gif');
+}
+option.Sat {
+ background-image: url('sat.gif');
+}
+option.Sun {
+ background-image: url('sun.gif');
+}
+
+option.o0 { border-right: none; }
+option.o1 { border-right: 2px solid blue; }
+option.o2 { border-right: 4px solid blue; }
+option.o3 { border-right: 6px solid blue; }
+option.o4 { border-right: 8px solid blue; }
+option.o5 { border-right: 10px solid blue; }
+option.o6 { border-right: 12px solid blue; }
+option.o7 { border-right: 14px solid blue; }
+option.o8 { border-right: 16px solid blue; }
+option.o9 { border-right: 18px solid blue; }
+option.o10 { border-right: 20px solid blue; }
+option.o11 { border-right: 22px solid blue; }
+option.o12 { border-right: 24px solid blue; }
+option.o13 { border-right: 26px solid blue; }
+option.o14 { border-right: 28px solid blue; }
+option.o15 { border-right: 30px solid blue; }
+option.o16 { border-right: 32px solid blue; }
+option.o17{ border-right: 34px solid blue; }
+option.o18 { border-right: 36px solid blue; }
+option.o19 { border-right: 38px solid blue; }
+option.o20 { border-right: 40px solid blue; }
+option.o21 { border-right: 42px solid blue; }
+option.o22 { border-right: 44px solid blue; }
+option.o23 { border-right: 46px solid blue; }
+option.o24 { border-right: 48px solid blue; }
+option.o25 { border-right: 50px solid blue; }
+option.omore { border-right: 50px solid #8888FF; }
+
+option {
+ padding-left: 32px;
+ padding-right: 8px;
+ font-size: 10px;
+ background-repeat: no-repeat;
+ height: 14px;
+ padding-top: 3px;
+}
+
+option:selected {
+ padding-left: 20px;
+}
+
+.wd {
+font-size: 20px;
+}
+</style>
+
+<script language="javascript">
+function selectIt() {
+ startFound = 0;
+ endFound = 0;
+ selectOrElem = document.getElementById('selectOr');
+ for (var i=0; i < selectOrElem.length; i++) {
+ if (selectOrElem.options[i].selected == true) {
+ if (startFound == 0) {
+ startFound = selectOrElem.options[i].value;
+ }
+ selectOrElem.options[i].style.borderLeft = '6px solid red';
+ selectOrElem.options[i].selected = false;
+ } else {
+ if ((endFound == 0) && (startFound != 0)) {
+ endFound = selectOrElem.options[i-1].value;
+ }
+ selectOrElem.options[i].style.borderLeft = 'none';
+ }
+ }
+ if ((startFound != 0) && (endFound != 0)) {
+ parent.content.location.href = 'ot_view_orders?enddate=' + startFound +
'&startdate=' + endFound
+ }
+ selectOrElem.blur();
+ return true
+}
+
+</script>
+
+<p style="text-align: right; padding:0; margin:0">
+<select id="selectOr" multiple size=366 onmouseup="selectIt()">
+<option style="background-image: url('legende.gif');
+ background-position:65px 0px;"/>
+<tal:block repeat="op here/get365BackDays">
+
+<option tal:attributes="class python:op[1] + ' o' + str(op[2])"><span
tal:replace="python:op[0] "/></OPTION>
+
+</tal:block>
+</select>
+</p>
+</body>
+</html>
+
Added: gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/ot_start.pt
==============================================================================
--- (empty file)
+++ gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/ot_start.pt Wed Aug 6
23:09:02 2008
(at)(at) -0,0 +1,40 (at)(at)
+<html>
+<head>
+<style type="text/css" media="screen">
+<!-- (at)import url(ordertool.css); --></style>
+</head>
+<body tal:define="weekorders here/getWeekOrders;
+ monthorders here/getMonthOrders;
+ yearorders here/getYearOrders;
+ formatPrice nocall:here/formatPrice;"
+ >
+ <h1>Kelocote-Ordertool Overview</h1>
+
+ <div class="over_div">
+ <h3 tal:attributes="class weekorders/tendency">Orders this
week</h3>
+ <p class="ordernum" tal:content="weekorders/thisnum">5</p>
+ <p class="sales"
+ tal:content="python:formatPrice(weekorders['thissales'])">13.12
US$</p>
+ <p class="last">
+ In the previous 4 weeks on <span tal:replace="weekorders/weekday"/>
<span tal:replace="weekorders/nowtime"/>, you had an average of <span
tal:content="weekorders/lastnum" class="lastnum"/> orders (<span
tal:content="python:formatPrice(weekorders['lastsales'])"
class="lastsales"/>).
+
+ </p>
+ </div>
+
+ <div class="over_div">
+ <h3 tal:attributes="class monthorders/tendency">Orders this
month</h3>
+ <p class="ordernum" tal:content="monthorders/thisnum">125</p>
+ <p class="sales"
+ tal:content="python:formatPrice(monthorders['thissales'])">10942.12
US$</p>
+ <p class="last">Last month on the <span
tal:replace="monthorders/monthday"/> at <span
tal:replace="monthorders/monthtime"/>, you had <span class="lastnum"
tal:content="monthorders/lastnum"/> orders (<span class="lastsales"
tal:content="python:formatPrice(monthorders['lastsales'])"/>).</p>
+ </div>
+
+ <div class="over_div">
+ <h3>Orders this year</h3>
+ <p class="ordernum" tal:content="yearorders/thisnum">1423</p>
+ <p class="sales"
tal:content="python:formatPrice(yearorders['thissales'])">105332.12
US$</p>
+ </div>
+
+
+</body>
+</html>
Added: gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/ot_view_orders.pt
==============================================================================
--- (empty file)
+++ gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/ot_view_orders.pt Wed
Aug 6 23:09:02 2008
(at)(at) -0,0 +1,175 (at)(at)
+<html>
+<head>
+<style type="text/css" media="screen">
+<!-- (at)import url(ordertool.css); --></style>
+
+
+</head>
+<body onload="unselectall()" tal:define="res context/otGetOrders;
+ formatPrice nocall:here/formatPrice;
+ orders res/orders;
+ sum res/sum;">
+
+
+
+<script language="javascript">
+function highLight(objid) {
+ elem_to_hl = document.getElementById('tr'+objid);
+ elem_to_hl.style.backgroundColor = '#FFCC99;';
+}
+
+function unHighLight(objid) {
+ elem_to_hl = document.getElementById('tr'+objid);
+ cb_elem = document.getElementById(objid);
+ if (cb_elem.checked == 1) {
+ elem_to_hl.style.backgroundColor = '#FFDDCC;';
+ } else {
+ elem_to_hl.style.backgroundColor = '#DDDDDD;';
+ }
+}
+
+function setcbrow(objid) {
+ row_elem = document.getElementById('tr'+objid);
+ row_elem.style.backgroundColor = '#FFDDCC;';
+}
+
+function unsetcbrow(objid) {
+ row_elem = document.getElementById('tr'+objid);
+ row_elem.style.backgroundColor = '#DDDDDD;';
+}
+
+function togglecb(objid) {
+ elem_to_tgl = document.getElementById(objid);
+ if (elem_to_tgl.checked == 1) {
+ elem_to_tgl.checked = 0;
+ unsetcbrow(objid);
+ } else {
+ elem_to_tgl.checked = 1;
+ setcbrow(objid);
+ }
+ updateSelectionSum();
+}
+
+function selectall() {
+ elems = document.getElementsByTagName('input');
+ for (var i=0; i < elems.length; i++) {
+ if (elems[i].type == 'checkbox') {
+ elems[i].checked = 1;
+ setcbrow(elems[i].id);
+ }
+ }
+ updateSelectionSum();
+}
+
+function unselectall() {
+ elems = document.getElementsByTagName('input');
+ for (var i=0; i < elems.length; i++) {
+ if (elems[i].type == 'checkbox') {
+ elems[i].checked = 0;
+ unsetcbrow(elems[i].id);
+ }
+ }
+ updateSelectionSum();
+}
+
+function invertselection() {
+ elems = document.getElementsByTagName('input');
+ for (var i=0; i < elems.length; i++) {
+ if (elems[i].type == 'checkbox') {
+ togglecb(elems[i].id);
+ }
+ }
+}
+
+function updateSelectionSum() {
+ sselem = document.getElementById('selectionSum');
+ elems = document.getElementsByTagName('input');
+ var sum=0;
+ for (var i=0; i < elems.length; i++) {
+ if ((elems[i].type == 'checkbox') & (elems[i].checked == 1)) {
+ rowAmount =
document.getElementById('amount'+elems[i].id).innerHTML;
+ sum = sum + (Number(rowAmount) * 100);
+ }
+ }
+ sselem.innerHTML = sum / 100;
+}
+
+function openOrderPopup() {
+ elems = document.getElementsByTagName('input');
+ qrystring = "?submitted=1";
+ for (var i=0; i < elems.length; i++) {
+ if ((elems[i].type == 'checkbox') & (elems[i].checked == 1)) {
+ qrystring = qrystring + "&orders:list=" + elems[i].id;
+ }
+ }
+ window.open('viewDetails'+qrystring, 'Orders',
'width=500,height=650,status=no,toolbar=no,menubar=no,scrollbars=yes,resizable=yes');
+}
+
+
+</script>
+<form action="ot_start" method="get">
+<input type="submit" value="Home" /></form>
+<form name="orders" id="ordersForm" action="processOrders">
+<input type="hidden" name="startdate" tal:attributes="value
request/startdate"/>
+<input type="hidden" name="enddate" tal:attributes="value
request/enddate"/>
+<table border="0" cellspacing="0" cellpadding="0" id="orderlist">
+<tr>
+ <th></th>
+ <th>Order No.</th>
+ <th>Order time</th>
+ <th>Name</th>
+ <th>Country</th>
+ <th>City</th>
+ <th>Total (EUR)</th>
+ <th>Status</th>
+</tr>
+<tr tal:repeat="order orders"
+ tal:attributes="id string:tr${order/id};
+ onmouseover string:highLight('${order/id}');
+ onmouseout string:unHighLight('${order/id}');
+ onclick string:togglecb('${order/id}');">
+ <td class="actions"><input type="checkbox"
+ tal:attributes="value order/id;
+ id string:${order/id};
+ onclick string:togglecb('${order/id}');"
+ name="orderselection"/>
+ <td tal:content="order/id"/>
+ <td tal:content="order/time"/>
+ <td class="namecol" tal:content="order/name"/>
+ <td class="countrycol" tal:content="order/country"/>
+ <td class="citycol" tal:content="order/city"/>
+ <td class="right pricecol" tal:content="order/total"
+ tal:attributes="id string:amount${order/id}"/>
+ <td class="statcol" tal:content="order/status"
+ tal:attributes="class string:statcol ${order/status}"/>
+</tr>
+<tr>
+ <td class="actions"> </td>
+ <td colspan="4"> </td>
+ <td colspan="1" class="sumrow">Sum</td>
+ <td colspan="2" class="sumrow"><span
tal:content="python:formatPrice(sum)"/>
+ (<span tal:replace="python:len(orders)"/> Orders)
+ </td>
+</tr>
+<tr>
+ <td class="actions" colspan="5">
+ <input type="button" value="Select all" onclick="selectall()"/>
+ <input type="button" value="Select none" onclick="unselectall()"/>
+ <input type="button" value="Invert selection"
onclick="invertselection()"/>
+ </td>
+ <td class="actions sumrow">Selection sum</td>
+ <td colspan="2" class="actions sumrow"><span
id="selectionSum">123</span></td>
+</tr>
+<tr>
+ <td class="actions" colspan="8">
+ <input type="submit" value="Set to processed"/>
+ <input type="button" value="View order details"
onClick="openOrderPopup()"/>
+
+
+ </td>
+</tr>
+
+</table>
+</form>
+</body>
+</html>
Added: gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/processOrders.py
==============================================================================
--- (empty file)
+++ gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/processOrders.py Wed
Aug 6 23:09:02 2008
(at)(at) -0,0 +1,23 (at)(at)
+from Products.CMFCore.utils import getToolByName
+req = context.REQUEST
+
+start = req.get('startdate', None)
+end = req.get('enddate', None)
+
+orderselection = req.get('orderselection', [])
+#argh:
+if not hasattr(orderselection, 'extend'):
+ orderselection = [orderselection]
+
+catalog = getToolByName(context, 'portal_catalog')
+wftool = getToolByName(context, 'portal_workflow')
+for orderid in orderselection:
+ ores = catalog(getId=orderid)
+ if len(ores) != 1:
+ continue
+ order = ores[0].getObject()
+ wftool.doActionFor(order, 'ship')
+
+
+req.RESPONSE.redirect('ot_view_orders?startdate=%s&enddate=%s' % (start,
end))
+
Added: gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/sat.gif
==============================================================================
Binary file. No diff available.
Added: gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/sun.gif
==============================================================================
Binary file. No diff available.
Added: gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/thu.gif
==============================================================================
Binary file. No diff available.
Added: gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/tue.gif
==============================================================================
Binary file. No diff available.
Added: gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/up.gif
==============================================================================
Binary file. No diff available.
Added: gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/viewDetails.pt
==============================================================================
--- (empty file)
+++ gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/viewDetails.pt Wed Aug
6 23:09:02 2008
(at)(at) -0,0 +1,134 (at)(at)
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xml:lang="en"
+ lang="en"
+ xmlns:tal="http://xml.zope.org/namespaces/tal"
+ xmlns:metal="http://xml.zope.org/namespaces/metal"
+ xmlns:i18n="http://xml.zope.org/namespaces/i18n">
+
+
+ <head>
+ <meta http-equiv="Content-Type"
+ content="text/html;charset=utf-8" />
+
+<style type="text/css" media="screen">
+<!-- (at)import url(ordertool.css); --></style>
+
+<style type="text/css" media="print">
+<!-- (at)import url(ordertool.css); -->
+<!-- (at)import url(ordertool_print.css); -->
+
+</style>
+ <title></title></head>
+
+ <body>
+ <input type="button" onClick="window.close()" value="Close"/>
+ <input type="button" onClick="window.print()" value="Print"/>
+ <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();
+ order_items order/contentValues;">
+ <h1>Order <span tal:replace="order/getId"/></h1>
+
+
+ <table id="order" cellspacing="0">
+ <thead>
+ <tr>
+ <th i18n:translate="">Pos.</th>
+ <th i18n:translate="">Product</th>
+ <th i18n:translate="">Amount</th>
+ <th i18n:translate="">Price</th>
+ <th i18n:translate="">Sum</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr tal:repeat="item order_items">
+ <td tal:content="repeat/item/number">34</td>
+ <td>
+ <span
+ tal:content="item/getItem_title">
+ Rotwein (6er Kiste)
+ </span>
+ </td>
+ <td tal:content="item/getAmount">4</td>
+ <td tal:content="python:formatPrice(item.getPrice())">
+ CHF 4.99
+ </td>
+ <td tal:content="python: formatPrice(item.getSum())">
+ CHF 5.32
+ </td>
+ </tr>
+ </tbody>
+ <tfoot>
+ <tr>
+ <td>
+ Shipping
+ </td>
+ <td class="shippingDesc" colspan="3"
tal:content="order/getShipping_title"></td>
+ <td tal:content="python:
formatPrice(order.getShipping())">
+ CHF 30
+ </td>
+ </tr>
+ <tr>
+ <td colspan="4">
+ Subtotal
+ </td>
+ <td tal:content="python:
formatPrice(order.getSub_total())">
+ CHF 503
+ </td>
+ </tr>
+ <tr>
+ <td colspan="4">
+ VAT (<span
tal:replace="order/getVat_rate">10%</span>%)
+ </td>
+ <td tal:content="python: formatPrice(order.getVat())">
+ XXX
+ </td>
+ </tr>
+ <tr>
+ <th colspan="4">
+ Total
+ </th>
+ <th tal:content="python: formatPrice(order.getTotal())">
+ CHF 508,3
+ </th>
+ </tr>
+ </tfoot>
+ </table>
+ <p class="orderinf">
+ <b>Email:</b> <span
tal:content="order/shipping_address/mail"/><br/>
+ <b>Created:</b> <span tal:content="python:
order.created().toZone('GMT+2')"/><br/>
+ <div class="addr" tal:define="addr python:order.shipping_address">
+ <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/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/mail" />
+ </div>
+
+ <div style="clear:both;"/>
+
+ <p class="pagebreak" tal:condition="not: repeat/orderid/end"/>
+ <hr/>
+ </tal:defines>
+ </tal:orders>
+ </body>
+</html>
Added: gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/wed.gif
==============================================================================
Binary file. No diff available.
Added: gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/weekday-bg.gif
==============================================================================
Binary file. No diff available.
|
SVN: r6414 - gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool
Daniel Havlik <dh(at)gocept.com> |
2008-08-07 09:22:30 |
[ FULL ]
|
Author: nilo
Date: Thu Aug 7 09:22:29 2008
New Revision: 6414
Log:
corrected headline
Modified:
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/ot_start.pt
Modified: gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/ot_start.pt
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/ot_start.pt (original)
+++ gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/ot_start.pt Thu Aug 7
09:22:29 2008
(at)(at) -8,7 +8,7 (at)(at)
yearorders here/getYearOrders;
formatPrice nocall:here/formatPrice;"
>
- <h1>Kelocote-Ordertool Overview</h1>
+ <h1>Ordertool Overview</h1>
<div class="over_div">
<h3 tal:attributes="class weekorders/tendency">Orders this
week</h3>
|
SVN: r6415 - gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool
Daniel Havlik <dh(at)gocept.com> |
2008-08-07 09:26:33 |
[ FULL ]
|
Author: nilo
Date: Thu Aug 7 09:26:32 2008
New Revision: 6415
Log:
removed set to processed button for now
Modified:
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/ot_view_orders.pt
Modified: gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/ot_view_orders.pt
==============================================================================
---
gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/ot_view_orders.pt (original)
+++ gocept.vendo/trunk/src/gocept/vendo/vendo_ordertool/ot_view_orders.pt Thu
Aug 7 09:26:32 2008
(at)(at) -162,7 +162,7 (at)(at)
</tr>
<tr>
<td class="actions" colspan="8">
- <input type="submit" value="Set to processed"/>
+ <!--<input type="submit" value="Set to processed"/> -->
<input type="button" value="View order details"
onClick="openOrderPopup()"/>
|
SVN: r6416 - gocept.vendo/trunk/src/gocept/vendo/browser
Sebastian Wehrmann <sw(at)gocept.com> |
2008-08-07 09:44:43 |
[ FULL ]
|
Author: sweh
Date: Thu Aug 7 09:44:42 2008
New Revision: 6416
Log:
added product description
reformated the code
Modified:
gocept.vendo/trunk/src/gocept/vendo/browser/allproducts.pt
Modified: gocept.vendo/trunk/src/gocept/vendo/browser/allproducts.pt
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/browser/allproducts.pt (original)
+++ gocept.vendo/trunk/src/gocept/vendo/browser/allproducts.pt Thu Aug 7
09:44:42 2008
(at)(at) -23,47 +23,66 (at)(at)
method="get"
tal:attributes="action
string:${context/absolute_url}/${view/__name__}">
<tr>
- <td colspan="3">
- <h2 tal:content="product/Title" />
- </td></tr>
- <tr>
- <td><img tal:condition="product/small_image|nothing"
tal:attributes="src string:${product/absolute_url}/small_image"
/></td>
- <td>
- <table cellspacing="0" border="0" id="variationtable">
- <tal:vars repeat="variation
python:view.get_variations(product)">
- <tr tal:attributes="class python: repeat['variation'].end
and 'noborder' or 'border'">
- <td>
- <span tal:attributes="class python: variation.getSpecial_offer()
and 'special' or ''"
- tal:content="variation/Title" />
+ <td colspan="3">
+ <h2 tal:content="product/Title" />
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <p id="productdescription"
+ tal:content="structure product/Description">
+ A wonderful cream from wonderfol cows.
+ </p>
+ </td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td>
+ <img
+ tal:condition="product/small_image|nothing"
+ tal:attributes="src
string:${product/absolute_url}/small_image" />
+ </td>
+ <td>
+ <table cellspacing="0" border="0" id="variationtable">
+ <tal:vars
+ repeat="variation python:view.get_variations(product)">
+ <tr
+ tal:attributes="class python: repeat['variation'].end and
'noborder' or 'border'">
+ <td>
+ <span
+ tal:attributes="class python:
variation.getSpecial_offer() and 'special' or ''"
+ tal:content="variation/Title" />
</td>
- <td >
- <span tal:attributes="class python: variation.getSpecial_offer()
and 'special' or ''"
- tal:content="variation/getDefault_price/(at)(at)pricedisplay"
/>
- </td>
- <td>
- <select name="amount:record:key"
- tal:attributes="name
string:amount.${variation/UID}:record">
+ <td>
+ <span
+ tal:attributes="class python:
variation.getSpecial_offer() and 'special' or ''"
+
tal:content="variation/getDefault_price/(at)(at)pricedisplay" />
+ </td>
+ <td>
+ <select
+ name="amount:record:key"
+ tal:attributes="name
string:amount.${variation/UID}:record">
<option value="0"
i18n:translate="">Quantity</option>
<tal:op repeat="val python:range(1,11)">
- <option tal:attributes="value val"
tal:content="val" />
+ <option
+ tal:attributes="value val"
+ tal:content="val" />
</tal:op>
- </select>
- </td>
- </tr>
- </tal:vars>
- </table>
- </td>
- <td>
- <input class="imagebutton" type="image"
name="form.button.AddToCart" src="++resource++wk_btn.jpg" border="0"/>
- </td>
- </tr>
+ </select>
+ </td>
+ </tr>
+ </tal:vars>
+ </table>
+ </td>
+ <td>
+ <input class="imagebutton" type="image" border="0"
+ name="form.button.AddToCart" src="++resource++wk_btn.jpg"/>
+ </td>
+ </tr>
</form>
</tal:prods>
</table>
- </tal:main-macro>
+ </tal:main-macro>
</metal:main>
-
</body>
</html>
-
-
|
SVN: r6417 - gocept.vendo/trunk/src/gocept/vendo/browser
Sebastian Wehrmann <sw(at)gocept.com> |
2008-08-07 13:15:21 |
[ FULL ]
|
Author: sweh
Date: Thu Aug 7 13:15:19 2008
New Revision: 6417
Log:
show variation description
Modified:
gocept.vendo/trunk/src/gocept/vendo/browser/allproducts.pt
Modified: gocept.vendo/trunk/src/gocept/vendo/browser/allproducts.pt
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/browser/allproducts.pt (original)
+++ gocept.vendo/trunk/src/gocept/vendo/browser/allproducts.pt Thu Aug 7
13:15:19 2008
(at)(at) -46,10 +46,10 (at)(at)
<table cellspacing="0" border="0" id="variationtable">
<tal:vars
repeat="variation python:view.get_variations(product)">
- <tr
- tal:attributes="class python: repeat['variation'].end and
'noborder' or 'border'">
+ <tr>
<td>
<span
+ id="variation_title"
tal:attributes="class python:
variation.getSpecial_offer() and 'special' or ''"
tal:content="variation/Title" />
</td>
(at)(at) -71,6 +71,14 (at)(at)
</select>
</td>
</tr>
+ <tr
+ tal:attributes="class python: repeat['variation'].end and
'noborder' or 'border'">
+ <td colspan="3">
+ <span
+ tal:attributes="class python:
variation.getSpecial_offer() and 'special' or ''"
+ tal:content="variation/Description" />
+ </td>
+ </tr>
</tal:vars>
</table>
</td>
|
SVN: r6418 - gocept.vendo/trunk/src/gocept/vendo/browser
Sebastian Wehrmann <sw(at)gocept.com> |
2008-08-07 13:23:31 |
[ FULL ]
|
Author: sweh
Date: Thu Aug 7 13:23:30 2008
New Revision: 6418
Log:
better styling in allproducts
Modified:
gocept.vendo/trunk/src/gocept/vendo/browser/allproducts.pt
Modified: gocept.vendo/trunk/src/gocept/vendo/browser/allproducts.pt
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/browser/allproducts.pt (original)
+++ gocept.vendo/trunk/src/gocept/vendo/browser/allproducts.pt Thu Aug 7
13:23:30 2008
(at)(at) -47,18 +47,18 (at)(at)
<tal:vars
repeat="variation python:view.get_variations(product)">
<tr>
- <td>
+ <td id="variation_title">
<span
id="variation_title"
tal:attributes="class python:
variation.getSpecial_offer() and 'special' or ''"
tal:content="variation/Title" />
</td>
- <td>
+ <td id="variation_price">
<span
tal:attributes="class python:
variation.getSpecial_offer() and 'special' or ''"
tal:content="variation/getDefault_price/(at)(at)pricedisplay" />
</td>
- <td>
+ <td id="variation_amount">
<select
name="amount:record:key"
tal:attributes="name
string:amount.${variation/UID}:record">
|
SVN: r6422 - in gocept.vendo/trunk/src/gocept/vendo: browser i18n i18n/de/LC_MESSAGES
Sebastian Wehrmann <sw(at)gocept.com> |
2008-08-11 11:47:48 |
[ FULL ]
|
Author: sweh
Date: Mon Aug 11 11:47:46 2008
New Revision: 6422
Log:
added translation for adding items
fixed transations in add menus
Modified:
gocept.vendo/trunk/src/gocept/vendo/browser/product.py
gocept.vendo/trunk/src/gocept/vendo/i18n/de/LC_MESSAGES/gocept.vendo.po
gocept.vendo/trunk/src/gocept/vendo/i18n/gocept.vendo.pot
Modified: gocept.vendo/trunk/src/gocept/vendo/browser/product.py
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/browser/product.py (original)
+++ gocept.vendo/trunk/src/gocept/vendo/browser/product.py Mon Aug 11 11:47:46
2008
(at)(at) -8,6 +8,9 (at)(at)
from gocept.vendo.interfaces.cart import ICartProvider, ICartUtility
from zope.component import getUtility
+from gocept.vendo import VendoMessageFactory as _
+
+
class ProductView(BrowserView):
""" View for ProductVariation. """
(at)(at) -24,6 +27,6 (at)(at)
else:
unit = self.context.getUnit_plural()
self.cart.add_item(self.context.UID(), amount)
- message = "%i %s added to cart." % (amount, unicode(unit,
'utf-8'))
- getToolByName(self, "plone_utils").addPortalMessage(message)
+ message = u"%i %s added to cart." % (amount, unicode(unit,
'utf-8'))
+ getToolByName(self, "plone_utils").addPortalMessage(_(message))
return self.template()
Modified:
gocept.vendo/trunk/src/gocept/vendo/i18n/de/LC_MESSAGES/gocept.vendo.po
==============================================================================
---
gocept.vendo/trunk/src/gocept/vendo/i18n/de/LC_MESSAGES/gocept.vendo.po (original)
+++ gocept.vendo/trunk/src/gocept/vendo/i18n/de/LC_MESSAGES/gocept.vendo.po Mon
Aug 11 11:47:46 2008
(at)(at) -3,8 +3,8 (at)(at)
msgid ""
msgstr ""
"Project-Id-Version: gocept.vendo\n"
-"POT-Creation-Date: Wed Aug 6 09:17:29 2008\n"
-"PO-Revision-Date: 2008-08-06 09:18+0100\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"
(at)(at) -15,7 +15,7 (at)(at)
"Preferred-Encodings: utf-8 latin1\n"
"Domain: gocept.vendo\n"
-#: src/gocept/vendo/browser/allproducts.pt:46
+#: src/gocept/vendo/browser/allproducts.pt:65
msgid "Quantity"
msgstr "Anzahl"
(at)(at) -40,16 +40,6 (at)(at)
msgid "change-button"
msgstr "Daten ändern"
-#: src/gocept/vendo/browser/cart.pt:23
-#: src/gocept/vendo/browser/cart_macros.pt:13
-msgid "Pos."
-msgstr "Pos."
-
-#: src/gocept/vendo/browser/cart.pt:24
-#: src/gocept/vendo/browser/cart_macros.pt:14
-msgid "Product"
-msgstr "Produkt"
-
#: src/gocept/vendo/browser/cart.pt:66
msgid "Select ShippingMethod"
msgstr "Versandart auswählen"
(at)(at) -204,6 +194,11 (at)(at)
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} €"
(at)(at) -212,66 +207,57 (at)(at)
msgid "Add to cart"
msgstr "In den Warenkorb"
-#: src/gocept/vendo/cart.py:262
-msgid "Prepayment"
-msgstr "Vorauskasse"
-
-#: src/gocept/vendo/cart.py:263
-msgid "Direct debit"
-msgstr "Lastschrift"
-
-#: src/gocept/vendo/content/order.py:105
+#: src/gocept/vendo/content/order.py:111
msgid "Item"
msgstr "Position"
-#: src/gocept/vendo/content/order.py:112
+#: src/gocept/vendo/content/order.py:118
msgid "Item ID"
msgstr "Positionsnummer"
-#: src/gocept/vendo/content/order.py:119
-#: src/gocept/vendo/browser/cart.pt:25
-#: src/gocept/vendo/browser/cart_macros.pt:15
+#: 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:126
+#: src/gocept/vendo/content/order.py:132
#: src/gocept/vendo/content/product.py:105
-#: src/gocept/vendo/browser/cart.pt:26
-#: src/gocept/vendo/browser/cart_macros.pt:16
+#: src/gocept/vendo/vendo_ordertool/viewDetails.pt:41
msgid "Price"
msgstr "Preis"
-#: src/gocept/vendo/content/order.py:133
+#: 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:35
+#: src/gocept/vendo/content/order.py:36
msgid "Payment order number"
msgstr "Bezahlvorgangsnummer"
-#: src/gocept/vendo/content/order.py:42
+#: src/gocept/vendo/content/order.py:43
msgid "Shipping Method"
msgstr "Versandart auswählen"
-#: src/gocept/vendo/content/order.py:49
+#: 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:56
+#: src/gocept/vendo/content/order.py:57
msgid "Subtotal"
msgstr "Untertitel"
-#: src/gocept/vendo/content/order.py:63
+#: src/gocept/vendo/content/order.py:64
msgid "VAT sum"
msgstr "Summe MwSt."
-#: src/gocept/vendo/content/order.py:70
+#: src/gocept/vendo/content/order.py:71
msgid "VAT rate"
msgstr "MwSt."
-#: src/gocept/vendo/content/order.py:77
+#: 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
(at)(at) -319,15 +305,15 (at)(at)
#: src/gocept/vendo/content/product.py:44
msgid "Choose a detailed image describing the product"
-msgstr "Eindeutige ID für dieses Produkt."
+msgstr "Wählen Sie ein detailliertes Bild dieses Produktes aus."
#: src/gocept/vendo/content/product.py:50
msgid "Long description"
-msgstr "Beschreibung"
+msgstr "Ausführliche Beschreibung"
#: src/gocept/vendo/content/product.py:51
msgid "Enter a detailed description for this product"
-msgstr "Eindeutige ID für dieses Produkt."
+msgstr "Geben Sie eine ausführliche Beschreibung des Produktes ein."
#: src/gocept/vendo/content/product.py:57
#: src/gocept/vendo/interfaces/product.py:24
(at)(at) -409,7 +395,7 (at)(at)
#: src/gocept/vendo/content/shop.py:44
#: src/gocept/vendo/interfaces/shop.py:18
msgid "Country of this shop"
-msgstr "Das Land dieses Shops."
+msgstr "Das Land dieses Shops"
#: src/gocept/vendo/content/shop.py:52
#: src/gocept/vendo/interfaces/shop.py:19
(at)(at) -419,7 +405,7 (at)(at)
#: src/gocept/vendo/content/shop.py:53
#: src/gocept/vendo/interfaces/shop.py:20
msgid "Set the VAT rate for this shop"
-msgstr "MwSt.-Satz dieses Shops"
+msgstr "Mehrwertsteuer-Satz dieses Shops"
#: src/gocept/vendo/content/shop.py:61
#: src/gocept/vendo/interfaces/shop.py:21
(at)(at) -560,6 +546,18 (at)(at)
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"
Modified: gocept.vendo/trunk/src/gocept/vendo/i18n/gocept.vendo.pot
==============================================================================
--- gocept.vendo/trunk/src/gocept/vendo/i18n/gocept.vendo.pot (original)
+++ gocept.vendo/trunk/src/gocept/vendo/i18n/gocept.vendo.pot Mon Aug 11
11:47:46 2008
(at)(at) -14,7 +14,7 (at)(at)
msgid ""
msgstr ""
"Project-Id-Version: Development/Unknown\n"
-"POT-Creation-Date: Wed Aug 6 09:17:29 2008\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"
(at)(at) -23,7 +23,7 (at)(at)
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: zope/app/locales/extract.py\n"
-#: src/gocept/vendo/browser/allproducts.pt:46
+#: src/gocept/vendo/browser/allproducts.pt:65
msgid "Quantity"
msgstr ""
(at)(at) -48,16 +48,6 (at)(at)
msgid "change-button"
msgstr ""
-#: src/gocept/vendo/browser/cart.pt:23
-#: src/gocept/vendo/browser/cart_macros.pt:13
-msgid "Pos."
-msgstr ""
-
-#: src/gocept/vendo/browser/cart.pt:24
-#: src/gocept/vendo/browser/cart_macros.pt:14
-msgid "Product"
-msgstr ""
-
#: src/gocept/vendo/browser/cart.pt:66
msgid "Select ShippingMethod"
msgstr ""
(at)(at) -212,6 +202,11 (at)(at)
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 ""
(at)(at) -220,66 +215,57 (at)(at)
msgid "Add to cart"
msgstr ""
-#: src/gocept/vendo/cart.py:262
-msgid "Prepayment"
-msgstr ""
-
-#: src/gocept/vendo/cart.py:263
-msgid "Direct debit"
-msgstr ""
-
-#: src/gocept/vendo/content/order.py:105
+#: src/gocept/vendo/content/order.py:111
msgid "Item"
msgstr ""
-#: src/gocept/vendo/content/order.py:112
+#: src/gocept/vendo/content/order.py:118
msgid "Item ID"
msgstr ""
-#: src/gocept/vendo/content/order.py:119
-#: src/gocept/vendo/browser/cart.pt:25
-#: src/gocept/vendo/browser/cart_macros.pt:15
+#: src/gocept/vendo/content/order.py:125
+#: src/gocept/vendo/vendo_ordertool/viewDetails.pt:40
msgid "Amount"
msgstr ""
-#: src/gocept/vendo/content/order.py:126
+#: src/gocept/vendo/content/order.py:132
#: src/gocept/vendo/content/product.py:105
-#: src/gocept/vendo/browser/cart.pt:26
-#: src/gocept/vendo/browser/cart_macros.pt:16
+#: src/gocept/vendo/vendo_ordertool/viewDetails.pt:41
msgid "Price"
msgstr ""
-#: src/gocept/vendo/content/order.py:133
+#: src/gocept/vendo/content/order.py:139
+#: src/gocept/vendo/vendo_ordertool/viewDetails.pt:42
msgid "Sum"
msgstr ""
-#: src/gocept/vendo/content/order.py:35
+#: src/gocept/vendo/content/order.py:36
msgid "Payment order number"
msgstr ""
-#: src/gocept/vendo/content/order.py:42
+#: src/gocept/vendo/content/order.py:43
msgid "Shipping Method"
msgstr ""
-#: src/gocept/vendo/content/order.py:49
+#: 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:56
+#: src/gocept/vendo/content/order.py:57
msgid "Subtotal"
msgstr ""
-#: src/gocept/vendo/content/order.py:63
+#: src/gocept/vendo/content/order.py:64
msgid "VAT sum"
msgstr ""
-#: src/gocept/vendo/content/order.py:70
+#: src/gocept/vendo/content/order.py:71
msgid "VAT rate"
msgstr ""
-#: src/gocept/vendo/content/order.py:77
+#: 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
(at)(at) -568,3 +554,11 (at)(at)
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 ""
+
|
|
