fix payment

apps/payments/views.py

@@ -42,6 +42,8 @@ def home(request):
 
 
 def complete_notice(notice):
+    from .deposit_identifier import normalize_deposit_identifier
+    notice.deposit_id = normalize_deposit_identifier(notice.deposit_id)
     snapshot = notice.account_snapshot
     approved = getattr(notice, 'approved_total', None)
     if approved is None:
@@ -57,6 +59,8 @@ def complete_notice(notice):
         ('شماره حساب', snapshot.get('account_number')), ('شبا', snapshot.get('iban')),
         ('کارت', snapshot.get('card_number')), ('شناسه واریز', notice.deposit_id),
         ('فاکتور', notice.invoice_number), ('توضیحات', notice.description)] if value)
+    if notice.deposit_id:
+        notice.copy_text += '\nوارد کردن شناسه واریز هنگام پرداخت الزامی و اجباری است؛ آن را در فرم بانکی، موبایل‌بانک یا اینترنت‌بانک وارد کنید.'
     return notice
 
 
@@ -84,6 +88,17 @@ def customer_notice_detail(request, public_id):
         notice=complete_notice(notice), open_notice=str(notice.public_id), financial_page=True))
 
 
+@require_POST
+@financial_required(allow_payment_link=True)
+def customer_notice_share_link(request, public_id):
+    notice = get_object_or_404(access.visible_payments(request, PaymentNotice.objects.all()),
+        public_id=public_id, customer__is_active=True)
+    url = access.notice_share_url(request, notice)
+    response = JsonResponse({'url': url})
+    response['Cache-Control'] = 'private, no-store'
+    return response
+
+
 def receipt_form_page(request, customer, staff=False):
     link = getattr(request, 'payment_access_link', None)
     initial = access.receipt_initial(request, customer)
@@ -93,9 +108,13 @@ def receipt_form_page(request, customer, staff=False):
         try:
             receipt = services.submit_receipt(customer if link else request.user, customer, form.cleaned_data, access_link=link)
             messages.success(request, 'فیش ثبت شد و در انتظار بررسی است.')
+            if request.headers.get('Accept') == 'application/json':
+                return JsonResponse({'redirect_url': reverse('staff_payments:receipt_detail' if staff else 'payments:receipt_detail', args=[receipt.public_id])})
             return redirect('staff_payments:receipt_detail' if staff else 'payments:receipt_detail', public_id=receipt.public_id)
         except ValidationError as error:
             form.add_error(None, error)
+    if request.method == 'POST' and request.headers.get('Accept') == 'application/json':
+        return JsonResponse({'errors': form.errors.get_json_data()}, status=422)
     selected = form['notice_id'].value()
     available = list(form.fields['notice_id'].queryset) if staff else selectors.recent_pending_notice_choices(form)
     notice_data = [selectors.notice_form_data(n, staff=staff) for n in available]
@@ -254,6 +273,9 @@ def filtered(queryset, request):
 @financial_required(staff=True)
 def desk(request):
     tab = request.GET.get('tab', 'receipts')
+    if tab not in {'receipts', 'notices'}:
+        tab = 'receipts'
+    mine = tab == 'receipts' and (request.GET.get('mine') == '1' or ('tab' not in request.GET and 'mine' not in request.GET))
     receipts = selectors.receipts_with_current_values(policies.visible(PaymentReceipt.objects.select_related('customer__customer_profile', 'notice__created_by__staff_profile'), request.user))
     notice_items = selectors.notices_with_totals(policies.visible(PaymentNotice.objects.select_related('customer__customer_profile', 'created_by__staff_profile', 'account'), request.user))
     if tab == 'notices':
@@ -274,7 +296,7 @@ def desk(request):
             items = items.filter(notice__isnull=True)
         elif request.GET.get('kind') == 'linked':
             items = items.filter(notice__isnull=False)
-        if request.GET.get('mine'):
+        if mine:
             my_decision = ReceiptDecision.objects.filter(cycle__revision__receipt_id=OuterRef('pk'),
                 cycle__revision__version=OuterRef('current_version'), user=request.user)
             items = items.filter(status__in=['PENDING','PARTIAL'], revisions__version=F('current_version'),
@@ -289,7 +311,12 @@ def desk(request):
         page.object_list = selectors.receipt_review_summaries(page.object_list)
     query = request.GET.copy()
     query.pop('page', None)
-    return render(request, 'payments/desk.html', staff_context(page_obj=page, tab=tab, statuses=PaymentReceipt.Status.choices,
+    query['tab'] = tab
+    if mine:
+        query['mine'] = '1'
+    else:
+        query.pop('mine', None)
+    return render(request, 'payments/desk.html', staff_context(page_obj=page, tab=tab, mine=mine, statuses=PaymentReceipt.Status.choices,
         can_create=policies.can_create(request.user), banks=CompanyBankAccount.objects.all(), query_string=query.urlencode()))
 
 
@@ -337,12 +364,28 @@ def notice_detail(request, public_id):
         request.session.pop('payment_link_share', None)
     else:
         share = {}
+    from uuid import uuid4
+    from .notifications import notice_sms_pending
     return render(request, 'payments/notice_detail.html', staff_context(notice=notice,
         can_delete_notice=policies.can_delete_notice(request.user, notice),
         may_delete_notice=policies.may_delete_notice(request.user, notice),
         can_share_payment_link=policies.can_create(request.user) and notice.customer.is_active,
         payment_share_url=share.get('url', ''),
-        receipts=policies.visible(notice.receipts.all(), request.user), notifications=notice.paymentnotification_set.select_related('job')))
+        can_resend_notice_sms=policies.can_create(request.user, notice.owning_unit) and notice.customer.is_active and not notice.cancelled_at,
+        notice_sms_pending=notice_sms_pending(notice), notice_sms_request_key=str(uuid4()),
+        receipts=policies.visible(notice.receipts.all(), request.user), notifications=selectors.notice_sms_history(notice)))
+
+
+@financial_required(staff=True)
+@require_POST
+def notice_resend_sms(request, public_id):
+    notice = get_object_or_404(policies.notice_actions(PaymentNotice.objects.all(), request.user), public_id=public_id)
+    try:
+        services.resend_notice_sms(request.user, notice, request.POST.get('request_key', ''))
+        messages.success(request, 'درخواست ارسال مجدد پیامک در صف ثبت شد؛ نتیجه ارسال و دریافت در سوابق نمایش داده می‌شود.')
+    except ValidationError as error:
+        messages.error(request, '؛ '.join(error.messages))
+    return redirect('staff_payments:notice_detail', public_id=public_id)
 
 
 @financial_required(staff=True)
@@ -474,9 +517,13 @@ def receipt_revise(request, public_id):
         try:
             services.revise_receipt(request.payment_customer,receipt.public_id,int(request.POST.get('version','0')),form.cleaned_data)
             messages.success(request,'نسخه اصلاحی ثبت شد و دوباره بررسی می‌شود.')
+            if request.headers.get('Accept') == 'application/json':
+                return JsonResponse({'redirect_url': reverse('payments:receipt_detail', args=[receipt.public_id])})
             return redirect('payments:receipt_detail',public_id=receipt.public_id)
         except (ValidationError,ValueError) as error:
             form.add_error(None,error if isinstance(error,ValidationError) else 'نسخه فیش معتبر نیست.')
+    if request.method == 'POST' and request.headers.get('Accept') == 'application/json':
+        return JsonResponse({'errors': form.errors.get_json_data()}, status=422)
     from apps.attachments.models import AttachmentPolicy
     policy=AttachmentPolicy.objects.filter(attachment_type='IMAGE',is_enabled=True).first()
     notice_data=[selectors.notice_form_data(n) for n in selectors.recent_pending_notice_choices(form, retain_original=receipt.notice_id)]