Merge branch 'development' of github.com:fossasia/open-event-frontend into import_event

Author: YogeshSharma0201

app/components/forms/admin/settings/system-form.js

@@ -162,26 +162,6 @@ export default Component.extend(FormMixin, {
           ]
         },
 
-        smtpUsername: {
-          identifier : 'smtp_username',
-          rules      : [
-            {
-              type   : 'empty',
-              prompt : this.get('l10n').t('Please enter the username for SMTP')
-            }
-          ]
-        },
-
-        smtpPassword: {
-          identifier : 'smtp_password',
-          rules      : [
-            {
-              type   : 'empty',
-              prompt : this.get('l10n').t('Please enter the password for SMTP')
-            }
-          ]
-        },
-
         sendgridToken: {
           identifier : 'sendgrid_token',
           rules      : [

app/components/forms/orders/guest-order-form.js

@@ -0,0 +1,47 @@
+import Component from '@ember/component';
+import FormMixin from 'open-event-frontend/mixins/form';
+
+export default Component.extend(FormMixin, {
+  getValidationRules() {
+    return {
+      inline : true,
+      delay  : false,
+      on     : 'blur',
+      fields : {
+        identification: {
+          identifier : 'email',
+          rules      : [
+            {
+              type   : 'empty',
+              prompt : this.get('l10n').t('Please enter your email ID')
+            },
+            {
+              type   : 'email',
+              prompt : this.get('l10n').t('Please enter a valid email ID')
+            }
+          ]
+        },
+        password: {
+          identifier : 'password',
+          rules      : [
+            {
+              type   : 'empty',
+              prompt : this.get('l10n').t('Please enter your password')
+            }
+          ]
+        }
+      }
+    };
+  },
+  actions: {
+    submit() {
+      this.onValid(() => {
+        if (this.get('userExists')) {
+          this.loginExistingUser(this.email, this.password);
+        } else {
+          this.createNewUserViaEmail(this.email);
+        }
+      });
+    }
+  }
+});

app/components/forms/register-form.js

@@ -30,7 +30,7 @@ export default Component.extend(FormMixin, {
               prompt : this.get('l10n').t('Please enter a password')
             },
             {
-              type   : 'minLength[6]',
+              type   : 'minLength[8]',
               prompt : this.get('l10n').t('Your password must have at least {ruleValue} characters')
             }
           ]

app/components/forms/wizard/basic-details-step.js

@@ -254,6 +254,10 @@ export default Component.extend(FormMixin, EventWizardMixin, {
             {
               type   : 'number',
               prompt : this.get('l10n').t('Invalid number')
+            },
+            {
+              type   : 'integer[1..]',
+              prompt : this.get('l10n').t('Maximum tickets per order should be greater than 0')
             }
           ]
         },

app/components/forms/wizard/sponsors-step.js

@@ -17,6 +17,14 @@ export default Component.extend(FormMixin, {
               prompt : this.get('l10n').t('Please give your sponsor a name')
             }
           ]
+        },
+        image_upload: {
+          rules: [
+            {
+              type   : 'empty',
+              prompt : this.get('l10n').t('Please upload sponsor\'s logo.')
+            }
+          ]
         }
       }
     };

app/components/modals/login-signup-modal.js

@@ -1,39 +1,6 @@
 import ModalBase from 'open-event-frontend/components/modals/modal-base';
-import FormMixin from 'open-event-frontend/mixins/form';
-
-export default ModalBase.extend(FormMixin, {
-  getValidationRules() {
-    return {
-      inline : true,
-      delay  : false,
-      on     : 'blur',
-      fields : {
-        identification: {
-          identifier : 'email',
-          rules      : [
-            {
-              type   : 'empty',
-              prompt : this.get('l10n').t('Please enter your email ID')
-            },
-            {
-              type   : 'email',
-              prompt : this.get('l10n').t('Please enter a valid email ID')
-            }
-          ]
-        },
-        password: {
-          identifier : 'password',
-          rules      : [
-            {
-              type   : 'empty',
-              prompt : this.get('l10n').t('Please enter your password')
-            }
-          ]
-        }
-      }
-    };
-  },
 
+export default ModalBase.extend({
   actions: {
     toggleView() {
       this.set('isOpen', false);

app/components/orders/event-info.js

@@ -1,4 +1,5 @@
 import Component from '@ember/component';
 
 export default Component.extend({
+  showBanner: true
 });

app/components/orders/ticket-holder.js

@@ -0,0 +1,8 @@
+import Component from '@ember/component';
+import { computed } from '@ember/object';
+
+export default Component.extend({
+  buyer: computed('data.user', function() {
+    return this.get('data.user');
+  })
+});

app/controllers/index.js

@@ -19,7 +19,8 @@ export default Controller.extend({
       }
       const startDateTime = callForPapers.get('startsAt');
       const endDateTime = callForPapers.get('endsAt');
-      return (moment().isBetween(startDateTime, endDateTime) && (sessionEnabled));
+      const privacyState = callForPapers.get('privacy');
+      return (moment().isBetween(startDateTime, endDateTime) && (sessionEnabled) && (privacyState === 'public'));
     });
   }),
 

app/models/admin-sales-by-organizer.js

@@ -3,6 +3,7 @@ import ModelBase from 'open-event-frontend/models/base';
 
 export default ModelBase.extend({
   firstName : attr('string'),
-  lastName  : attr('moment'),
+  lastName  : attr('string'),
+  email     : attr('string'),
   sales     : attr()
 });