fix fish variz name, dalilrad, sms, bale

apps/payments/views.py

@@ -122,7 +122,7 @@ def receipt_form_page(request, customer, staff=False):
     image_policy = AttachmentPolicy.objects.filter(attachment_type='IMAGE', is_enabled=True).first()
     ctx = {'form': form, 'selected_notice': selected, 'notice_data': notice_data, 'financial_page': True,
            'max_bytes': image_policy.max_file_size if image_policy else 0, 'staff_form': staff, 'customer': customer,
-           'account_requirements': {str(a.pk): a.requires_deposit_id for a in form.fields['destination_account'].queryset}}
+           'account_requirements': form.account_warnings, 'customer_deposit_id': form.customer_deposit_id}
     return render(request, 'payments/receipt_form.html', staff_context(**ctx) if staff else access.customer_context(request, **ctx))
 
 
@@ -221,7 +221,8 @@ def decision(request, public_id):
     get_object_or_404(policies.visible(PaymentReceipt.objects.all(),request.user),public_id=public_id)
     try:
         version = int(request.POST.get('version', '0'))
-        receipt = services.decide_receipt(request.user, public_id, version, request.POST.get('action'), request.POST.get('reason', ''))
+        receipt = services.decide_receipt(request.user, public_id, version, request.POST.get('action'), request.POST.get('reason', ''),
+            rejection_confirmed=request.POST.get('confirm_rejection') == '1')
         messages.success(request, 'تصمیم ثبت شد. ' + receipt.get_status_display())
     except (ValidationError, ValueError) as error:
         messages.error(request, '؛ '.join(error.messages) if isinstance(error, ValidationError) else 'نسخه فیش معتبر نیست.')
@@ -505,8 +506,10 @@ def receipt_revise(request, public_id):
     receipt=get_object_or_404(access.visible_payments(request, PaymentReceipt.objects.all()),public_id=public_id,customer=request.payment_customer,status='REJECTED')
     import jdatetime
     current = receipt.revisions.get(version=receipt.current_version)
+    from .identity import customer_name
     paid = jdatetime.date.fromgregorian(date=current.paid_date)
     initial={'receipt_mode':'linked' if receipt.notice_id else 'independent','notice_id':receipt.notice_id,
+             'depositor_name':current.depositor_name or customer_name(request.payment_customer),
              'paid_amount':str(current.amount),'destination_account':current.destination_id,'deposit_id':current.deposit_id,
              'paid_day':str(paid.day),'paid_month':str(paid.month),'paid_year':str(paid.year),
              'origin_bank':current.origin_bank_id,'origin_other':current.origin_other,
@@ -529,5 +532,5 @@ def receipt_revise(request, public_id):
     notice_data=[selectors.notice_form_data(n) for n in selectors.recent_pending_notice_choices(form, retain_original=receipt.notice_id)]
     return render(request,'payments/receipt_form.html',{'form':form,'notice_data':notice_data,'max_bytes':policy.max_file_size if policy else 0,
         'payment_link_access': link,
-        'account_requirements':{str(a.pk):a.requires_deposit_id for a in form.fields['destination_account'].queryset},
+        'account_requirements':form.account_warnings, 'customer_deposit_id':form.customer_deposit_id,
         'financial_page':True,'revision_version':receipt.current_version})