Merge developement and resolve conflicts

Author: YogeshSharma0201

Pipfile

@@ -8,7 +8,7 @@ pycparser = "==2.14"
 flask-script = "<2.1,>=2.0.5"
 requests-oauthlib = ">=0.7.0,<1"
 icalendar = "<4,>=3.11"
-requests = {version = ">=2.12.4,<3", extras = ["security"]}
+requests = {version = ">=2.20.0,<3", extras = ["security"]}
 "psycopg2-binary" = "*"
 itsdangerous = "<0.30,>=0.24"
 humanize = ">=0.5.1,<0.6"

Pipfile.lock

@@ -268,7 +268,7 @@ The tentative release policy, for now (since there is a lot of activity and a lo
 **Commits**
 * Write clear meaningful git commit messages (Do read http://chris.beams.io/posts/git-commit/)
 * Make sure your PR's description contains GitHub's special keyword references that automatically close the related issue when the PR is merged. (More info at https://github.com/blog/1506-closing-issues-via-pull-requests )
-* When you make very very minor changes to a PR of yours (like for example fixing a failing travis build or some small style corrections or minor changes requested by reviewers) make sure you squash your commits afterward so that you don't have an absurd number of commits for a very small fix. (Learn how to squash at https://davidwalsh.name/squash-commits-git )
+* When you make very minor changes to a PR of yours (like for example fixing a failing travis build or some small style corrections or minor changes requested by reviewers) make sure you squash your commits afterward so that you don't have an absurd number of commits for a very small fix. (Learn how to squash at https://davidwalsh.name/squash-commits-git )
 * When you're submitting a PR for a UI-related issue, it would be really awesome if you add a screenshot of your change or a link to a deployment where it can be tested out along with your PR. It makes it very easy for the reviewers and you'll also get reviews quicker.
 
 **Feature Requests and Bug Reports**

README.md

@@ -1,5 +1,4 @@
 from celery.signals import after_task_publish
-from logging.config import dictConfig
 import logging
 import os.path
 from envparse import env
@@ -94,28 +93,8 @@ def create_app():
     app.config['JSONIFY_PRETTYPRINT_REGULAR'] = False
     app.config['FILE_SYSTEM_STORAGE_FILE_VIEW'] = 'static'
 
-    app.logger = logging.getLogger(__name__)
-
-    dictConfig({
-        'version': 1,
-        'handlers': {
-            'console': {
-                'level': logging.WARN,
-                'class': 'logging.StreamHandler',
-                'stream': 'ext://sys.stdout'
-            }
-        },
-        'loggers': {
-            '': {
-                'handlers': ['console'],
-                'level': logging.WARN
-            },
-            'default': {
-                'handlers': ['console'],
-                'level': logging.INFO
-            }
-        }
-    })
+    app.logger.addHandler(logging.StreamHandler(sys.stdout))
+    app.logger.setLevel(logging.ERROR)
 
     # set up jwt
     app.config['JWT_AUTH_USERNAME_KEY'] = 'email'
@@ -148,6 +127,7 @@ def create_app():
         from app.api.users import user_misc_routes
         from app.api.orders import order_misc_routes
         from app.api.role_invites import role_invites_misc_routes
+        from app.api.admin_translations import admin_blueprint
 
         app.register_blueprint(api_v1)
         app.register_blueprint(event_copy)
@@ -161,6 +141,7 @@ def create_app():
         app.register_blueprint(attendee_misc_routes)
         app.register_blueprint(order_misc_routes)
         app.register_blueprint(role_invites_misc_routes)
+        app.register_blueprint(admin_blueprint)
 
     sa.orm.configure_mappers()
 

app/__init__.py

@@ -22,13 +22,14 @@ class Meta:
     name = fields.String()
     payment_currency = fields.String()
     fee_percentage = fields.Float(attribute='fee')
+    maximum_fee = fields.Float(attribute='maximum_fee')
     revenue = fields.Method('calc_revenue')
     ticket_count = fields.Method('calc_ticket_count')
 
     @staticmethod
     def calc_ticket_count(obj):
         """Count all tickets in all orders of this event"""
-        return sum([o.amount for o in obj.orders])
+        return sum([o.tickets_count for o in obj.orders if o.status == 'completed'])
 
     @staticmethod
     def calc_revenue(obj):

app/api/admin_sales/fees.py

@@ -0,0 +1,24 @@
+from flask import send_file, Blueprint
+import shutil
+import uuid
+import tempfile
+import os
+
+admin_blueprint = Blueprint('admin_blueprint', __name__, url_prefix='/admin/content/translations/all')
+temp_dir = tempfile.gettempdir()
+translations_dir = 'app/translations'
+
+@admin_blueprint.route('/', methods=['GET'])
+def download_translations():
+    """Admin Translations Downloads"""
+    uuid_literal = uuid.uuid4()
+    zip_file = "translations{}".format(uuid_literal)
+    zip_file_ext = zip_file+'.zip'
+    shutil.make_archive(zip_file, "zip", translations_dir)
+    shutil.move(zip_file_ext, temp_dir)
+    path_to_zip = os.path.join(temp_dir, zip_file_ext)
+    from .helpers.tasks import delete_translations
+    delete_translations.apply_async(path_to_zip, countdown=600)
+    return send_file(path_to_zip,  mimetype='application/zip',
+                     as_attachment=True,
+                     attachment_filename='translations.zip')

app/api/admin_translations.py

@@ -3,7 +3,7 @@
 from flask_rest_jsonapi.data_layers.base import BaseDataLayer
 from sqlalchemy.orm import make_transient
 
-from app.api.helpers.db import safe_query
+from app.api.helpers.db import safe_query, save_to_db
 from app.api.helpers.files import create_save_resized_image
 from app.models.custom_form import CustomForms
 from app.models.discount_code import DiscountCode
@@ -45,8 +45,7 @@ def create_object(self, data, view_kwargs):
         make_transient(event)
         delattr(event, 'id')
         event.identifier = get_new_event_identifier()
-        db.session.add(event)
-        db.session.commit()
+        save_to_db(event)
 
         # Removes access_codes, order_tickets, ticket_tags for the new tickets created.
         for ticket in tickets:
@@ -55,17 +54,15 @@ def create_object(self, data, view_kwargs):
             make_transient(ticket)
             ticket.event_id = event.id
             delattr(ticket, 'id')
-            db.session.add(ticket)
-            db.session.commit()
+            save_to_db(ticket)
 
         for link in social_links:
             link_id = link.id
             db.session.expunge(link)  # expunge the object from session
             make_transient(link)
             link.event_id = event.id
             delattr(link, 'id')
-            db.session.add(link)
-            db.session.commit()
+            save_to_db(link)
 
         for sponsor in sponsors:
             sponsor_id = sponsor.id
@@ -75,17 +72,15 @@ def create_object(self, data, view_kwargs):
             logo_url = create_save_resized_image(image_file=sponsor.logo_url, resize=False)
             delattr(sponsor, 'id')
             sponsor.logo_url = logo_url
-            db.session.add(sponsor)
-            db.session.commit()
+            save_to_db(sponsor)
 
         for location in microlocations:
             location_id = location.id
             db.session.expunge(location)  # expunge the object from session
             make_transient(location)
             location.event_id = event.id
             delattr(location, 'id')
-            db.session.add(location)
-            db.session.commit()
+            save_to_db(location)
 
         # No sessions are copied for new tracks
         for track in tracks:
@@ -94,34 +89,30 @@ def create_object(self, data, view_kwargs):
             make_transient(track)
             track.event_id = event.id
             delattr(track, 'id')
-            db.session.add(track)
-            db.session.commit()
+            save_to_db(track)
 
         for call in speaker_calls:
             call_id = call.id
             db.session.expunge(call)  # expunge the object from session
             make_transient(call)
             call.event_id = event.id
             delattr(call, 'id')
-            db.session.add(call)
-            db.session.commit()
+            save_to_db(call)
 
         for code in discount_codes:
             code_id = code.id
             db.session.expunge(code)  # expunge the object from session
             make_transient(code)
             code.event_id = event.id
             delattr(code, 'id')
-            db.session.add(code)
-            db.session.commit()
+            save_to_db(code)
 
         for form in custom_forms:
             form_id = form.id
             db.session.expunge(form)  # expunge the object from session
             make_transient(form)
             form.event_id = event.id
             delattr(form, 'id')
-            db.session.add(form)
-            db.session.commit()
+            save_to_db(form)
 
         return event

app/api/data_layers/EventCopyLayer.py

@@ -1,7 +1,7 @@
 from flask import jsonify, Blueprint, abort, make_response
 from sqlalchemy.orm import make_transient
 
-from app.api.helpers.db import safe_query
+from app.api.helpers.db import safe_query, save_to_db
 from app.api.helpers.files import create_save_resized_image
 from app.api.helpers.permission_manager import has_access
 from app.models.custom_form import CustomForms
@@ -46,8 +46,7 @@ def create_event_copy(identifier):
     make_transient(event)
     delattr(event, 'id')
     event.identifier = get_new_event_identifier()
-    db.session.add(event)
-    db.session.commit()
+    save_to_db(event)
 
     # Removes access_codes, order_tickets, ticket_tags for the new tickets created.
     for ticket in tickets:
@@ -56,17 +55,15 @@ def create_event_copy(identifier):
         make_transient(ticket)
         ticket.event_id = event.id
         delattr(ticket, 'id')
-        db.session.add(ticket)
-        db.session.commit()
+        save_to_db(ticket)
 
     for link in social_links:
         link_id = link.id
         db.session.expunge(link)  # expunge the object from session
         make_transient(link)
         link.event_id = event.id
         delattr(link, 'id')
-        db.session.add(link)
-        db.session.commit()
+        save_to_db(link)
 
     for sponsor in sponsors:
         sponsor_id = sponsor.id
@@ -76,17 +73,15 @@ def create_event_copy(identifier):
         logo_url = create_save_resized_image(image_file=sponsor.logo_url, resize=False)
         delattr(sponsor, 'id')
         sponsor.logo_url = logo_url
-        db.session.add(sponsor)
-        db.session.commit()
+        save_to_db(sponsor)
 
     for location in microlocations:
         location_id = location.id
         db.session.expunge(location)  # expunge the object from session
         make_transient(location)
         location.event_id = event.id
         delattr(location, 'id')
-        db.session.add(location)
-        db.session.commit()
+        save_to_db(location)
 
     # No sessions are copied for new tracks
     for track in tracks:
@@ -95,43 +90,39 @@ def create_event_copy(identifier):
         make_transient(track)
         track.event_id = event.id
         delattr(track, 'id')
-        db.session.add(track)
-        db.session.commit()
+        save_to_db(track)
 
     for call in speaker_calls:
         call_id = call.id
         db.session.expunge(call)  # expunge the object from session
         make_transient(call)
         call.event_id = event.id
         delattr(call, 'id')
-        db.session.add(call)
-        db.session.commit()
+        save_to_db(call)
 
     for code in discount_codes:
         code_id = code.id
         db.session.expunge(code)  # expunge the object from session
         make_transient(code)
         code.event_id = event.id
         delattr(code, 'id')
-        db.session.add(code)
-        db.session.commit()
+        save_to_db(code)
 
     for form in custom_forms:
         form_id = form.id
         db.session.expunge(form)  # expunge the object from session
         make_transient(form)
         form.event_id = event.id
         delattr(form, 'id')
-        db.session.add(form)
-        db.session.commit()
+        save_to_db(form)
 
     for user_role in user_event_roles:
+        user_role_id = user_role.id
         db.session.expunge(user_role)
         make_transient(user_role)
         user_role.event_id = event.id
         delattr(user_role, 'id')
-        db.session.add(user_role)
-        db.session.commit()
+        save_to_db(user_role)
 
     return jsonify({
         'id': event.id,