cco/cybertools
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into bbmaster

Browse source
This commit is contained in:
Helmut Merz 2012-10-15 08:17:57 +02:00
commit be8872ce62
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
commerce/interfaces.py
View file

@ -1,6 +1,6 @@
#-*- coding: UTF-8 -*- #-*- coding: UTF-8 -*-
# #
# Copyright (c) 2011 Helmut Merz helmutm@cy55.de # Copyright (c) 2012 Helmut Merz helmutm@cy55.de
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -19,8 +19,6 @@
""" """
Interfaces for the commerce domain like products, customers, orders, ... Interfaces for the commerce domain like products, customers, orders, ...
$Id$
""" """
from zope import schema from zope import schema
@ -381,6 +379,8 @@ class IOrder(Interface):
shippingCost = Attribute(u'The cost to be applied for shipping.') shippingCost = Attribute(u'The cost to be applied for shipping.')
additionalCost = Attribute(u'An additional value to be added to the ' additionalCost = Attribute(u'An additional value to be added to the '
u'net value of the order.') u'net value of the order.')
additionalCost2 = Attribute(u'A second additional value to be added to '
u'the net value of the order.')
tax = Attribute(u'The tax value to be added to the net value of the order.') tax = Attribute(u'The tax value to be added to the net value of the order.')
total = Attribute(u'The total gross value (Decimal) of the order.') total = Attribute(u'The total gross value (Decimal) of the order.')

3
util/date.py
View file

@ -27,6 +27,9 @@ from datetime import datetime
def getTimeStamp(): def getTimeStamp():
return int(time.time()) return int(time.time())
def date2TimeStamp(d):
return int(time.mktime(d.timetuple()))
def timeStamp2Date(ts, useGM=False): def timeStamp2Date(ts, useGM=False):
if ts is None: if ts is None:

4
util/html.py
View file

@ -28,8 +28,8 @@ from cybertools.text.lib.BeautifulSoup import Declaration, NavigableString
validTags = ('a b br div em font h1 h2 h3 i li ol p pre span strong ' validTags = ('a b br div em font h1 h2 h3 i li ol p pre span strong '
'table td tr u ul').split() 'table td tr u ul').split()
validAttrs = ('align border cellpadding cellspacing class colspan href rowspan ' validAttrs = ('align border cellpadding cellspacing class colspan '
'style title').split() 'href rowspan style title width').split()
validStyles = 'font-style font-weight'.split() validStyles = 'font-style font-weight'.split()
validStyleParts = 'border padding'.split() validStyleParts = 'border padding'.split()