Permalink
Browse files

v0.11, payments,promote in config.ini, update messages, update README…

….txt on features
  • Loading branch information...
nopri committed Oct 18, 2012
1 parent 912dacd commit 1cb71eb1ccf3571f54b37da722045bb96d67cdf4
Showing with 25 additions and 9 deletions.
  1. +2 −0 README.txt
  2. +18 −7 app.py
  3. +3 −0 config.ini.dist
  4. +2 −2 messages.py
View
@@ -25,6 +25,8 @@ Features:
- Captcha (Random Font)
- Custom Logo
- Custom URL Redirect
+- Flash Animation as Product Picture
+- Payment: Cash, Cash On Delivery, Bank/Wire Transfer
- More
View
25 app.py
@@ -67,10 +67,9 @@ def cget(section, option, default='', strip=True):
############################### CONSTANT ###############################
-VERSION = '0.10'
-NAME = 'Online Store'
+VERSION = '0.11'
+NAME = 'onlinestore-multi'
PRECISION = 2
-FORCE_PROMOTE = False
PS = os.path.sep
CURDIR = os.path.dirname(__file__)
TEMPLATE_DIR = CURDIR + PS + 'template'
@@ -82,7 +81,6 @@ def cget(section, option, default='', strip=True):
TEMPLATE_DEFAULT = 'default'
LANG_DEFAULT = 'en_US'
MAIL_DEFAULT = '%s <%s>' %(DOMAIN, cget('mail', 'default'))
-PAYMENT_TYPE = [1,2,3]
FORCE_SINGLE_CURRENCY = True
CWIDTH = {'product': 42, 'qty': 8, 'price': 17, 'vat': 16, 'subtotal': 18}
CSPACE = ' '
@@ -213,6 +211,8 @@ def cget(section, option, default='', strip=True):
#new res hack, eliminate app_global_conf.py
#as of 16-October-2012
res = {
+ 'promote' : True,
+ 'payments' : [1,2,3],
'value' : 200,
'cart' : True,
'user_content' : True,
@@ -233,14 +233,25 @@ def cget(section, option, default='', strip=True):
try:
_rtv = int(_rt)
except:
- pass
- if type(_rtv) in [type(True), type(0)]: res[_rk] = _rtv
+ if type(_rt) == type(''):
+ if _rt.find(',') > 0:
+ try:
+ _rtv = [x for x in _rt.split(',')]
+ _rtv.remove('')
+ _rtv = [int(x) for x in _rtv]
+ except:
+ _rtv = res['payments']
+ #
+ if type(_rtv) in [type(True), type(0), type([])]: res[_rk] = _rtv
#
#
rendertime = [0, 0]
-
+
+#quick hack as of 18-October-2012
+FORCE_PROMOTE = res['promote']
+PAYMENT_TYPE = res['payments']
############################### FUNCTION ###############################
View
@@ -1,8 +1,11 @@
#Account
#domain: domain name without http/https
+#payments: comma separated/ended (1: cash, 2: cod, 3: bank/wire transfer)
[account]
domain =
+promote = True
cart = True
+payments = 1,2,3,
user_content = True
blog = True
max_product_category = 100
View
@@ -28,7 +28,7 @@
MSG = {
'default': {
- 'promo_host_default' : 'Powered by Amerta Online Store Portal',
+ 'promo_host_default' : 'Powered by <a href="https://github.com/nopri/onlinestore-multi">onlinestore-multi</a>',
'host_default' : 'my store',
'cmd_version_desktop' : 'full version',
'cmd_version_mobile' : 'mobile version',
@@ -457,7 +457,7 @@
},
'id_ID' : {
- 'promo_host_default' : 'Menggunakan Amerta Online Store Portal',
+ 'promo_host_default' : 'Menggunakan <a href="https://github.com/nopri/onlinestore-multi">onlinestore-multi</a>',
'host_default' : 'toko online',
'cmd_version_desktop' : 'versi full',
'cmd_version_mobile' : 'versi mobile',

0 comments on commit 1cb71eb

Please sign in to comment.