[MS] Order Page

client/src/locales/en-US.json

@@ -1697,7 +1697,13 @@
             "new": {
                 "title": "You need to create a new organization?",
                 "button": "New request",
-                "sent": "Your request has been sent."
+                "sent": "Your request has been sent.",
+                "details": "Order details",
+                "date": "Date",
+                "membersNeed": "Amount of members",
+                "dataNeeded": "Amount of data",
+                "startDate": "Starting date",
+                "endDate": "Ending date"
             },
             "request": {
                 "title": "Request a new on-premise contract",
@@ -1727,6 +1733,19 @@
                 },
                 "connectionFailure": "An error occured (Failed to contact the server).",
                 "serverFailure": "An error occured (server request refused."
+            },
+            "progress": {
+                "orderNumber": "Order n°{number}",
+                "noOrder": "You don't have any order yet"
+            },
+            "passed": {
+                "header": {
+                    "orderNumber": "Order number",
+                    "period": "Period",
+                    "members": "Members number",
+                    "storage": "Storage",
+                    "status": "Status"
+                }
             }
         }
     },

client/src/locales/fr-FR.json

@@ -1697,7 +1697,13 @@
             "new": {
                 "title": "Vous avez besoin de créer une nouvelle organisation ?",
                 "button": "Nouvelle demande",
-                "sent": "Votre demande a bien été envoyée."
+                "sent": "Votre demande a bien été envoyée.",
+                "details": "Détails de la demande",
+                "date": "Date de la demande",
+                "membersNeed": "Nombre de membres",
+                "dataNeeded": "Volume de données",
+                "startDate": "Date de début",
+                "endDate": "Date de fin"
             },
             "request": {
                 "title": "Demande d'un contrat sur-mesure",
@@ -1727,6 +1733,19 @@
                 },
                 "connectionFailure": "Un problème est survenu (connexion au serveur impossible).",
                 "serverFailure": "Un problème est survenu (requête serveur refusée)."
+            },
+            "progress": {
+                "orderNumber": "Commande n°{number}",
+                "noOrder": "Vous n'avez pas de commande en cours."
+            },
+            "passed": {
+                "header": {
+                    "orderNumber": "Numéro de commande",
+                    "period": "Période",
+                    "members": "Nombre de membres",
+                    "storage": "Volume de données",
+                    "status": "Statut"
+                }
             }
         }
     },

client/src/services/bms/mockApi.ts

@@ -219,47 +219,49 @@ export const MockedBmsApi = {
       return {
         status: 200,
         isError: false,
-        type: DataType.GetCustomOrderRequests,
-        requests: [
-          {
-            id: 'XX-1',
-            describedNeeds: 'I wanna rock!',
-            users: 50,
-            storage: 1000,
-            status: CustomOrderRequestStatus.Processing,
-            comment: 'Turn it down you say, nut all I got to say to you is time and time again I say no (no), no no, no no, no.',
-            orderDate: DateTime.now().minus({ months: 2 }),
-          },
-          {
-            id: 'XX-2',
-            describedNeeds: 'I want to hold your hand',
-            users: 50,
-            storage: 1000,
-            organizationId: 'The Beatles',
-            status: CustomOrderRequestStatus.Received,
-            comment: "I think you'll understand",
-            orderDate: DateTime.now().minus({ days: 4 }),
-          },
-          {
-            id: 'XX-3',
-            describedNeeds: 'I want to break free!',
-            users: 300,
-            storage: 9999,
-            organizationId: 'Queen',
-            status: CustomOrderRequestStatus.Finished,
-            comment: "I've fallen in love",
-            orderDate: DateTime.now().minus({ months: 6 }),
-          },
-          {
-            id: 'XX-4',
-            describedNeeds: 'I want you to want me',
-            users: 9999,
-            storage: 100,
-            status: CustomOrderRequestStatus.Cancelled,
-            comment: 'I need you to need me',
-            orderDate: DateTime.now().minus({ days: 6 }),
-          },
-        ],
+        data: {
+          type: DataType.GetCustomOrderRequests,
+          requests: [
+            {
+              id: 'XX-1',
+              describedNeeds: 'I wanna rock!',
+              users: 50,
+              storage: 1000,
+              status: CustomOrderRequestStatus.Processing,
+              comment: 'Turn it down you say, nut all I got to say to you is time and time again I say no (no), no no, no no, no.',
+              orderDate: DateTime.now().minus({ months: 2 }),
+            },
+            {
+              id: 'XX-2',
+              describedNeeds: 'I want to hold your hand',
+              users: 50,
+              storage: 1000,
+              organizationId: 'The Beatles',
+              status: CustomOrderRequestStatus.Received,
+              comment: "I think you'll understand",
+              orderDate: DateTime.now().minus({ days: 4 }),
+            },
+            {
+              id: 'XX-3',
+              describedNeeds: 'I want to break free!',
+              users: 300,
+              storage: 9999,
+              organizationId: 'Queen',
+              status: CustomOrderRequestStatus.Finished,
+              comment: "I've fallen in love",
+              orderDate: DateTime.now().minus({ months: 6 }),
+            },
+            {
+              id: 'XX-4',
+              describedNeeds: 'I want you to want me',
+              users: 9999,
+              storage: 100,
+              status: CustomOrderRequestStatus.Cancelled,
+              comment: 'I need you to need me',
+              orderDate: DateTime.now().minus({ days: 6 }),
+            },
+          ],
+        },
       };
     },
     async (_token: AuthenticationToken) => {

client/src/services/bms/types.ts

@@ -380,6 +380,7 @@ export {
   CustomOrderStatusResultData,
   DataType,
   DeletePaymentMethodQueryData,
+  GetCustomOrderRequestsResultData,
   InvoiceStatus,
   ListOrganizationsResultData,
   LoginQueryData,

client/src/theme/components/action-bar.scss

@@ -2,7 +2,7 @@
 
 /* contextual menu button */
 
-.contextual-menu {
+.action-bar {
   .counter {
     flex-shrink: 0;
   }

client/src/views/client-area/BmsLogin.vue

@@ -363,10 +363,6 @@ async function onLoginClicked(): Promise<void> {
         height: 2.5rem;
         border-radius: var(--parsec-radius-6);
         border: 1px solid transparent;
-
-        &:hover {
-          border: 1px solid var(--parsec-color-light-secondary-contrast);
-        }
       }
 
       .skeleton-login-button {