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

MBE-269
ovh-ux · Sep 11, 2019 · 15fe69a · 15fe69a
1 parent 49c0e25
commit 15fe69a
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 18 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,11 +14,15 @@ export default class {
   getServiceInfos(service) {
     return this.OvhHttp.get(`${service.path}/${service.serviceName}/serviceInfos`, {
       rootPath: 'apiv6',
-    });
+    })
+      .then(serviceInfos => new BillingService({
+        ...service,
+        ...serviceInfos,
+      }));
   }
 
   changeContact(service) {
-    return this.OvhHttp.post(`${service.path}/${service.serviceName}/changeContact'`, {
+    return this.OvhHttp.post(`${service.path}/${service.serviceName}/changeContact`, {
       rootPath: 'apiv6',
       data: {
         contactAdmin: service.contactAdmin,
@@ -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
@@ -3,7 +3,9 @@ import template from './edit.html';
 
 export default {
   bindings: {
+    billLink: '<',
     changeContact: '<',
+    currentUser: '<',
     goBack: '<',
     service: '<',
   },

diff --git a/client/app/account/contacts/service/edit/edit.constants.js b/client/app/account/contacts/service/edit/edit.constants.js
@@ -0,0 +1,5 @@
+export const DEBT_ALL = 'all';
+
+export default {
+  DEBT_ALL,
+};
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,34 @@
                 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>
+            <a
+                class="oui-link"
+                data-ng-href="{{ $ctrl.billLink }}"
+                data-translate="account_contacts_service_edit_pay">
+            </a>
+        </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"
+                data-translate-values="{
+                    nicBilling: $ctrl.service.contactBilling
+                }">
+            </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 +52,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 +62,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/edit.routing.js b/client/app/account/contacts/service/edit/edit.routing.js
@@ -1,4 +1,5 @@
 import _ from 'lodash';
+import { DEBT_ALL } from './edit.constants';
 
 export default /* @ngInject */ ($stateProvider) => {
   $stateProvider.state('app.account.useraccount.contacts.services.edit', {
@@ -10,6 +11,7 @@ export default /* @ngInject */ ($stateProvider) => {
     },
     layout: 'modal',
     resolve: {
+      billLink: /* @ngInject */ $state => $state.href('app.account.billing.main.history.pay-debt', { debtId: DEBT_ALL }),
       changeContact: /* @ngInject */
         AccountContactsService => service => AccountContactsService.changeContact(service),
       goBack: /* @ngInject */ goToContacts => goToContacts,

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,8 @@
   "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 e-mail contenant la procédure de validation.",
+  "account_contacts_service_edit_warn_debt": "Vous ne pouvez pas modifier le contact de facturation, car une facture est en attente de règlement pour ce service. Nous vous invitons à la régler afin d’effectuer ce changement.",
+  "account_contacts_service_edit_pay": "Régler la facture",
+  "account_contacts_service_edit_warn_contact_billing": "Vous ne pouvez pas modifier le contact de facturation, car une facture est en attente de règlement pour ce service. Nous vous invitons à joindre le contact de facturation actuel {{ nicBilling }} afin qu’il effectue ce 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';
 

diff --git a/client/app/models/BillingService.class.js b/client/app/models/BillingService.class.js
@@ -65,7 +65,12 @@ export default class BillingService {
   }
 
   hasDebt() {
-    return _.includes(['PENDING_DEBT', 'UN_PAID'], this.status);
+    return _.includes([
+      'PENDING_DEBT',
+      'UN_PAID',
+      'pendingDebt',
+      'unPaid',
+    ], this.status);
   }
 
   hasEngagement() {