From 6ba182c87842ea1b9df2ae8d37b426082b5ed6f6 Mon Sep 17 00:00:00 2001
From: Alexander Burdeiny <bonus_05@mail.ru>
Date: Tue, 30 Aug 2016 08:54:13 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BE?=
 =?UTF-8?q?=D1=82=2029.08.2016=20=D1=81=D0=BC=D0=B5=D1=80=D0=B6=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D1=81=20=D0=B4=D0=B8=D0=BC=D0=BE=D0=B9,=20=D0=B4?=
 =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 service/models.py                     |  7 +++++++
 templates/client/service/tickets.html | 10 +++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/service/models.py b/service/models.py
index 288ec9f6..596b1213 100644
--- a/service/models.py
+++ b/service/models.py
@@ -46,6 +46,13 @@ class Service(TranslatableModel):
     def get_price(self):
         pr = self.price
 
+    def get_currency_html(self):
+        cur = self.currency
+        currency_codes = {'EUR':'€', 'USD':'$', 'RUB':'ք'}
+        code = currency_codes.get(cur)
+        if code:
+            return code
+        return cur
 
 
 post_save.connect(post_save_handler, sender=Service)
diff --git a/templates/client/service/tickets.html b/templates/client/service/tickets.html
index 890f8010..661122f2 100644
--- a/templates/client/service/tickets.html
+++ b/templates/client/service/tickets.html
@@ -151,7 +151,7 @@
                             <div class="rqob-wrap">
                                 <div class="rqob-price">
                                     {% if service.price %}
-                                        {% blocktrans with price=service.price currency=service.currency %}Регистрация {{ price }} {{ currency }}{% endblocktrans %}
+                                        {% blocktrans with price=service.price currency=service.get_currency_html %}Регистрация {{ price }} {{ currency }}{% endblocktrans %}
                                     {% else %}
                                         {% trans 'Регистрация 2000 руб.' %}
                                     {% endif %}
@@ -161,7 +161,7 @@
                                             {% if price|isdigit %}
                                                 {{ price }}{{ object.get_currency_html }}
                                             {% else %}
-                                                <span class="small">{{ price }}</span>
+                                                <span class="small">{{ price }} <small>({% trans 'билет организатора' %})</small></span>
                                             {% endif %}
                                         {% else %}
                                             <small>{% trans 'билет организатора' %}</small>
@@ -175,7 +175,7 @@
                                     {% endif %}
 
                                     {% if service.price %}
-                                        <input id="id_currency" name="currency" type="hidden" value="{{ service.currency  }}"/>
+                                        <input id="id_currency" name="currency" type="hidden" value="{{ service.currency }}"/>
                                     {% endif %}
                                     <button type="submit">{% trans 'Сделать запрос' %}</button>
                                 </div>
@@ -196,7 +196,7 @@
                     <div class="rqob-wrap">
                         <div class="rqob-price">
                             {% if service.price %}
-                                {% blocktrans with price=service.price currency=service.currency %}Регистрация {{ price }} {{ currency }}{% endblocktrans %}
+                                {% blocktrans with price=service.price currency=service.get_currency_html %}Регистрация {{ price }} {{ currency }}{% endblocktrans %}
                             {% else %}
                                 {% trans 'Регистрация 2000 руб.' %}
                             {% endif %}
@@ -206,7 +206,7 @@
                                     {% if price|isdigit %}
                                         {{ price }}{{ object.get_currency_html }}
                                     {% else %}
-                                        <span class="small">{{ price }}</span>
+                                        <span class="small">{{ price }} <small>({% trans 'билет организатора' %})</small></span>
                                     {% endif %}
                                 {% else %}
                                     <small>{% trans 'билет организатора' %}</small>