fix fish variz name, dalilrad, sms, bale

apps/payments/services.py

@@ -143,7 +143,8 @@ def assign_cycle(revision, actor):
 
 def receipt_metadata(data):
     from .deposit_identifier import normalize_deposit_identifier
-    return {'amount': data['paid_amount'], 'paid_date': data['paid_date'], 'destination': data['destination_account'],
+    from .identity import depositor_name
+    return {'depositor_name': depositor_name(data.get('depositor_name')), 'amount': data['paid_amount'], 'paid_date': data['paid_date'], 'destination': data['destination_account'],
         'origin_bank': data.get('origin_bank'), 'origin_other': data.get('origin_other', ''),
         'deposit_id': normalize_deposit_identifier(data.get('deposit_id', '')), 'tracking_number': data.get('tracking_number', ''),
         'description': data.get('description', '')}
@@ -157,6 +158,7 @@ def validate_destination(account, notice):
 
 
 def _submit_receipt(actor, customer, data, file_info, created_files):
+    fields = receipt_metadata(data)
     # Same-customer lock serializes retries of a submission nonce before inserting it.
     User.objects.select_for_update().get(pk=customer.pk)
     existing = PaymentReceipt.objects.filter(submission_key=data['submission_key']).first()
@@ -166,7 +168,8 @@ def _submit_receipt(actor, customer, data, file_info, created_files):
             raise PermissionDenied
         if (revision.amount != data['paid_amount'] or revision.paid_date != data['paid_date'] or
             revision.destination_id != data['destination_account'].pk or revision.sha256 != file_info['sha256'] or
-            existing.notice_id != getattr(data.get('notice_id'), 'pk', None)):
+            existing.notice_id != getattr(data.get('notice_id'), 'pk', None) or
+            revision.depositor_name != fields['depositor_name']):
             raise ValidationError('این ارسال قبلاً ثبت شده است؛ برای اطلاعات متفاوت فرم تازه باز کنید.')
         return existing
     notice = data.get('notice_id')
@@ -178,7 +181,6 @@ def _submit_receipt(actor, customer, data, file_info, created_files):
     validate_destination(account, notice)
     receipt = PaymentReceipt.objects.create(customer=customer, submitted_by=actor, notice=notice,
         owning_unit=notice.owning_unit if notice else (TicketPolicy.primary_unit(actor) if policies.is_staff(actor) else None), submission_key=data['submission_key'])
-    fields = receipt_metadata(data)
     fields['destination'] = account
     fields['deposit_id'] = fields['deposit_id'] or (notice.deposit_id if notice and notice.account_id == account.pk else '')
     revision = PaymentReceiptRevision(receipt=receipt, version=1,
@@ -226,7 +228,7 @@ def submit_receipt(actor, customer, data, *, access_link=None):
 
 
 @transaction.atomic
-def decide_receipt(actor, receipt_id, version, action, reason=''):
+def decide_receipt(actor, receipt_id, version, action, reason='', *, rejection_confirmed=True):
     # Lock only the receipt: PostgreSQL cannot lock the nullable side of a LEFT JOIN.
     receipt = PaymentReceipt.objects.select_for_update(of=('self',)).select_related('owning_unit').get(public_id=receipt_id)
     # Never authorize a financial vote using a stale User/profile/permission cache.
@@ -244,6 +246,8 @@ def decide_receipt(actor, receipt_id, version, action, reason=''):
         allowed = policies.can_decide(actor, receipt, cycle, senior=True)
     if not allowed:
         raise PermissionDenied
+    if action == 'REJECT' and not rejection_confirmed:
+        raise ValidationError('برای رد فیش، ارسال دلیل رد به مشتری را تأیید کنید.')
     reason = reason.strip()
     if action in {'REJECT', 'SENIOR_APPROVE'} and not reason:
         raise ValidationError('دلیل این تصمیم را بنویسید.')
@@ -277,6 +281,9 @@ def decide_receipt(actor, receipt_id, version, action, reason=''):
     if status == 'APPROVED':
         from .notifications import queue_approval
         queue_approval(receipt, cycle)
+    elif status == 'REJECTED':
+        from .notifications import queue_rejection
+        queue_rejection(receipt, cycle, reason)
     return receipt