From a3894ad85fedbe7af779f8330baec997d18b35b0 Mon Sep 17 00:00:00 2001
From: Roni Ahmadi <ronironiahmadi@gmail.com>
Date: Mon, 17 Jun 2024 13:11:21 +0700
Subject: [PATCH] update

---
 frontend/templates/member/register_code_input.html |  2 +-
 frontend/views/profile/register_member.py          | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/frontend/templates/member/register_code_input.html b/frontend/templates/member/register_code_input.html
index 16faa35..509eebc 100644
--- a/frontend/templates/member/register_code_input.html
+++ b/frontend/templates/member/register_code_input.html
@@ -13,7 +13,7 @@
                 <input type="text" name="applied" value="" required class="w-full my-4 rounded-lg"/>
                 <button type="submit" class="bg-green-600 text-center p-3 rounded w-full text-white">Submit Code</button>
             </form>
-            <a class="bg-red-600 text-center p-2 rounded text-white w-full" href="{% url 'register_member' %}">Batal</a>
+            <a class="bg-red-600 text-center p-2 rounded text-white w-full" href="{% url 'profile' %}">Batal</a>
 
         </div>
     </div>
diff --git a/frontend/views/profile/register_member.py b/frontend/views/profile/register_member.py
index 2851796..ad1746a 100644
--- a/frontend/views/profile/register_member.py
+++ b/frontend/views/profile/register_member.py
@@ -26,11 +26,14 @@ def get(self, request):
         if applied.exists():
             applied = applied.first()
             accept = True
-        code = UserCodeGenerator.objects.filter(user_id=request.user.id, is_active=True)
-        if code.exists():
-            codes = code.first()
-            if codes.is_active:
-                return redirect(reverse('profile'))
+        applied_true = UserAppliedMember.objects.filter(user_id=request.user.id, is_accept=True)
+        if applied_true.exists():
+            applied_true = applied_true.first()
+            code = UserCodeGenerator.objects.filter(user_apply_id=applied_true.id)
+            if code.exists():
+                codes = code.first()
+                if codes.is_active:
+                    return redirect(reverse('register_member_code'))
         return render(
             request,
             "member/register.html",