From c6fc0a22d2bd3ac21474f9f3aafbdaa27d311bc8 Mon Sep 17 00:00:00 2001
From: Summayya <frappe@Summayyas-MacBook-Air.local>
Date: Fri, 20 Aug 2021 15:26:47 +0530
Subject: [PATCH] fix: add user to exhibitor doctype

---
 .../doctype/exhibitor/exhibitor.json          | 22 +++++++++++++++++--
 .../exhibitor_registration.json               | 17 ++++++++++++--
 .../exhibitor_section/exhibitor_section.html  |  5 ++---
 .../exhibitor_section/exhibitor_section.json  |  9 +-------
 .../speaker_section/speaker_section.html      |  2 +-
 5 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/community/event_management/doctype/exhibitor/exhibitor.json b/community/event_management/doctype/exhibitor/exhibitor.json
index 9f210ecd..23506d88 100644
--- a/community/event_management/doctype/exhibitor/exhibitor.json
+++ b/community/event_management/doctype/exhibitor/exhibitor.json
@@ -6,6 +6,8 @@
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
+  "user",
+  "event",
   "full_name",
   "company",
   "logo",
@@ -14,9 +16,11 @@
  ],
  "fields": [
   {
+   "fetch_from": "user.full_name",
    "fieldname": "full_name",
    "fieldtype": "Data",
-   "label": "Full Name"
+   "label": "Full Name",
+   "read_only": 1
   },
   {
    "fieldname": "company",
@@ -38,11 +42,25 @@
    "fieldname": "is_paid",
    "fieldtype": "Check",
    "label": "is_paid"
+  },
+  {
+   "fieldname": "user",
+   "fieldtype": "Link",
+   "label": "User",
+   "options": "User",
+   "read_only": 1
+  },
+  {
+   "fieldname": "event",
+   "fieldtype": "Link",
+   "label": "Event",
+   "options": "Event Details",
+   "read_only": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-08-20 13:38:07.709658",
+ "modified": "2021-08-20 15:22:38.616972",
  "modified_by": "Administrator",
  "module": "Event Management",
  "name": "Exhibitor",
diff --git a/community/event_management/web_form/exhibitor_registration/exhibitor_registration.json b/community/event_management/web_form/exhibitor_registration/exhibitor_registration.json
index f3be6172..4fb1ba84 100644
--- a/community/event_management/web_form/exhibitor_registration/exhibitor_registration.json
+++ b/community/event_management/web_form/exhibitor_registration/exhibitor_registration.json
@@ -19,14 +19,14 @@
  "is_standard": 1,
  "login_required": 1,
  "max_attachment_size": 0,
- "modified": "2021-08-19 22:05:16.609246",
+ "modified": "2021-08-20 15:25:57.712882",
  "modified_by": "Administrator",
  "module": "Event Management",
  "name": "exhibitor-registration",
  "owner": "Administrator",
  "payment_button_label": "Buy Now",
  "published": 1,
- "route": "event/conference2021/exhibitor-registration",
+ "route": "exhibitor-registration",
  "route_to_success_link": 0,
  "show_attachments": 0,
  "show_in_grid": 0,
@@ -35,6 +35,19 @@
  "success_url": "/exhibitor-registration",
  "title": "Exhibitor Registration",
  "web_form_fields": [
+  {
+   "allow_read_on_all_link_options": 0,
+   "fieldname": "user",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "label": "User",
+   "max_length": 0,
+   "max_value": 0,
+   "options": "User",
+   "read_only": 0,
+   "reqd": 0,
+   "show_in_filter": 0
+  },
   {
    "allow_read_on_all_link_options": 0,
    "fieldname": "full_name",
diff --git a/community/event_management/web_template/exhibitor_section/exhibitor_section.html b/community/event_management/web_template/exhibitor_section/exhibitor_section.html
index 60e6fadd..821a5913 100644
--- a/community/event_management/web_template/exhibitor_section/exhibitor_section.html
+++ b/community/event_management/web_template/exhibitor_section/exhibitor_section.html
@@ -17,9 +17,8 @@
 		</a>
 		{% endfor %}
 	</div>
-	{%- if cta_link -%}
-	<div class="event-btn"><a href={{cta_link}} class="btn btn-primary ">Become an Exhibitor</a></div>
-	{%- endif -%}
+	<div class="event-btn"><a href="/exhibitor-registration/user={{ frappe.session.user }}&event={{ event_ }}" class="btn btn-primary ">Become an Exhibitor</a></div>
+
 </div>
 
 </div>
\ No newline at end of file
diff --git a/community/event_management/web_template/exhibitor_section/exhibitor_section.json b/community/event_management/web_template/exhibitor_section/exhibitor_section.json
index 0b8c5629..961ddabe 100644
--- a/community/event_management/web_template/exhibitor_section/exhibitor_section.json
+++ b/community/event_management/web_template/exhibitor_section/exhibitor_section.json
@@ -17,19 +17,12 @@
    "reqd": 0
   },
   {
-   "__unsaved": 1,
    "fieldname": "event",
    "fieldtype": "Link",
    "label": "Event",
    "options": "Event Details",
    "reqd": 0
   },
-  {
-   "fieldname": "cta_link",
-   "fieldtype": "Data",
-   "label": "CTA Link",
-   "reqd": 0
-  },
   {
    "fieldname": "exhibitor_details",
    "fieldtype": "Table Break",
@@ -45,7 +38,7 @@
   }
  ],
  "idx": 1,
- "modified": "2021-08-18 10:05:11.753576",
+ "modified": "2021-08-20 15:23:13.419285",
  "modified_by": "Administrator",
  "module": "Event Management",
  "name": "Exhibitor Section",
diff --git a/community/event_management/web_template/speaker_section/speaker_section.html b/community/event_management/web_template/speaker_section/speaker_section.html
index fc5167e6..b3905711 100644
--- a/community/event_management/web_template/speaker_section/speaker_section.html
+++ b/community/event_management/web_template/speaker_section/speaker_section.html
@@ -20,6 +20,6 @@
 			
 		</div>
 		{%- if cta_link -%}
-		<div class="event-btn"><a href='/speaker-registration?event={{ event_ }}&user={{ frappe.session.user }}' class="btn btn-primary ">Propose a Talk</a></div>
+		<div class="event-btn"><a href='/speaker-registration?user={{ frappe.session.user }}&event={{ event_ }}' class="btn btn-primary ">Propose a Talk</a></div>
 		{%- endif -%}
 	</div>
\ No newline at end of file