update accounts_ext app

remotes/origin/HEAD
Max Yakovenko 8 years ago
parent c2a6c09ce3
commit f88f902283
  1. 11
      accounts_ext/models.py
  2. 13
      templates/400.html
  3. 0
      templates/403.html
  4. 32
      templates/bootstrap/forms/product_filter.html
  5. 4
      templates/bootstrap/forms/product_search.html
  6. 21
      templates/bootstrap/forms/product_sorting.html
  7. 121
      templates/bootstrap/pdf/buyings.html

@ -12,9 +12,10 @@ from django.utils.timezone import now as datetime_now
from registration.signals import user_activated
from core.models import (
AbstractStatusModel, ActualOnlyManager, STATUS_ACTIVE, CaseInsensitiveQuerySet,
AbstractDateTimeModel,
City)
AbstractStatusModel, ActualOnlyManager, STATUS_ACTIVE,
CaseInsensitiveQuerySet,
City
)
# Create your models here.
@ -102,6 +103,10 @@ class Profile(AbstractStatusModel):
address = models.TextField(_('aдрес'))
city = models.ForeignKey(City, on_delete=models.SET_NULL, verbose_name=_('город'), blank=True, null=True)
@property
def points(self):
return self.user.buying_set.get_buying_total_bonus_points(self.user)
@property
def is_valid(self):
return self.first_name and self.last_name and self.patronymic

@ -0,0 +1,13 @@
{% extends 'base.html' %}
{% block content %}
<div class="col-lg-4 col-lg-offset-4">
<div class="reg">
<div class="row">
<div class="col-12 text-center">
<h3>Простите, но вам доступ запрещен на данную страницу</h3>
</div>
</div>
</div>
</div>
{% endblock content %}

@ -0,0 +1,32 @@
{% load static %}
{% load crispy_forms_field %}
{% load products_filters %}
{% spaceless %}
{% if field %}
{% if not 'price' in field.auto_id %}
<ul>
{% for filter_object in field.initial %}
<li>
<a href="
{{ field.form.get_form_action_url }}?{{ field.html_name }}={{ filter_object.slug }}{{ field.form.query_params|apply_query_params:True }}
{{ field.form.query_params|apply_query_params:"true" }}">
{{ filter_object.name }}
</a>
</li>
{% endfor %}
</ul>
{% elif 'price' in field.auto_id %}
<div class="filter_controls left-menu__price-item">
<span>от</span>
<input type="text" name="{{ field.html_name }}[min]" class="filter__min" value="">
<span>до</span>
<input type="text" name="{{ field.html_name }}[max]" class="filter__max" value="">
</div>
<div id="range" data-min="{{ field.form.min_price }}" data-max="{{ field.form.max_price }}"></div>
{% else %}
{{ field }}
{% endif %}
{% endif %}
{% endspaceless %}

@ -2,9 +2,13 @@
{% load crispy_forms_field %}
{% spaceless %}
{% if input %}
{% if input.name == "search" %}
<button class="{{ input.field_classes }}"><img src="{% static "img/search.svg" %}" alt="Поиск"></button>
{% else %}
{{ input }}
{% endif %}
{% elif field %}
{{ field }}
{% endif %}
{% endspaceless %}

@ -0,0 +1,21 @@
{% load static %}
{% load crispy_forms_field %}
{% load products_filters %}
{% spaceless %}
{% if field %}
{% if "sort" in field.html_name %}
<select>
{% for sort_field in field.initial %}
<option value="{{ sort_field.value }}">
<a href="{{ sort_field.value }}">
{{ sort_field.name }}
</a>
</option>
{% endfor %}
</select>
{% else %}
{{ field }}
{% endif %}
{% endif %}
{% endspaceless %}

@ -0,0 +1,121 @@
{% load static %}
<html>
<head>
<meta charset="UTF-8">
<title>Document</title>
<style>
table, th, td {
border: 1px solid black;
border-collapse: collapse;
}
th, td {
padding: 5px;
text-align: left;
}
td#h01, td#h03 {
border: 0px;
font-weight:bold;
}
td#h02, td#h04 {
border-top: 0px;
font-size: x-small;
}
td#t01, td#t02, td#t03 {
text-align: right;
font-weight:bold;
}
</style>
</head>
<body>
<!--<h3>-->
<!--ВНИМАНИЕ! В ПЛАТЕЖНОМ ПОРУЧЕНИИ УКАЗЫВАТЬ ПОЛНОЕ НАИМЕНОВАНИЕ-->
<!--ОБЩЕСТВО С ОГРАНИЧЕННОЙ ОТВЕТСТВЕННОСТЬЮ "РУССКИЕ ПРОГРАММЫ".-->
<!--</h3>-->
<div><img src="file:///home/denis/Eshop/Eshop/static/img/payment_header.jpg"></div>
<table class="table">
<tr>
<td id="h01">{{ bank }}</td>
<td>БИК</td>
<td>{{ BIK }}</td>
</tr>
<tr>
<td id="h02">Банк получателя</td>
<td>Сч. №</td>
<td>{{ bank_acc }}</td>
</tr>
<tr>
<td rowspan="2" id="h03">{{ name }}</td>
<td>ИНН</td>
<td>{{ INN }}</td>
</tr>
<tr>
<td>КПП</td>
<td>{{ KPP }}</td>
</tr>
<tr>
<td id="h04">Получатель</td>
<td>Сч. №</td>
<td>{{ acc }}</td>
</tr>
</table>
<h3>
<b><u>Счет на оплату № {{ order.id }} от {{ order.created }}</u></b>
</h3>
<table class="table">
<tr>
<th>Поставщик:</th>
<td>{{ sup_info }}</td>
</tr>
<tr>
<th>Покупатель:</th>
<td>{{ order.customer_name }}</td>
</tr>
</table>
<table class="table">
<thead>
<tr>
<th></th>
<th>Товары(работы/услуги)</th>
<th>Кол-во</th>
<th>Ед.</th>
<th>Цена</th>
<th>Сумма</th>
</tr>
</thead>
<tbody>
{% for item in order.items.all %}
<tr class="row{% cycle '1' '2' %}">
<td>{{ forloop.counter }}</td>
<td>{{ item.product.name }}</td>
<td>{{ item.number }}</td>
<td>шт</td>
<td>{{ item.price_per_itom }}</td>
<td>{{ item.total_price }}</td>
</tr>
{% endfor %}
<tr>
<td colspan="5" id="t01">Итого:</td>
<td class="num">{{ order.total_price }}</td>
</tr>
<tr>
<td colspan="5" id="t02">Без налога (НДС)</td>
<td class="num">-</td>
</tr>
<tr>
<td colspan="5" id="t03">Всего к оплате:</td>
<td class="num">{{ order.total_price }}</td>
</tr>
</tbody>
</table>
<p>Всего наименований {{ order.items.count }} на сумму {{ order.total_price }} руб.</p>
<p>{{ verb_price }} {{ verb_cur }} 00 копеек</p>
<img src="file:///home/denis/Eshop/Eshop/static/img/Payment_foot.jpg">
</body>
</html>
Loading…
Cancel
Save