feat(account.contacts): prevent contact change for in debt services

MBE-269
ovh-ux · Aug 23, 2019 · 5860de2 · 5860de2
1 parent 9f1604a
commit 5860de2
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 16 deletions.
diff --git a/client/app/account/contacts/service/contacts-service.service.js b/client/app/account/contacts/service/contacts-service.service.js
@@ -1,4 +1,5 @@
 import _ from 'lodash';
+import BillingService from '../../../models/BillingService.class';
 
 import { AVAILABLE_SERVICES } from './user-contacts.constants';
 
@@ -13,7 +14,11 @@ export default class {
   getServiceInfos(service) {
     return this.OvhHttp.get(`${service.path}/${service.serviceName}/serviceInfos`, {
       rootPath: 'apiv6',
-    });
+    })
+      .then(serviceInfos => new BillingService({
+        ...service,
+        ...serviceInfos,
+      }));
   }
 
   changeContact(service) {
@@ -29,10 +34,13 @@ export default class {
 
   getServices() {
     return this.OvhApiOvhProduct.Aapi().query().$promise
-      .then(services => _.filter(
-        services,
-        service => AVAILABLE_SERVICES.includes(service.category),
-      ));
+      .then((services) => {
+        const availableServices = _.filter(
+          services,
+          service => AVAILABLE_SERVICES.includes(service.category),
+        );
+        return availableServices.map(service => new BillingService(service));
+      });
   }
 
   static getAvailableCategories(services) {

diff --git a/client/app/account/contacts/service/edit/edit.component.js b/client/app/account/contacts/service/edit/edit.component.js
@@ -4,6 +4,7 @@ import template from './edit.html';
 export default {
   bindings: {
     changeContact: '<',
+    currentUser: '<',
     goBack: '<',
     service: '<',
   },

diff --git a/client/app/account/contacts/service/edit/edit.controller.js b/client/app/account/contacts/service/edit/edit.controller.js
@@ -1,15 +1,20 @@
 import _ from 'lodash';
+import BillingService from '../../../../models/BillingService.class';
 
 export default class {
   /* @ngInject */
   constructor($translate) {
     this.$translate = $translate;
   }
 
+  $onInit() {
+    this.editedService = new BillingService(this.service);
+  }
+
   updateContacts() {
     this.isUpdating = true;
 
-    return this.changeContact(this.service)
+    return this.changeContact(this.editedService)
       .then(() => this.goBack(
         this.$translate.instant('account_contacts_service_edit_success'),
       ))

diff --git a/client/app/account/contacts/service/edit/edit.html b/client/app/account/contacts/service/edit/edit.html
@@ -1,4 +1,7 @@
-<form data-ng-submit="$ctrl.updateContacts()">
+<form
+    name="$ctrl.contactsEditForm"
+    novalidate
+    data-ng-submit="$ctrl.updateContacts()">
     <oui-modal
         data-heading="{{:: 'account_contacts_service_edit' | translate }}"
         data-primary-label="{{:: 'account_contacts_service_edit_confirm' | translate }}"
@@ -12,14 +15,24 @@
                 service: $ctrl.service.serviceName
             }">
         </p>
+        <oui-message
+            data-ng-if="$ctrl.service.hasDebt() && $ctrl.service.hasBillingRights($ctrl.currentUser.nichandle)"
+            data-type="warning">
+            <span data-translate="account_contacts_service_edit_warn_debt"></span>
+        </oui-message>
+        <oui-message
+            data-ng-if="$ctrl.service.hasDebt() && $ctrl.service.hasAdminRights($ctrl.currentUser.nichandle) && !$ctrl.service.hasBillingRights($ctrl.currentUser.nichandle)"
+            data-type="warning">
+            <span data-translate="account_contacts_service_edit_warn_contact_billing"></span>
+        </oui-message>
         <oui-field
             data-label="{{:: 'account_contacts_service_edit_contact_admin' | translate }}">
             <input
                 class="oui-input"
                 type="text"
                 id="contactAdmin"
                 name="contactAdmin"
-                data-ng-model="$ctrl.service.contactAdmin"
+                data-ng-model="$ctrl.editedService.contactAdmin"
                 required>
         </oui-field>
         <oui-field
@@ -29,7 +42,7 @@
                 type="text"
                 id="contactTech"
                 name="contactTech"
-                data-ng-model="$ctrl.service.contactTech"
+                data-ng-model="$ctrl.editedService.contactTech"
                 required>
         </oui-field>
         <oui-field
@@ -39,7 +52,8 @@
                 type="text"
                 id="contactBilling"
                 name="contactBilling"
-                data-ng-model="$ctrl.service.contactBilling"
+                data-ng-model="$ctrl.editedService.contactBilling"
+                data-ng-disabled="$ctrl.Service.hasDebt()"
                 required>
         </oui-field>
     </oui-modal>

diff --git a/client/app/account/contacts/service/edit/translations/Messages_fr_FR.json b/client/app/account/contacts/service/edit/translations/Messages_fr_FR.json
@@ -7,5 +7,7 @@
   "account_contacts_service_edit_cancel": "Annuler",
   "account_contacts_service_edit_confirm": "Valider",
   "account_contacts_service_edit_error": "Une erreur est survenue lors de la demande de changement de contact : {{ message }}",
-  "account_contacts_service_edit_success": "La demande de changement de contact a été efféctuée avec succès. Les contacts concernés par la demande recevront un email contenant la procédure de validation."
+  "account_contacts_service_edit_success": "La demande de changement de contact a été effectuée avec succès. Les contacts concernés par la demande recevront un email contenant la procédure de validation.",
+  "account_contacts_service_edit_warn_debt": "Le contact facturation n'est pas modifiable car il y a une facture à régler pour ce service. Pour pouvoir modifier le contact facturation, veuillez régler votre facture.",
+  "account_contacts_service_edit_warn_contact_billing": "Le contact facturation n'est pas modifiable car il y a une facture à régler pour ce service. Merci de contacter le contact facturation pour qu'il procède au changement."
 }
diff --git a/client/app/account/contacts/service/user-contacts-service.routes.js b/client/app/account/contacts/service/user-contacts-service.routes.js
@@ -5,11 +5,7 @@ export default /* @ngInject */ ($stateProvider) => {
     resolve: {
       editContacts: /* @ngInject */ $state => service => $state.go('app.account.useraccount.contacts.services.edit', { service: service.serviceName }),
       getServiceInfos: /* @ngInject */
-        AccountContactsService => service => AccountContactsService.getServiceInfos(service)
-          .then(serviceInfos => ({
-            ...service,
-            ...serviceInfos,
-          })),
+        AccountContactsService => service => AccountContactsService.getServiceInfos(service),
       goToContacts: /* @ngInject */ ($state, $timeout, Alerter) => (message = false, type = 'success') => {
         const reload = message && type === 'success';