Merge branch 'develop'

Author: epandurski

CHANGES

@@ -1,3 +1,7 @@
+June 14th, 2017
+v1.16.3 -- Fixed XHTML-MP (WAP 2.0) validation problem.
+        -- Fixed minor problem in the installation guide.
+
 June 13th, 2017
 v1.16.2 -- Minor UI fixes.
         -- Minor fixes in docker images.

INSTALL

@@ -34,11 +34,11 @@ source code in your */usr/local/share/* directory::
 
   # cd /usr/local/share/
   # wget http://sourceforge.net/projects/cmb/files/tarballs/\
-  cmbarter-1.16.2.tar.gz/download -O cmbarter-1.14.tar.gz
+  cmbarter-1.16.3.tar.gz/download -O cmbarter-1.16.3.tar.gz
   ...
 
-  # tar -xzf cmbarter-1.16.2.tar.gz
-  # mv cmbarter-1.16.2 cmbarter
+  # tar -xzf cmbarter-1.16.3.tar.gz
+  # mv cmbarter-1.16.3 cmbarter
 
 Also, make sure a *Python 2.7* interpreter is installed on your
 server.
@@ -300,11 +300,11 @@ Here are the installation steps that you should perform:
 
      $ cd ~
      $ wget http://sourceforge.net/projects/cmb/files/tarballs/\
-     cmbarter-1.16.2.tar.gz/download -O cmbarter-1.14.tar.gz
+     cmbarter-1.16.3.tar.gz/download -O cmbarter-1.16.3.tar.gz
      ...
 
-     $ tar -xzf cmbarter-1.16.2.tar.gz
-     $ mv cmbarter-1.16.2 cmbarter
+     $ tar -xzf cmbarter-1.16.3.tar.gz
+     $ mv cmbarter-1.16.3 cmbarter
 
 3. Restrict access to those source files that may contain sensitive
    information::

cmbarter/locale/bg/LC_MESSAGES/django.mo

@@ -6,9 +6,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: cmbarter-1.16.2\n"
+"Project-Id-Version: cmbarter-1.16.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-09 23:38+0300\n"
+"POT-Creation-Date: 2017-06-14 01:44+0300\n"
 "PO-Revision-Date: 2013-09-28 01:32+0300\n"
 "Last-Translator: Evgeni Pandurski <[email protected]>\n"
 "Language-Team: Bulgarian <[email protected]>\n"
@@ -67,11 +67,11 @@ msgstr " "
 msgid "Amount to withdraw"
 msgstr "Количество за изтегляне"
 
-#: deposits/views.py:167 mobile/views.py:774
+#: deposits/views.py:167 mobile/views.py:780
 msgid "Choose a product..."
 msgstr "Изберете продукт..."
 
-#: deposits/views.py:226 mobile/views.py:835
+#: deposits/views.py:226 mobile/views.py:841
 #, python-format
 msgid "may not exceed %(amount)s"
 msgstr "не повече от %(amount)s"
@@ -620,7 +620,7 @@ msgstr "ГРЕШКА: Това име вече се използва."
 #: templates/xhtml-mp/edit_contact_information.html:17
 #: templates/xhtml-mp/find_customer.html:16
 #: templates/xhtml-mp/find_partner.html:17
-#: templates/xhtml-mp/make_deposit.html:22
+#: templates/xhtml-mp/make_deposit.html:24
 #: templates/xhtml-mp/make_withdrawal.html:20
 #: templates/xhtml-mp/unconfirmed_transactions.html:32
 msgid "Submit"
@@ -2525,7 +2525,7 @@ msgid "Notices"
 msgstr "Известия"
 
 #: templates/xhtml-mp/create_order.html:20
-#: templates/xhtml-mp/make_deposit.html:19
+#: templates/xhtml-mp/make_deposit.html:21
 #: templates/xhtml-mp/make_withdrawal.html:18
 #: templates/xhtml-mp/my_order.html:13
 msgid "Amount:"
@@ -2562,7 +2562,7 @@ msgstr "Парола:"
 msgid "switch to encrypted connection"
 msgstr "премини към кодирана връзка"
 
-#: templates/xhtml-mp/make_deposit.html:20
+#: templates/xhtml-mp/make_deposit.html:22
 msgid "Deduct from my items:"
 msgstr "Извади от стоката за продан:"
 

cmbarter/locale/bg/LC_MESSAGES/django.po

@@ -98,6 +98,12 @@ class CreateOrderForm(cmbarter.orders.forms.CreateOrderForm):
         label=_('Comment'),
         required=False)
 
+class EditProfileForm(cmbarter.profiles.forms.EditProfileForm):
+    advertise_trusted_partners = forms.BooleanField(
+        widget=forms.HiddenInput(),
+        required=False)
+    time_zone = None
+
 
 def render(request, tmpl, c={}):
     http_accept = request.META.get('HTTP_ACCEPT', '')
@@ -763,10 +769,10 @@ def make_deposit(request, secret, user, customer_id_str, tmpl='xhtml-mp/make_dep
     for p in products:
         name = '%s [%s]'% (p['title'], p['unit'])
         if name in choices_name_index:
-            choices[choices_name_index[name]] = (p['promise_id'], name)
+            choices[choices_name_index[name]] = (str(p['promise_id']), name)
         else:
             choices_name_index[name] = len(choices)
-            choices.append( (p['promise_id'], name) )
+            choices.append( (str(p['promise_id']), name) )
 
     if len(choices) == 1:
         form.fields['promise_id'].widget.choices = choices
@@ -937,7 +943,7 @@ def edit_profile(request, secret, user, tmpl='xhtml-mp/edit_contact_information.
                  method=None):
     method = method or request.GET.get('method') or request.method    
     if method == 'POST':
-        form = cmbarter.profiles.forms.EditProfileForm(request.POST)
+        form = EditProfileForm(request.POST)
         if form.is_valid():
             request._cmbarter_trx_cost += 5.0
             db.update_profile(user['trader_id'],
@@ -950,20 +956,16 @@ def edit_profile(request, secret, user, tmpl='xhtml-mp/edit_contact_information.
                 form.cleaned_data['phone'],
                 form.cleaned_data['fax'],
                 form.cleaned_data['www'],
-                form.cleaned_data['time_zone'],
+                user['time_zone'],
                 form.cleaned_data['advertise_trusted_partners'])
 
             return HttpResponseRedirect(reverse(
                 show_profile,
                 args=[secret, user['trader_id']]))
     else:
-        form = cmbarter.profiles.forms.EditProfileForm(
+        form = EditProfileForm(
             initial=db.get_profile(user['trader_id']))
 
-    # Fetches all known time zones in the form's time-zone-select-box.
-    form.fields['time_zone'].widget.choices = [
-        (user['time_zone'], user['time_zone'])]
-
     # Render everything.
     c = {'settings': settings, 'secret': secret, 'user': user, 'form': form }
     return render(request, tmpl, c)    

cmbarter/mobile/views.py

@@ -15,9 +15,11 @@ <h3>{% trans "Make a deposit" %}</h3>
 <form method="post" action="/mobile/{{secret}}/traders/{{trader.trader_id}}/deposits/new/?backref=/mobile/{{secret}}/traders/{{trader.trader_id}}/deposits/">
 {% if form.insufficient_amount %}<ul class="errorlist"><li>{% trans "ERROR: The amount you requested is not available." %}</li></ul>{% endif %}
 {% for error in form.non_field_errors %}<ul class="errorlist"><li>{{error}}</li></ul>{% endfor %}
-{{form.promise_id.errors}}<p><label for="id_promise_id" style="-wap-accesskey:0">{{form.promise_id.label}}:</label> {{form.promise_id}}</p>
+{{form.promise_id.errors}}<p><label for="id_promise_id" style="-wap-accesskey:0">{{form.promise_id.label}}:</label> <select id="id_promise_id" name="promise_id">{% for opt in form.promise_id.field.widget.choices %}
+<option value="{{opt.0}}"{% if opt.0 == form.promise_id.value %} selected="selected"{% endif %}>{{opt.1}}</option>{% endfor %}
+</select></p>
 {{form.amount.errors}}<p><label for="id_amount">{% trans "Amount:" %}</label> {{form.amount}}</p>
-{% if user.trader_id != trader.trader_id %}{{form.subtract.errors}}<p><label for="id_subtract">{% trans "Deduct from my items:" %}</label> {{form.subtract}}</p>{% endif %}
+{% if user.trader_id != trader.trader_id %}{{form.subtract.errors}}<p><label for="id_subtract">{% trans "Deduct from my items:" %}</label> <input{% if form.subtract.value %} checked="checked"{% endif %} id="id_subtract" name="subtract" type="checkbox" /></p>{% endif %}
 {{form.reason.errors}}<p><label for="id_reason">{{form.reason.label}}:</label> {{form.reason}}</p>
 <p class="submit"><input type="submit" value="{% trans "Submit" %}" /></p>
 </form>

cmbarter/templates/xhtml-mp/make_deposit.html

@@ -2,7 +2,7 @@ version: '3.1'
 
 services:
   web:
-    image: epandurski/cmbarter:1.16.2-web
+    image: epandurski/cmbarter:1.16.3-web
     build:
       context: .
       dockerfile: docker/Dockerfile-web
@@ -17,7 +17,7 @@ services:
     env_file: .env
 
   db:
-    image: epandurski/cmbarter:1.16.2-db
+    image: epandurski/cmbarter:1.16.3-db
     build:
       context: .
       dockerfile: docker/Dockerfile-db
@@ -27,7 +27,7 @@ services:
       mode: global
 
   tasks:
-    image: epandurski/cmbarter:1.16.2-tasks
+    image: epandurski/cmbarter:1.16.3-tasks
     build:
       context: .
       dockerfile: docker/Dockerfile-tasks
@@ -42,7 +42,7 @@ services:
     # /run/secrets/cert.pem and /run/secrets/key.pem.  If they are not
     # found there, it falls back to a self-signed certificate.
 
-    image: epandurski/cmbarter:1.16.2-proxy
+    image: epandurski/cmbarter:1.16.3-proxy
     build:
       context: .
       dockerfile: docker/Dockerfile-proxy