Кореектировка формы накладной, платильщик/покупатель

src/customer/models.py

@@ -792,33 +792,35 @@ class Payment(models.Model):
         return f'{self.user}-{self.order_number}-{self.get_status_display()}'
 
     def save(self, *args, **kwargs):
+        # if manual setup
+        if self.status == self.SUCCESS:
+            self.user.profile.active = True
+            self.user.profile.save()
+            if self.date is None:
+                self.date = datetime.now().date()
         payment = super(Payment, self).save(*args, **kwargs)
         return payment
 
-
-def confirmed_purchase(**kwargs):
-    try:
-        payment = Payment.objects.get(
-            pk=kwargs['InvId'],
-            order_amount=kwargs['OutSum']
-        )
-        payment.status = Payment.SUCCESS
-        payment.date = datetime.now().date()
-        payment.save()
-
-    except Payment.DoesNotExist:
-        log.info(f"payment with id={kwargs['InvId']} not found")
+    def confirmed_purchase(self, **kwargs):
+        try:
+            self.status = self.SUCCESS
+            self.date = datetime.now().date()
+            self.save()
+        except Payment.DoesNotExist:
+            log.info(f"payment with id={kwargs['InvId']} not found")
 
 
+# Robokassa
 @receiver(result_received)
 def order_completed(sender, **kwargs):
-    confirmed_purchase(**kwargs)
+    Payment.confirmed_purchase(**kwargs)
 
 
+# Robokassa for local debugging
 @receiver(success_page_visited)
 def success_page_visited_completed(sender, **kwargs):
     if settings.DEBUG:
-        confirmed_purchase(**kwargs)
+        Payment.confirmed_purchase(**kwargs)
 
 
 @receiver(post_save, sender=Payment)

templates/docs/nakladn/form.html

@@ -8,9 +8,9 @@
         {% include 'docs/parts/form_field.html' with field=form.doc_date id="doc_date" classes="left" label="Дата создания" required="True" no_clear_after="True" %}
 
         {% if user.profile.bank_accounts.count > 1 %}
-		    {% include 'docs/parts/form_field.html' with field=form.bank_account id="bank_account" classes="left bank-account__invoice" label="Расчётный счёт" %}
+		        {% include 'docs/parts/form_field.html' with field=form.bank_account id="bank_account" classes="left bank-account__invoice" label="Расчётный счёт" %}
         {% else %}
-            {% include 'docs/parts/form_field.html' with field=form.bank_account id="bank_account" classes="left bank-account__invoice" label="Расчётный счёт" %}
+            <div class="clear"></div>
         {% endif %}
         <div class="transport__wrapper"><label id="transport" for="id_transport">{{ form.transport }} Есть транспортная накладная</label></div>
           <div id='transport_block' class="block{% if not form.transport.value %} hidden{% endif %}">
@@ -28,7 +28,7 @@
         {% include 'docs/parts/form_field_client.html' with field=form.client required="True" is_ajax="True" label="Плательщик" %}
         {% include 'docs/parts/form_field.html' with field=form.invoice id="invoice" classes="field hidden" label="Создать накладную по счёту" %}
 
-        {% include 'docs/parts/form_field_receiver.html' with field=form.receiver id="receiver" type="receiver" %}
+        {% include 'docs/parts/form_field_payer.html' with field=form.receiver id="receiver" type="receiver" %}
         {% include 'docs/parts/form_field_sender.html' with field=form.sender id="sender" type="sender" %}
     </div>
 

templates/docs/parts/form_field_receiver.html

@@ -1,2 +1,2 @@
-{% include 'docs/parts/form_client_choices.html' with client_group="receiver_group" id="receiver_choices" classes="field" label2='Грузополучатель - стороннее лицо (не плательщик)' default=receiver_choice %}
+{% include 'docs/parts/form_client_choices.html' with client_group="receiver_group" id="receiver_choices" classes="field" label2='Грузополучатель - стороннее лицо (не покупатель)' default=receiver_choice %}
 {% include 'docs/parts/form_field_client.html' with field=form.receiver id="receiver" classes="field" label=" " type="receiver" %}