Merge pull request 'dev в main' (#1) from dev into main

Reviewed-on: sysadminix/tripwithbonus#1
This commit is contained in:
2024-07-10 17:34:03 +03:00
5 changed files with 6 additions and 8 deletions

View File

@@ -25,7 +25,7 @@ class SubscribeOrder(BaseModel):
) )
sum = models.PositiveSmallIntegerField(verbose_name=_('Сумма'), default=0) sum = models.PositiveSmallIntegerField(verbose_name=_('Сумма'), default=0)
currency = models.CharField(verbose_name=_('Валюта'), max_length=3, default='USD') currency = models.CharField(verbose_name=_('Валюта'), max_length=3, default='KZT')
segment = models.CharField(verbose_name=_('ID Сегмента'), null=True, default=None) segment = models.CharField(verbose_name=_('ID Сегмента'), null=True, default=None)
merchant_order_id = models.CharField(verbose_name=_('merchant_order_id'), null=True, default=None) merchant_order_id = models.CharField(verbose_name=_('merchant_order_id'), null=True, default=None)
bank_order_id = models.CharField(verbose_name=_('ID заказа в банке'), null=True, default=None) bank_order_id = models.CharField(verbose_name=_('ID заказа в банке'), null=True, default=None)

View File

@@ -61,7 +61,7 @@ def subscribe_now_ajax(request):
kwargs_for_order = { kwargs_for_order = {
'user': request.user, 'user': request.user,
'subscribe': subscribe, 'subscribe': subscribe,
'currency': 'USD', 'currency': 'KZT',
'sum': subscribe.price, 'sum': subscribe.price,
} }

View File

@@ -1,6 +1,4 @@
User-agent: * User-agent: *
Allow: / Disallow: /
Disallow: */articles/*
Disallow: */admin/*
Host: tripwb.com Host: dev.tripwb.com

View File

@@ -75,7 +75,7 @@
{% translate "Стоимость:" %} {% translate "Стоимость:" %}
<span class="orange-text"> <span class="orange-text">
{% if item.price %} {% if item.price %}
{{ item.price|floatformat }}$ {{ item.price|floatformat }}
{% else %} {% else %}
{% translate "Бесплатно" %} {% translate "Бесплатно" %}
{% endif %} {% endif %}

View File

@@ -28,7 +28,7 @@
</div> </div>
<div class="price_subscribe"> <div class="price_subscribe">
{% if subscribe.price %} {% if subscribe.price %}
{{ subscribe.price|floatformat }}$ {{ subscribe.price|floatformat }}
{% else %} {% else %}
{% translate "Бесплатно" %} {% translate "Бесплатно" %}
{% endif %} {% endif %}