use intermediate user object and change route handling

Author: uds5501

app/components/forms/user-payment-info-form.js

@@ -2,6 +2,7 @@ import Component from '@ember/component';
 import FormMixin from 'open-event-frontend/mixins/form';
 import { validPhoneNumber } from 'open-event-frontend/utils/validators';
 import { computed } from '@ember/object';
+import EmberObject from '@ember/object';
 
 export default Component.extend(FormMixin, {
 
@@ -74,14 +75,36 @@ export default Component.extend(FormMixin, {
       }
     };
   },
-  user: computed(function() {
-    return this.authManager.currentUser;
+  user: computed('authManager.currentUser', function() {
+    const actualUser = this.authManager.currentUser;
+    let intermediateUser = EmberObject.create({
+      billingContactName    : actualUser.billingContactName,
+      billingCity           : actualUser.billingCity,
+      billingPhone          : actualUser.billingPhone,
+      company               : actualUser.company,
+      billingTaxInfo        : actualUser.billingTaxInfo,
+      billingAddress        : actualUser.billingAddress,
+      billingZipCode        : actualUser.billingZipCode,
+      billingAdditionalInfo : actualUser.billingAdditionalInfo
+    });
+    return intermediateUser;
   }),
   actions: {
     submit() {
       this.onValid(async() => {
         try {
-          await this.user.save();
+          let actualUser = await this.authManager.currentUser;
+          actualUser.setProperties({
+            billingAdditionalInfo : this.user.billingAdditionalInfo,
+            billingZipCode        : this.user.billingZipCode,
+            billingContactName    : this.user.billingContactName,
+            billingPhone          : this.user.billingPhone,
+            company               : this.user.company,
+            billingTaxInfo        : this.user.billingTaxInfo,
+            billingCity           : this.user.billingCity,
+            billingAddress        : this.user.billingAddress
+          });
+          await actualUser.save();
           this.notify.success(this.l10n.t('Your billing details has been updated'));
         } catch (error) {
           this.notify.error(this.l10n.t('An unexpected error occurred'));

app/routes/account/billing-info.js

@@ -7,6 +7,10 @@ export default Route.extend(AuthenticatedRouteMixin, {
   },
   beforeModel() {
     this._super(...arguments);
-    this.replaceWith('account.billing-info.payment-info');
+    if (this.authManager.currentUser) {
+      this.replaceWith('account.billing-info.payment-info');
+    } else {
+      this.replaceWith('login');
+    }
   }
 });