From 9668475c3a7dc60322a85ed9c7d3331925d31b8c Mon Sep 17 00:00:00 2001
From: ursal <b.yatsenko@gmail.com>
Date: Thu, 10 Apr 2014 18:30:55 +0300
Subject: [PATCH 01/12] Fix encoding error in payment description

webmoney accept Windows-1251 encoding, UTF-8 descriptions were unreadable
---
 paymentgateways/webmoney/templates/wm_sample/redirect.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/paymentgateways/webmoney/templates/wm_sample/redirect.html b/paymentgateways/webmoney/templates/wm_sample/redirect.html
index 1d3efaa..7c0f728 100644
--- a/paymentgateways/webmoney/templates/wm_sample/redirect.html
+++ b/paymentgateways/webmoney/templates/wm_sample/redirect.html
@@ -4,6 +4,7 @@
      <script type="text/javascript">
      function load()
      {
+          document.charset='windows-1251';
           window.document.pay.submit();
           return;
      }

From 46c62cf202043e0feed8e59bcf89ed726844157c Mon Sep 17 00:00:00 2001
From: ursal <b.yatsenko@gmail.com>
Date: Fri, 11 Apr 2014 14:57:26 +0300
Subject: [PATCH 02/12] fix displacement of Arhive button

---
 media/css/new_design.css | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/media/css/new_design.css b/media/css/new_design.css
index 081da76..3808d2a 100644
--- a/media/css/new_design.css
+++ b/media/css/new_design.css
@@ -1,5 +1,4 @@
 
-
 .clear {
 	clear:both;
 }
@@ -581,9 +580,9 @@ a.helpdesk-img:hover, a.helpdesk-img-active {
 
 .statistics_link a.open, .open {
 	background:url('../img/open.gif') no-repeat;
-	width:12px;
-	height:13px;
-	margin-right:16px;
+	width:13px;
+	height:12px;
+	margin-right:14px;
 	float:right;
 	padding:0;
 }

From 36cc21e17c43b618c520b5ef7048950eeb5d7819 Mon Sep 17 00:00:00 2001
From: ursal <b.yatsenko@gmail.com>
Date: Fri, 11 Apr 2014 15:00:41 +0300
Subject: [PATCH 03/12] add last_promises to statistic

---
 billservice/views.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/billservice/views.py b/billservice/views.py
index fc18c23..3fa6973 100644
--- a/billservice/views.py
+++ b/billservice/views.py
@@ -1003,6 +1003,7 @@ def traffic_limit(request):
 @login_required
 def statistics(request):
     user = request.user.account
+    last_promises = Transaction.objects.filter(account=user, type=TransactionType.objects.get(internal_name='PROMISE_PAYMENT')).order_by('-created')[0:8]
     transaction = Transaction.objects.filter(account=user).order_by('-created')[:8]
     active_session = ActiveSession.objects.filter(account=user).order_by('-date_start')[:8]
     periodical_service_history = PeriodicalServiceHistory.objects.filter(account=user).order_by('-created')[:8]
@@ -1028,6 +1029,7 @@ def statistics(request):
     return {
             #'net_flow_stream':net_flow_streams,
             'transactions':transaction,
+            'last_promises':last_promises,
             'active_session':active_session,
             #'services':services,
             'periodical_service_history':periodical_service_history,
@@ -1385,4 +1387,4 @@ def get_context_data(self, **kwargs):
         context = super(SelectPaymentView, self).get_context_data(**kwargs)
         context['payment_form'] = SelectPaymentMethodForm()
         return context
-        
\ No newline at end of file
+        

From 902fd20552a4623a0c7dd71f9104df4a14d4b757 Mon Sep 17 00:00:00 2001
From: ursal <b.yatsenko@gmail.com>
Date: Fri, 11 Apr 2014 15:11:02 +0300
Subject: [PATCH 04/12] add last promise payments history

---
 templates/accounts/statistics.html | 39 +++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/templates/accounts/statistics.html b/templates/accounts/statistics.html
index e733ba9..e74610a 100644
--- a/templates/accounts/statistics.html
+++ b/templates/accounts/statistics.html
@@ -162,7 +162,44 @@
 			</td>
 		</tr>
 		{% endif %}
-        
+        	
+        	{% if last_promises %}
+                <tr>
+                        <th class="white bold s-11 blue_caption">
+                                <div class="f-right statistics_link white">
+                                        <a id="promises_data_a" class="close" href="javascript:return 0;" onclick="runEffect('promises_data')">&nbsp;</a>
+                                </div>
+                                <div class="f-left statistics_title">{% blocktrans %}ИСТОРИЯ ОБЕЩАННЫХ ПЛАТЕЖЕЙ{% endblocktrans %}</div>
+                        </th>
+                </tr>
+                <tr>
+                        <td id="promises_data">
+                                <table class="wide extra_table" cellpadding="0" cellspacing="0">
+                                        <tr>
+                                                <th>{% blocktrans %}Дата{% endblocktrans %}</th>
+                                                <th>{% blocktrans %}Сумма{% endblocktrans %}</th>
+                                                <th>{% blocktrans %}Взят до{% endblocktrans %}</th>
+                                                <th>{% blocktrans %}Срок вышел{% endblocktrans %}</th>
+                                                <th>{% blocktrans %}Комментарий{% endblocktrans %}</th>
+                                        </tr>
+                                        {% for promise in last_promises %}
+                                        <tr>
+                                                <td class="{{ forloop.counter|coll_bg  }} {% if forloop.last %}no_border{% endif %}">{{ promise.created|date:"d.m.Y H:i" }}&nbsp;</td>
+                                                <td class="left_border {{ forloop.counter|coll_bg  }} {% if forloop.last %}no_border{% endif %}">{{ promise.human_sum|floatformat:2 }}&nbsp;{{ CURRENCY }}</td>
+                                                <td class="left_border {{ forloop.counter|coll_bg  }} {% if forloop.last %}no_border{% endif %}">{{ promise.end_promise|date:"d.m.Y H:i" }}&nbsp;</td>
+                                                <td class="left_border {{ forloop.counter|coll_bg  }} {% if forloop.last %}no_border{% endif %}">{% if promise.promise_expired %}Да{% else %} Нет{% endif %}&nbsp;</td>
+                                                <td class="left_border {{ forloop.counter|coll_bg  }} {% if forloop.last %}no_border{% endif %}">{{ promise.description }}&nbsp;</td>
+                                        </tr>
+                                        {% endfor %}
+                                        <tr>
+                                                <td colspan="7" class="no_border">&nbsp;</td>
+                                        </tr>
+                                </table>
+
+                        </td>
+                </tr>
+                {% endif %}
+
 		{% if active_session %}
 		<tr>
 			<th class="white bold s-11 blue_caption">

From 68ba78ac14b4e71bc3062ddd653f2a3a3ce7e25a Mon Sep 17 00:00:00 2001
From: ursal <b.yatsenko@gmail.com>
Date: Fri, 11 Apr 2014 15:26:28 +0300
Subject: [PATCH 05/12] *fix: use default promise LEFT_PROMISE_DAYS value

Use default LEFT_PROMISE_DAYS from settings.py for new accounts
---
 billservice/models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/billservice/models.py b/billservice/models.py
index 96de4c4..9c010bc 100644
--- a/billservice/models.py
+++ b/billservice/models.py
@@ -909,7 +909,7 @@ class Account(DynamicModel):
     deleted = models.DateTimeField(blank=True, null=True, db_index=True)
     promise_summ = models.IntegerField(_(u'Максимальный обещанный платёж'), blank=True, default=0)
     promise_min_ballance = models.IntegerField(_(u'Минимальный баланс для обещанного платежа'), blank=True, default=0)
-    promise_days = models.IntegerField(_(u'Длительность обещанного платежа, дней'), blank=True, default=1)
+    promise_days = models.IntegerField(_(u'Длительность обещанного платежа, дней'), blank=True, default=0)
     #allow_block_after_summ = models.BooleanField(_(u'Разрешить блокировку списаний'), blank=True, default=False, help_text= _(u"Разрешить приостановку списаний по периодическим и подключаемым услугам при достижении указанного баланса"))
     #block_after_summ = models.IntegerField(_(u'Блокировка списаний после суммы'), blank=True, default=0)
     account_group = models.ForeignKey(AccountGroup, verbose_name=_(u'Группа'), blank=True, null=True,
@@ -2644,4 +2644,4 @@ class Meta:
         
     def get_remove_url(self):
         return "%s?id=%s" % (reverse('registrationrequest_delete'), self.id)
-    
\ No newline at end of file
+    

From 42925e146739d56cabacbea1c0456be92948cd8f Mon Sep 17 00:00:00 2001
From: ursal <b.yatsenko@gmail.com>
Date: Fri, 11 Apr 2014 15:53:36 +0300
Subject: [PATCH 06/12] +add promise history

---
 templates/accounts/statistics.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/accounts/statistics.html b/templates/accounts/statistics.html
index e74610a..53a44ab 100644
--- a/templates/accounts/statistics.html
+++ b/templates/accounts/statistics.html
@@ -179,7 +179,7 @@
                                                 <th>{% blocktrans %}Дата{% endblocktrans %}</th>
                                                 <th>{% blocktrans %}Сумма{% endblocktrans %}</th>
                                                 <th>{% blocktrans %}Взят до{% endblocktrans %}</th>
-                                                <th>{% blocktrans %}Срок вышел{% endblocktrans %}</th>
+                                                <th>{% blocktrans %}Списан со счёта{% endblocktrans %}</th>
                                                 <th>{% blocktrans %}Комментарий{% endblocktrans %}</th>
                                         </tr>
                                         {% for promise in last_promises %}

From 8bd9c019877661c4fd6af4c0295e5c6873e00881 Mon Sep 17 00:00:00 2001
From: ursal <b.yatsenko@gmail.com>
Date: Fri, 11 Apr 2014 16:35:52 +0300
Subject: [PATCH 07/12] dissallow tranfer of promised money

---
 billservice/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/billservice/views.py b/billservice/views.py
index 3fa6973..bd1493e 100644
--- a/billservice/views.py
+++ b/billservice/views.py
@@ -322,7 +322,7 @@ def get_promise(request):
     user = request.user.account
     promise_summ = user.promise_summ if user.promise_summ not in [None, 0, ''] else settings.MAX_PROMISE_SUM
     promise_min_ballance = user.promise_min_ballance if user.promise_min_ballance not in [None, 0, ''] else settings.MIN_BALLANCE_FOR_PROMISE
-    allow_transfer_summ= "%.2f" % (0 if user.ballance<=0 else user.ballance)
+    allow_transfer_summ= "%.2f" % (0 if user.ballance<=0 or Transaction.objects.filter(account=user, type=TransactionType.objects.get(internal_name='PROMISE_PAYMENT'), promise_expired=False).count() >= 1 else user.ballance)
     LEFT_PROMISE_DATE = datetime.datetime.now()+datetime.timedelta(days = user.promise_days or settings.LEFT_PROMISE_DAYS)
     if settings.ALLOW_PROMISE==True and Transaction.objects.filter(account=user, type=TransactionType.objects.get(internal_name='PROMISE_PAYMENT'), promise_expired=False).count() >= 1:
         last_promises = Transaction.objects.filter(account=user,  type=TransactionType.objects.get(internal_name='PROMISE_PAYMENT')).order_by('-created')[0:10]

From de43f80d4771f2a971f21cdc70396f0bd8a6b440 Mon Sep 17 00:00:00 2001
From: ursal <b.yatsenko@gmail.com>
Date: Fri, 11 Apr 2014 16:44:26 +0300
Subject: [PATCH 08/12] Show only active promised payments

History of promissed payments moved to statistics
---
 templates/accounts/get_promise.html | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/templates/accounts/get_promise.html b/templates/accounts/get_promise.html
index 4578c14..3b3fc38 100644
--- a/templates/accounts/get_promise.html
+++ b/templates/accounts/get_promise.html
@@ -68,10 +68,10 @@
 <input type="hidden" name='operation' value="promise">
 </form>
 {% endif %}
-{% if last_promises %}
+{% if disable_promise and last_promises %}
 <table class="wide statistic_table" cellpadding="0" cellspacing="0">
 	<tr>
-		<th class="white bold s-11 blue_caption a-left">{% blocktrans %}ИСТОРИЯ ОБЕЩАННЫХ ПЛАТЕЖЕЙ{% endblocktrans %}</th>
+		<th class="white bold s-11 blue_caption a-left">{% blocktrans %}НЕЗАКРЫТЫЕ ОБЕЩАННЫЕ ПЛАТЕЖИ{% endblocktrans %}</th>
 	</tr>
 	<tr>
 		<td>
@@ -79,13 +79,13 @@
 				<tr>
 					<th>{% blocktrans %}Дата{% endblocktrans %}</th>
 					<th>{% blocktrans %}Сумма{% endblocktrans %}</th>
-                    <th>{% blocktrans %}Взята до{% endblocktrans %}</th>
+                    <th>{% blocktrans %}Взят до{% endblocktrans %}</th>
                     <th>{% blocktrans %}Комментарий{% endblocktrans %}</th>
 					<th>{% blocktrans %}Платёж закрыт{% endblocktrans %}</th>
 
 				</tr>
 				{% for promise in last_promises %}
-                
+                                {% if not promise.promise_expired %}                
 					<tr>
 						<td class="{{ forloop.counter|coll_bg  }} {% if forloop.last %}no_border{% endif %}">{{ promise.created|date:"d.m.Y H:i" }}&nbsp;</td>
 						<td class="left_border {{ forloop.counter|coll_bg  }} {% if forloop.last %}no_border{% endif %}">{{ promise.human_sum|floatformat:2 }}&nbsp;{{ CURRENCY }}</td>
@@ -94,6 +94,7 @@
 						<td class="left_border {{ forloop.counter|coll_bg  }} {% if forloop.last %}no_border{% endif %} bold">{% if promise.promise_expired %}Да{% else %} Нет{% endif %}&nbsp;</td>
 						
 					</tr>
+				{% endif %}
 				{% endfor %}
 			</table>
 			
@@ -105,5 +106,5 @@
 
 
 {% block title %}
-    {% blocktrans %}ИСТОРИЯ ПОДКЛЮЧАЕМЫХ УСЛУГ{% endblocktrans %}
-{% endblock %}
\ No newline at end of file
+    {% blocktrans %}ОПЕРАЦИИ С БАЛАНСОМ{% endblocktrans %}
+{% endblock %}

From 1b523998c5dcac08156452b0c94a32dac36c57a8 Mon Sep 17 00:00:00 2001
From: ursal <b.yatsenko@gmail.com>
Date: Fri, 11 Apr 2014 16:58:50 +0300
Subject: [PATCH 09/12] update summ to userfriendly format

---
 templates/accounts/transaction.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/accounts/transaction.html b/templates/accounts/transaction.html
index a6ab5e8..20cbe28 100644
--- a/templates/accounts/transaction.html
+++ b/templates/accounts/transaction.html
@@ -24,7 +24,7 @@
     			{% for transaction in transactions %}
        				<tr>
            				<td width="100px" class="{{ forloop.counter|coll_bg  }} {% if forloop.last and not is_range %}no_border{% endif %}">{{ transaction.created|date:"d.m.Y  H:i"}}&nbsp;</td>
-           				<td class="left_border {{ forloop.counter|coll_bg  }} {% if forloop.last and not is_range %}no_border{% endif %}" align="right">{{ transaction.summ}}&nbsp;{{ CURRENCY }}</td>
+           				<td class="left_border {{ forloop.counter|coll_bg  }} {% if forloop.last and not is_range %}no_border{% endif %}" align="right">{{ transaction.summ|floatformat:2 }}&nbsp;{{ CURRENCY }}</td>
 						<td class="left_border {{ forloop.counter|coll_bg  }} {% if forloop.last and not is_range %}no_border{% endif %}" align="center">{% if transaction.promise %}да{% else %}нет{% endif %}&nbsp;</td>
 						<td class="left_border {{ forloop.counter|coll_bg  }} {% if forloop.last and not is_range %}no_border{% endif %}">{{ transaction.end_promise|date:"d.m.Y"  }}&nbsp;</td>
            				<td class="left_border {{ forloop.counter|coll_bg  }} {% if forloop.last and not is_range %}no_border{% endif %}">{% ifequal transaction.description None %}&nbsp;{% else %} {{ transaction.description }} &nbsp;{% endifequal %}&nbsp;</td>

From 518f9323d52de16669cfc0d19b067af7479c04a6 Mon Sep 17 00:00:00 2001
From: ursal <b.yatsenko@gmail.com>
Date: Fri, 11 Apr 2014 17:03:34 +0300
Subject: [PATCH 10/12] update summ to userfriendly format

---
 templates/accounts/periodical_service_history.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/accounts/periodical_service_history.html b/templates/accounts/periodical_service_history.html
index 30a2722..1597208 100644
--- a/templates/accounts/periodical_service_history.html
+++ b/templates/accounts/periodical_service_history.html
@@ -22,7 +22,7 @@
 					<tr>
 						<td class="{{ forloop.counter|coll_bg  }} {% if forloop.last and not is_range %}no_border{% endif %}">{{ service.service.name }}&nbsp;</td>
 						<td class="left_border {{ forloop.counter|coll_bg  }} {% if forloop.last and not is_range %}no_border{% endif %}">{{ service.created|date:"d.m.Y H:i" }}&nbsp;</td>
-						<td class="left_border {{ forloop.counter|coll_bg  }} {% if forloop.last and not is_range %}no_border{% endif %}">{{ service.summ }}&nbsp;{{ CURRENCY }}</td>
+						<td class="left_border {{ forloop.counter|coll_bg  }} {% if forloop.last and not is_range %}no_border{% endif %}">{{ service.summ|floatformat:2 }}&nbsp;{{ CURRENCY }}</td>
 						<td class="left_border {{ forloop.counter|coll_bg  }} {% if forloop.last and not is_range %}no_border{% endif %}">{{ service.type.name }}&nbsp;</td>
 					</tr>
 				{% endfor %}
@@ -46,4 +46,4 @@ <h2 align="center">{% blocktrans %}Данных нет{% endblocktrans %}</h2>
 
 {% block title %}
     {% blocktrans %}Биллинговая информация{% endblocktrans %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}

From a33a71b746b8a3acb019be087b3664ef22cba2cb Mon Sep 17 00:00:00 2001
From: ursal <b.yatsenko@gmail.com>
Date: Fri, 11 Apr 2014 21:32:26 +0300
Subject: [PATCH 11/12] fix displacement of Arhive button

---
 media/css/new_design.css | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/media/css/new_design.css b/media/css/new_design.css
index 3808d2a..534fb0d 100644
--- a/media/css/new_design.css
+++ b/media/css/new_design.css
@@ -1,4 +1,3 @@
-
 .clear {
 	clear:both;
 }
@@ -582,7 +581,7 @@ a.helpdesk-img:hover, a.helpdesk-img-active {
 	background:url('../img/open.gif') no-repeat;
 	width:13px;
 	height:12px;
-	margin-right:14px;
+	margin-right:10px;
 	float:right;
 	padding:0;
 }
@@ -600,7 +599,7 @@ a.helpdesk-img:hover, a.helpdesk-img-active {
 	background:url('../img/more.gif') no-repeat;
 	width:13px;
 	height:12px;
-	margin-right:14px;
+	margin-right:10px;
 	float:right;
 	padding:0;
 	

From c16f5ca3fc7faf8b3ec4e5446fe1e1ee8cf6d2fb Mon Sep 17 00:00:00 2001
From: ursal <b.yatsenko@gmail.com>
Date: Fri, 11 Apr 2014 23:27:57 +0300
Subject: [PATCH 12/12] fix summ on transaction statistic page

---
 billservice/views.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/billservice/views.py b/billservice/views.py
index bd1493e..1a4e96e 100644
--- a/billservice/views.py
+++ b/billservice/views.py
@@ -504,10 +504,10 @@ def transaction(request):
     summ_on_page = 0
     transactions = paginator.get_page_items()
     if is_range:
-        for trnsaction in qs:
-            summ += trnsaction.summ
-        for transactio in transactions:
-            summ_on_page += trnsaction.summ
+        for transaction in qs:
+            summ += transaction.summ
+        for transaction in transactions:
+            summ_on_page += transaction.summ
     summ = summ
     summ_on_page = summ_on_page
     rec_count = len(transactions)+1