Implement order email updates for organisers (#2968)

shubham-padia · SaptakS · commit ef4a01ccce80 · 2017-01-18T17:07:33.000+05:30
* Implement order email updates for organisers

* resolve merge conflicts
diff --git a/app/helpers/data.py b/app/helpers/data.py
@@ -180,13 +180,15 @@ def toggle_email_notification_settings(user_id, value):
                     email_notification.new_paper = value
                     email_notification.session_schedule = value
                     email_notification.session_accept_reject = value
+                    email_notification.after_ticket_purchase = value
                     save_to_db(email_notification, "EmailSettings Toggled")
                     notification_ids.append(email_notification.id)
                 else:
                     new_email_notification_setting = EmailNotification(next_event=value,
                                                                        new_paper=value,
                                                                        session_schedule=value,
                                                                        session_accept_reject=value,
+                                                                       after_ticket_purchase=value,
                                                                        user_id=user_id,
                                                                        event_id=event.id)
                     save_to_db(new_email_notification_setting, "EmailSetting Toggled")
diff --git a/app/helpers/data_getter.py b/app/helpers/data_getter.py
@@ -378,7 +378,8 @@ def get_user_event_role(role_id):
 
     @staticmethod
     def get_user_event_roles_by_role_name(event_id, role_name):
-        return UsersEventsRoles.query.filter_by(event_id=event_id).filter(Role.name == role_name)
+        role = Role.query.filter_by(name=role_name).first()
+        return UsersEventsRoles.query.filter_by(event_id=event_id).filter(UsersEventsRoles.role == role)
 
     @staticmethod
     def get_user_events(user_id=None):
diff --git a/app/helpers/helpers.py b/app/helpers/helpers.py
@@ -24,6 +24,7 @@
     TICKET_PURCHASED as NOTIF_TICKET_PURCHASED,
     EVENT_EXPORT_FAIL as NOTIF_EVENT_EXPORT_FAIL,
     EVENT_EXPORTED as NOTIF_EVENT_EXPORTED,
+    TICKET_PURCHASED_ORGANIZER as NOTIF_TICKET_PURCHASED_ORGANIZER
 
 )
 from app.settings import get_settings
@@ -33,7 +34,7 @@
     USER_REGISTER, PASSWORD_RESET, SESSION_ACCEPT_REJECT, SESSION_SCHEDULE, EVENT_ROLE, EVENT_PUBLISH, Mail, \
     AFTER_EVENT, USER_CHANGE_EMAIL, USER_REGISTER_WITH_PASSWORD, TICKET_PURCHASED, EVENT_EXPORTED, \
     EVENT_EXPORT_FAIL, MAIL_TO_EXPIRED_ORDERS, MONTHLY_PAYMENT_FOLLOWUP_EMAIL, MONTHLY_PAYMENT_EMAIL, \
-    EVENT_IMPORTED, EVENT_IMPORT_FAIL
+    EVENT_IMPORTED, EVENT_IMPORT_FAIL, TICKET_PURCHASED_ORGANIZER
 from ..models.message_settings import MessageSettings
 from ..models.track import Track
 
@@ -283,6 +284,16 @@ def send_email_for_after_purchase(email, invoice_id, order_url, event_name, even
         html=MAILS[TICKET_PURCHASED]['message'].format(order_url=order_url, event_name=event_name, event_organiser=event_organiser)
     )
 
+def send_email_for_after_purchase_organizers(email, buyer_email, invoice_id, order_url, event_name, event_organiser):
+    """Send email with order invoice link after purchase"""
+    send_email(
+        to=email,
+        action=TICKET_PURCHASED_ORGANIZER,
+        subject=MAILS[TICKET_PURCHASED_ORGANIZER]['subject'].format(invoice_id=invoice_id, event_name=event_name, buyer_email=buyer_email),
+        html=MAILS[TICKET_PURCHASED_ORGANIZER]['message'].format(order_url=order_url, buyer_email=buyer_email, event_name=event_name,
+                                                                 event_organiser=event_organiser)
+    )
+
 
 def send_email_for_expired_orders(email, event_name, invoice_id, order_url):
     """Send email with order invoice link after purchase"""
@@ -457,6 +468,16 @@ def send_notif_for_after_purchase(user, invoice_id, order_url):
     )
 
 
+def send_notif_for_after_purchase_organizer(user, invoice_id, order_url, event_name, buyer_email):
+    """Send notification with order invoice link after purchase"""
+    send_notification(
+        user=user,
+        action=NOTIF_TICKET_PURCHASED_ORGANIZER,
+        title=NOTIFS[NOTIF_TICKET_PURCHASED_ORGANIZER]['title'].format(invoice_id=invoice_id, event_name=event_name, buyer_email=buyer_email),
+        message=NOTIFS[NOTIF_TICKET_PURCHASED_ORGANIZER]['message'].format(order_url=order_url)
+    )
+
+
 def send_notif_when_changes_email(user, old_email, new_email):
     send_notification(
         user=user,
diff --git a/app/helpers/notification_email_triggers.py b/app/helpers/notification_email_triggers.py
@@ -2,8 +2,9 @@
 
 from app.helpers.data_getter import DataGetter
 from app.helpers.helpers import send_new_session_organizer, send_notif_new_session_organizer, \
-    send_notif_session_accept_reject, send_session_accept_reject, send_schedule_change, send_notif_session_schedule
-from ..models.mail import NEW_SESSION, SESSION_ACCEPT_REJECT, SESSION_SCHEDULE
+    send_notif_session_accept_reject, send_session_accept_reject, send_schedule_change, send_notif_session_schedule, \
+    send_email_for_after_purchase_organizers, send_notif_for_after_purchase_organizer
+from ..models.mail import NEW_SESSION, SESSION_ACCEPT_REJECT, SESSION_SCHEDULE, TICKET_PURCHASED
 
 
 def trigger_new_session_notifications(session_id, event_id=None, event=None):
@@ -62,3 +63,29 @@ def trigger_session_schedule_change_notifications(session, event_id):
         # Send notification
         if speaker.user:
             send_notif_session_schedule(speaker.user, session.title, link)
+
+
+def trigger_after_purchase_notifications(buyer_email, event_id, event, invoice_id, order_url):
+    if not event and not event_id:
+        raise Exception('event or event_id is required')
+    if not event:
+        event = DataGetter.get_event(event_id)
+
+    admin_msg_setting = DataGetter.get_message_setting_by_action(TICKET_PURCHASED)
+    organizers = DataGetter.get_user_event_roles_by_role_name(event.id, 'organizer')
+    for organizer in organizers:
+        email_notification_setting = DataGetter.get_email_notification_settings_by_event_id(organizer.user.id, event_id)
+        if not admin_msg_setting or \
+            (email_notification_setting and email_notification_setting.after_ticket_purchase == 1 and
+             admin_msg_setting.user_control_status == 1) or admin_msg_setting.user_control_status == 0:
+            send_email_for_after_purchase_organizers(organizer.user.email, buyer_email, invoice_id, order_url, event.name, event.organizer_name)
+        send_notif_for_after_purchase_organizer(organizer.user, invoice_id, order_url, event.name, buyer_email)
+
+    coorganizers = DataGetter.get_user_event_roles_by_role_name(event.id, 'coorganizer')
+    for coorganizer in coorganizers:
+        email_notification_setting = DataGetter.get_email_notification_settings_by_event_id(coorganizer.user.id, event_id)
+        if not admin_msg_setting or \
+            (email_notification_setting and email_notification_setting.after_ticket_purchase == 1 and
+                     admin_msg_setting.user_control_status == 1) or admin_msg_setting.user_control_status == 0:
+            send_email_for_after_purchase_organizers(coorganizer.user.email, buyer_email, invoice_id, order_url, event.name, event.organizer_name)
+        send_notif_for_after_purchase_organizer(organizer.user, invoice_id, order_url, event.name, buyer_email)
diff --git a/app/helpers/system_mails.py b/app/helpers/system_mails.py
@@ -6,7 +6,7 @@
     USER_REGISTER, PASSWORD_RESET, EVENT_ROLE, SESSION_ACCEPT_REJECT, \
     SESSION_SCHEDULE, NEXT_EVENT, EVENT_PUBLISH, AFTER_EVENT, USER_CHANGE_EMAIL, USER_REGISTER_WITH_PASSWORD, \
     TICKET_PURCHASED, EVENT_EXPORTED, EVENT_EXPORT_FAIL, MAIL_TO_EXPIRED_ORDERS, MONTHLY_PAYMENT_EMAIL, \
-    MONTHLY_PAYMENT_FOLLOWUP_EMAIL, EVENT_IMPORTED, EVENT_IMPORT_FAIL
+    MONTHLY_PAYMENT_FOLLOWUP_EMAIL, EVENT_IMPORTED, EVENT_IMPORT_FAIL, TICKET_PURCHASED_ORGANIZER
 
 MAILS = {
     EVENT_PUBLISH: {
@@ -127,14 +127,24 @@
         'recipient': 'User',
         'subject': u'Your order invoice and tickets for {event_name} ({invoice_id}) ',
         'message': (
-            u"Hi, this is a confirmation mail for your tickets for the event {event_name}"
+            u"Hi, this is a confirmation mail of your tickets for the event {event_name}"
             u"<br/>The event is organised by {event_organiser}"
             u"<br/>Your order has been processed successfully." +
             u"<br/> <a href='{order_url}'>Click here</a> to view/download your invoice."
             u"<br><br><em>Looking forward to seeing you at the event."
             u"<br/>Login to manage your orders at https://eventyay.com </em>"
         )
     },
+    TICKET_PURCHASED_ORGANIZER: {
+        'recipient': 'Organizer, Coorganizer',
+        'subject': u'New ticket purchase for {event_name} by {buyer_email} ({invoice_id}) ',
+        'message': (
+            u"Hi, {buyer_email} just bought tickets for the event {event_name}"
+            u"<br/>The order has been processed successfully." +
+            u"<br/> <a href='{order_url}'>Click here</a> to view/download the invoice."
+            u"<br/>Login to manage the orders at https://eventyay.com </em>"
+        )
+    },
     EVENT_EXPORTED: {
         'recipient': 'User',
         'subject': u'Event {event_name} has been exported',
diff --git a/app/helpers/system_notifications.py b/app/helpers/system_notifications.py
@@ -14,6 +14,7 @@
     TICKET_PURCHASED,
     EVENT_EXPORT_FAIL,
     EVENT_EXPORTED,
+    TICKET_PURCHASED_ORGANIZER
 )
 
 NOTIFS = {
@@ -41,6 +42,14 @@
             u"<br><br><a href='{order_url}' class='btn btn-info btn-sm'>View Invoice</a>"
         )
     },
+    TICKET_PURCHASED_ORGANIZER: {
+        'recipient': 'Organizer',
+        'title': u'New ticket purchase for {event_name} by {buyer_email} ({invoice_id}) ',
+        'message': (
+            u"The order has been processed successfully."
+            u"<br><br><a href='{order_url}' class='btn btn-info btn-sm'>View Invoice</a>"
+        )
+    },
     USER_CHANGE_EMAIL: {
         'recipient': 'User',
         'title': u'Your email has been changed',
diff --git a/app/helpers/ticketing.py b/app/helpers/ticketing.py
@@ -16,6 +16,7 @@
 from app.helpers.helpers import string_empty, send_email_for_after_purchase, get_count, \
     send_notif_for_after_purchase
 from app.helpers.payment import StripePaymentsManager, represents_int, PayPalPaymentsManager
+from app.helpers.notification_email_triggers import trigger_after_purchase_notifications
 from app.models import db
 from app.models.discount_code import DiscountCode, TICKET
 from app.models.access_code import AccessCode, TICKET
@@ -354,6 +355,7 @@ def initiate_order_payment(form, paid_via=None):
 
             # add attendee role to user
             if order.status == "completed":
+                trigger_after_purchase_notifications(email, order.event_id, order.event, invoice_id, order_url)
                 send_email_for_after_purchase(email, invoice_id, order_url, order.event.name, order.event.organizer_name)
             DataManager.add_attendee_role_to_event(user, order.event_id)
             # save items
@@ -385,7 +387,7 @@ def charge_stripe_order_payment(form):
             order_url = url_for('ticketing.view_order_after_payment',
                                 order_identifier=order.identifier,
                                 _external=True)
-
+            trigger_after_purchase_notifications(order.user.email, order.event_id, order.event, invoice_id, order_url)
             send_email_for_after_purchase(order.user.email, invoice_id, order_url, order.event.name, order.event.organizer_name)
             send_notif_for_after_purchase(order.user, invoice_id, order_url)
 
@@ -409,7 +411,8 @@ def charge_paypal_order_payment(order):
                 order_url = url_for('ticketing.view_order_after_payment',
                                     order_identifier=order.identifier,
                                     _external=True)
-
+                trigger_after_purchase_notifications(order.user.email, order.event_id, order.event, invoice_id,
+                                                     order_url)
                 send_email_for_after_purchase(order.user.email, invoice_id, order_url, order.event.name,
                                               order.event.organizer_name)
                 send_notif_for_after_purchase(order.user, invoice_id, order_url)
diff --git a/app/helpers/wizard/clone.py b/app/helpers/wizard/clone.py
@@ -37,6 +37,7 @@ def create_event_copy(event_id):
                                                            new_paper=1,
                                                            session_schedule=1,
                                                            session_accept_reject=1,
+                                                           after_ticket_purchase=1,
                                                            user_id=login.current_user.id,
                                                            event_id=event.id)
         save_to_db(new_email_notification_setting, "EmailSetting Saved")
diff --git a/app/helpers/wizard/event.py b/app/helpers/wizard/event.py
@@ -287,6 +287,7 @@ def save_event_from_json(json, event_id=None):
                                                                new_paper=1,
                                                                session_schedule=1,
                                                                session_accept_reject=1,
+                                                               after_ticket_purchase=1,
                                                                user_id=login.current_user.id,
                                                                event_id=event.id)
             save_to_db(new_email_notification_setting, "EmailSetting Saved")
diff --git a/app/models/email_notifications.py b/app/models/email_notifications.py
@@ -10,6 +10,7 @@ class EmailNotification(db.Model):
     new_paper = db.Column(db.Integer)
     session_accept_reject = db.Column(db.Integer)
     session_schedule = db.Column(db.Integer)
+    after_ticket_purchase = db.Column(db.Integer)
     user_id = db.Column(db.Integer, db.ForeignKey('user.id', ondelete='CASCADE'))
     event_id = db.Column(db.Integer, db.ForeignKey('events.id', ondelete='CASCADE'))
 
@@ -18,6 +19,7 @@ def __init__(self,
                  new_paper=0,
                  session_accept_reject=0,
                  session_schedule=0,
+                 after_ticket_purchase=1,
                  user_id=None,
                  event_id=None):
         self.next_event = next_event
@@ -26,6 +28,7 @@ def __init__(self,
         self.session_schedule = session_schedule
         self.user_id = user_id
         self.event_id = event_id
+        self.after_ticket_purchase = after_ticket_purchase
 
     def __str__(self):
         return 'User:' + unicode(self.user_id).encode('utf-8') + ' Event: ' + unicode(self.event_id).encode('utf-8')
diff --git a/app/models/mail.py b/app/models/mail.py
@@ -16,6 +16,7 @@
 AFTER_EVENT = 'After Event'
 USER_REGISTER_WITH_PASSWORD = 'User Registration during Payment'
 TICKET_PURCHASED = 'Ticket(s) Purchased'
+TICKET_PURCHASED_ORGANIZER = 'Ticket(s) Purchased to Organizer'
 EVENT_EXPORTED = 'Event Exported'
 EVENT_EXPORT_FAIL = 'Event Export Failed'
 MAIL_TO_EXPIRED_ORDERS = 'Mail Expired Orders'
diff --git a/app/models/notifications.py b/app/models/notifications.py
@@ -12,6 +12,7 @@
 INVITE_PAPERS = 'Invitation For Papers'
 AFTER_EVENT = 'After Event'
 EVENT_PUBLISH = 'Event Published'
+TICKET_PURCHASED_ORGANIZER = 'Ticket(s) Purchased to Organizer'
 
 
 class Notification(db.Model):
diff --git a/app/templates/gentelella/admin/settings/pages/email_preferences.html b/app/templates/gentelella/admin/settings/pages/email_preferences.html
@@ -15,7 +15,9 @@
                                'new_paper': {'action': 'New Session Proposal',
                                              'message': 'New Paper is Submitted to your Event'},
                                'session_schedule': {'action': 'Session Schedule Change',
-                                                    'message': 'Change in Schedule of Sessions in your Event'}} %}
+                                                    'message': 'Change in Schedule of Sessions in your Event'},
+                               'after_ticket_purchase': {'action': 'Ticket(s) Purchased',
+                                                       'message': 'Order alert email (receive a notification email when there is a completed order)'}}%}
 
 {% macro event_item(event) %}
 
diff --git a/app/views/users/settings.py b/app/views/users/settings.py
@@ -21,6 +21,7 @@ def get_or_create_notification_settings(event_id):
                                                new_paper=1,
                                                session_schedule=1,
                                                session_accept_reject=1,
+                                               after_ticket_purchase=1,
                                                user_id=login.current_user.id,
                                                event_id=event_id)
         return email_notification
diff --git a/migrations/versions/ce0b8ccd98ce_.py b/migrations/versions/ce0b8ccd98ce_.py
@@ -0,0 +1,30 @@
+"""empty message
+
+Revision ID: ce0b8ccd98ce
+Revises: a5f2c19b7ac9
+Create Date: 2017-01-18 01:56:58.497552
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = 'ce0b8ccd98ce'
+down_revision = 'a5f2c19b7ac9'
+
+from alembic import op
+import sqlalchemy as sa
+import sqlalchemy_utils
+
+
+def upgrade():
+    ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('email_notification', sa.Column('after_ticket_purchase', sa.Integer(), nullable=True))
+    op.drop_column('email_notification', 'event_schedule')
+    op.execute('UPDATE email_notification SET after_ticket_purchase = 1 WHERE after_ticket_purchase is NULL ', execution_options=None)
+    ### end Alembic commands ###
+
+
+def downgrade():
+    ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('email_notification', sa.Column('event_schedule', sa.INTEGER(), autoincrement=False, nullable=True))
+    op.drop_column('email_notification', 'after_ticket_purchase')
+    ### end Alembic commands ###
diff --git a/tests/unittests/views/admin/test_roles.py b/tests/unittests/views/admin/test_roles.py
@@ -64,7 +64,7 @@ def test_role_update(self):
                 'user_email': user.email,
                 'user_role': 'track_organizer'
             }
-            rv = self.app.post(url_for('event_roles.edit_view', uer_id=uer.id, event_id=event.id, data=data),
+            rv = self.app.post(url_for('event_roles.edit_view', uer_id=uer.id, event_id=event.id), data=data,
                                follow_redirects=True)
             uer = DataGetter.get_user_event_roles_by_role_name(event.id, 'track_organizer').first()
             self.assertTrue(uer is not None, msg=rv.data)
