[Iteration 1]Merge spring 24 main to snp-cloud main #356

warrenlet · 2024-03-08T19:13:15Z

Checklist

I have read the Contribution & Best practices Guide.
My branch is up-to-date with the upstream master branch.
The tests pass locally with my changes.
I have added tests that prove my fix is effective or that my feature works(if appropriate).
I have added necessary documentation (if appropriate).

Short description of what this resolves/which issues does this fix?:

#344

Changes proposed in this pull request:

changes attribute 'submission instructions' to 'submission template' for event_types model. Changed corresponding view, controller, model, and testing code.
Makes it such that no user (admins, non-admins) can see these toggles. An admin is still able to change these settings by going to administration->users->edit. The button for admin has also been updated from a checkbox to a toggle switch.
Update the INSTALL_SNAPCON.md to provide instruction to the situation of fork safty issues from MacOS

Build test.

…mFile

Merge

This reverts commit 59f1dc8, reversing changes made to 51f8cbd.

…"" This reverts commit 7b664f0.

…nt types view

…emplate

…s repo

…ofile-admin-toggle

…mplate 187057754 event types submission template

187057653 fix "edit profile" shows admin and confirmed toggles as a non-admin

update INSTALL_SNAPCON.md

Merge in SP23 Main

fp456 · 2024-03-08T19:35:28Z

app/mailers/mailbot.rb

-         template_name: template_name)
+    # if email subject is empty, use custom template
+    if @ticket_purchase.ticket.email_subject.empty? && !@ticket_purchase.ticket.email_body.empty?
+      @ticket_purchase.ticket.email_body = @ticket_purchase.generate_confirmation_mail(@ticket_purchase.ticket.email_body)


The conditional statements is very self explanatory so I think this comment can be deleted

app/views/mailbot/custom_ticket_confirmation_template.html.erb

fp456

Hi! Good overall, just some clean up to do and data to be updated about the members of the team

fp456 · 2024-03-08T19:37:02Z

app/mailers/mailbot.rb

+    if @ticket_purchase.ticket.email_subject.empty? && !@ticket_purchase.ticket.email_body.empty?
+      @ticket_purchase.ticket.email_body = @ticket_purchase.generate_confirmation_mail(@ticket_purchase.ticket.email_body)
+      mail(subject: "#{@conference.title} | Ticket Confirmation and PDF!", template_name: 'custom_ticket_confirmation_template')
+    # if email body is empty, use default template with subject


The conditional statements is very self explanatory so I think this comment can be deleted

fp456 · 2024-03-08T19:37:09Z

app/mailers/mailbot.rb

+    elsif !@ticket_purchase.ticket.email_subject.empty? && @ticket_purchase.ticket.email_body.empty?
+      @ticket_purchase.ticket.email_subject = @ticket_purchase.generate_confirmation_mail(@ticket_purchase.ticket.email_subject)
+      mail(subject: @ticket_purchase.ticket.email_subject, template_name: 'ticket_confirmation_template')
+    # if both exist, use custom


The conditional statements is very self explanatory so I think this comment can be deleted

fp456 · 2024-03-08T19:37:16Z

app/mailers/mailbot.rb

+      @ticket_purchase.ticket.email_body = @ticket_purchase.generate_confirmation_mail(@ticket_purchase.ticket.email_body)
+      @ticket_purchase.ticket.email_subject = @ticket_purchase.generate_confirmation_mail(@ticket_purchase.ticket.email_subject)
+      mail(subject: @ticket_purchase.ticket.email_subject, template_name: 'custom_ticket_confirmation_template')
+    # if both empty, use default


The conditional statements is very self explanatory so I think this comment can be deleted

fp456 · 2024-03-08T19:54:19Z

info.yml

@@ -0,0 +1,32 @@
+project:


Please update with your team information

db/migrate/20230418211400_create_currency_conversions.rb

fp456 · 2024-03-11T18:23:02Z

spec/features/currency_conversions_spec.rb

+    it 'add a currency conversion', feature: true do
+      visit admin_conference_currency_conversions_path(conference.short_title)
+      click_link 'Add Currency Conversion'
+


you can remove this empty line

fp456 · 2024-03-11T18:23:09Z

spec/features/currency_conversions_spec.rb

+      fill_in 'currency_conversion_from_currency', with: 'USD'
+      fill_in 'currency_conversion_to_currency', with: 'EUR'
+      fill_in 'currency_conversion_rate', with: '0.89'
+


you can remove this empty line

fp456

just some empty lines, tiny stuff but again overall looks good :)

cycomachead

Really minor things, but I will merge and might make a tidy-ing PR myself then deploy soon.

cycomachead · 2024-03-11T17:17:25Z

.codeclimate.yml

@@ -1,4 +1,6 @@
+version: "2"


It's likely worth noting that this is now out of sync with the local config (I think...) but that's probably OK.

cycomachead · 2024-03-11T17:18:31Z

app/controllers/admin/currency_conversions_controller.rb

+
+    # Only allow a list of trusted parameters through.


Suggested change

# Only allow a list of trusted parameters through.

cycomachead · 2024-03-11T17:19:59Z

app/mailers/mailbot.rb

+    # if email subject is empty, use custom template
+    if @ticket_purchase.ticket.email_subject.empty? && !@ticket_purchase.ticket.email_body.empty?


Suggested change

# if email subject is empty, use custom template

if @ticket_purchase.ticket.email_subject.empty? && !@ticket_purchase.ticket.email_body.empty?

if @ticket_purchase.ticket.email_subject.empty? && @ticket_purchase.ticket.email_body.present?

Use .present? which is a little more readable than ! empty

cycomachead · 2024-03-11T17:20:23Z

app/mailers/mailbot.rb

+    if @ticket_purchase.ticket.email_subject.empty? && !@ticket_purchase.ticket.email_body.empty?
+      @ticket_purchase.ticket.email_body = @ticket_purchase.generate_confirmation_mail(@ticket_purchase.ticket.email_body)
+      mail(subject: "#{@conference.title} | Ticket Confirmation and PDF!", template_name: 'custom_ticket_confirmation_template')
+    # if email body is empty, use default template with subject


Suggested change

# if email body is empty, use default template with subject

cycomachead · 2024-03-11T17:21:31Z

app/mailers/mailbot.rb

+      @ticket_purchase.ticket.email_body = @ticket_purchase.generate_confirmation_mail(@ticket_purchase.ticket.email_body)
+      mail(subject: "#{@conference.title} | Ticket Confirmation and PDF!", template_name: 'custom_ticket_confirmation_template')
+    # if email body is empty, use default template with subject
+    elsif !@ticket_purchase.ticket.email_subject.empty? && @ticket_purchase.ticket.email_body.empty?


Suggested change

elsif !@ticket_purchase.ticket.email_subject.empty? && @ticket_purchase.ticket.email_body.empty?

elsif @ticket_purchase.ticket.email_subject.present? && @ticket_purchase.ticket.email_body.empty?

spec/features/currency_conversions_spec.rb

cycomachead · 2024-03-11T18:39:37Z

app/views/mailbot/custom_ticket_confirmation_template.text.erb

@@ -0,0 +1 @@
+<%= @ticket_purchase.ticket.email_body %>


Ideally there should be a newline.

cycomachead · 2024-03-12T00:05:20Z

app/mailers/mailbot.rb

@@ -32,11 +32,28 @@ def ticket_confirmation_mail(ticket_purchase)
      attachments["ticket_for_#{@conference.short_title}_#{physical_ticket.id}.pdf"] = pdf.render
    end

-    template_name = 'ticket_confirmation_template'
-    template_name = 'young_thinkers_ticket_confirmation_template' if @ticket_purchase.ticket_id == YTLF_TICKET_ID
+    if @ticket_purchase.ticket_id == YTLF_TICKET_ID


For the future, I think we can delete this code path once custom tickets are merged in

Justin Pau and others added 30 commits February 16, 2023 15:06

initial

ca8817c

init

6bba07d

fullcalendar

c704cb0

jquery

44559b7

Updated ReadMe

51b350e

created ruby workflow

ff84b13

added status badges

cdda7a7

updated ruby workflow

5a400d9

bluejay file

df1f2fe

Merge branch 'master' of https://github.com/cs169/snapcon

2955d8d

README EDIT - Capital Forked From

3a1a785

Merge branch 'master' of https://github.com/cs169/snapcon

f9ab7de

Build test.

Updated Gemfile to require 2.6.6 or greater instead of 2.7

639f215

Updated Gemfile.lockfor JQuery build issue

aba7bb8

changed requirment for ruby version to be bellow 3 and regenerated Ge…

0a9243c

…mFile

Merge remote-tracking branch 'upstream/main' into merge

c384a51

gemlock

1bd6de0

Merge pull request #1 from cs169/merge

62ecd55

Merge

Update INSTALL_SNAPCON.md

8a63f75

Update INSTALL_SNAPCON.md

094ea48

Delete main.yml

5573108

env file

5731f8a

spec file

1b3887c

Update info.yml

056cde0

Update README.md

ae238f7

.env

51f8cbd

Merge branch 'main' of https://github.com/cs169/snapcon

59f1dc8

Revert "Merge branch 'main' of https://github.com/cs169/snapcon"

7b664f0

This reverts commit 59f1dc8, reversing changes made to 51f8cbd.

Revert "Revert "Merge branch 'main' of https://github.com/cs169/snapcon…

96ab2d8

…"" This reverts commit 7b664f0.

goes back to 5731f8a

b7e6ac5

warrenlet and others added 19 commits February 17, 2024 18:38

Clean up legacy code from SP23 Main

cf5fcb1

fix admin toggle showing and is confirm toggleable

9eb4898

changed 'Submission instructions' to 'Submission Template' in new eve…

16d8faa

…nt types view

update INSTALL_SNAPCON.md

1503b90

Update .codeclimate.yml

af0df46

Update .codeclimate.yml

2a934a9

Update .codeclimate.yml

debc26a

Merge branch 'main' into sp23-main

d8f9625

renamed event_types attribute submission_instructions to submission_t…

6543594

…emplate

Give up on using partials and just follow the same structure as OSEM'…

c47dd47

…s repo

Merge branch 'main' of github.com:cs169/snapcon into 187057653-fix-pr…

496fa43

…ofile-admin-toggle

Update style from checkbox to yes-no toggle

27240a2

get rid of dead code

fe586cd

Merge branch 'sp23-main' into 187057754-event-types-submission-template

e3accb7

Merge pull request #23 from cs169/187057754-event-types-submission-te…

bbe5451

…mplate 187057754 event types submission template

Merge pull request #22 from cs169/187057653-fix-profile-admin-toggle

da9b573

187057653 fix "edit profile" shows admin and confirmed toggles as a non-admin

Merge pull request #24 from cs169/187057751-update-INSTALL_SNAPCON

a15365e

update INSTALL_SNAPCON.md

Merge pull request #20 from cs169/sp23-main

fcb1f10

Merge in SP23 Main

Merge branch 'main' into main

73e97e8

fp456 reviewed Mar 8, 2024

View reviewed changes

cycomachead reviewed Mar 8, 2024

View reviewed changes

app/views/mailbot/custom_ticket_confirmation_template.html.erb Outdated Show resolved Hide resolved

tidy empty newline

ec3a085

fp456 suggested changes Mar 8, 2024

View reviewed changes

fp456 reviewed Mar 11, 2024

View reviewed changes

db/migrate/20230418211400_create_currency_conversions.rb Show resolved Hide resolved

fp456 reviewed Mar 11, 2024

View reviewed changes

fp456 suggested changes Mar 11, 2024

View reviewed changes

cycomachead approved these changes Mar 12, 2024

View reviewed changes

remove newline

fb46a02

cycomachead merged commit 12f95c2 into snap-cloud:main Mar 12, 2024
8 of 10 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Iteration 1]Merge spring 24 main to snp-cloud main #356

[Iteration 1]Merge spring 24 main to snp-cloud main #356

warrenlet commented Mar 8, 2024 •

edited

Loading

fp456 Mar 8, 2024 •

edited

Loading

fp456 left a comment

fp456 Mar 8, 2024

fp456 Mar 8, 2024

fp456 Mar 8, 2024

fp456 Mar 8, 2024

fp456 Mar 11, 2024

fp456 Mar 11, 2024

fp456 left a comment

cycomachead left a comment

cycomachead Mar 11, 2024

cycomachead Mar 11, 2024

cycomachead Mar 11, 2024

cycomachead Mar 11, 2024

cycomachead Mar 11, 2024

cycomachead Mar 11, 2024

cycomachead Mar 12, 2024

		# if email subject is empty, use custom template
		if @ticket_purchase.ticket.email_subject.empty? && !@ticket_purchase.ticket.email_body.empty?

	elsif !@ticket_purchase.ticket.email_subject.empty? && @ticket_purchase.ticket.email_body.empty?
	elsif @ticket_purchase.ticket.email_subject.present? && @ticket_purchase.ticket.email_body.empty?

[Iteration 1]Merge spring 24 main to snp-cloud main #356

[Iteration 1]Merge spring 24 main to snp-cloud main #356

Conversation

warrenlet commented Mar 8, 2024 • edited Loading

fp456 Mar 8, 2024 • edited Loading

Choose a reason for hiding this comment

fp456 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fp456 left a comment

Choose a reason for hiding this comment

cycomachead left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

warrenlet commented Mar 8, 2024 •

edited

Loading

fp456 Mar 8, 2024 •

edited

Loading