Merge branch 'show-billing-details-in-order-details-frontend-backend' into 'development'

Show billing details in order details frontend backend

See merge request saburly/wiaas/wiaas-legacy!7

api-wiaas/client/js/components/orders/orders.directive.js

@@ -147,6 +147,10 @@
                 'idCommercialLeadUser',
                 'idCustomerInstance',
                 'deliveryAddress',
+                'billingFirstName',
+                'billingLastName',
+                'billingMail',
+                'billingAddress',
                 'customerPhone',
                 'customerMail',
                 'commercialLeadPhone',

api-wiaas/server/components/v1/orders/OrdersModel.php

@@ -31,6 +31,10 @@ class OrdersModel{
                     'o.idCustomerInstance' => 'idCustomerInstance',
                     'rclc.IdCustomer' => 'idCustomer',
                     'cust.name' => 'customer',
+                    'o.billingFirstName' => 'billingFirstName',
+                    'o.billingLastName' => 'billingLastName',
+                    'o.billingMail' => 'billingMail',
+                    'o.billingAddress' => 'billingAddress',
                     'rclc.idCommercialLead' => 'idCommercialLead',
                     'cl.name' => 'commercialLead',
                     'IFNULL(b.name, \'\')' => 'assignedTo',
@@ -55,6 +59,10 @@ class OrdersModel{
                     'rclc.idCommercialLead' => 'idCommercialLead',
                     'cl.name' => 'commercialLead',
                     'o.orderDate' => 'orderDate',
+                    'o.billingFirstName' => 'billingFirstName',
+                    'o.billingLastName' => 'billingLastName',
+                    'o.billingMail' => 'billingMail',
+                    'o.billingAddress' => 'billingAddress',
                     'o.estimatedDeliveryDate' => 'estimatedDeliveryDate',
                     '\'\'' => 'orderItems',
                     'SUM(rop.packageFixedPrice)' => 'orderTotalPrice',
@@ -75,6 +83,10 @@ class OrdersModel{
                     'o.idCustomerInstance' => 'idCustomerInstance',
                     'rclc.IdCustomer' => 'idCustomer',
                     'cust.name' => 'customer',
+                    'o.billingFirstName' => 'billingFirstName',
+                    'o.billingLastName' => 'billingLastName',
+                    'o.billingMail' => 'billingMail',
+                    'o.billingAddress' => 'billingAddress',
                     'o.orderDate' => 'orderDate',
                     'o.estimatedDeliveryDate' => 'estimatedDeliveryDate',
                     '\'\'' => 'orderItems',
@@ -225,6 +237,10 @@ class OrdersModel{
                     'o.idCustomerInstance' => 'idCustomerInstance',
                     'rclc.IdCustomer' => 'idCustomer',
                     'cust.name' => 'customer',
+                    'o.billingFirstName' => 'billingFirstName',
+                    'o.billingLastName' => 'billingLastName',
+                    'o.billingMail' => 'billingMail',
+                    'o.billingAddress' => 'billingAddress',
                     'rclc.idCommercialLead' => 'idCommercialLead',
                     'cl.name' => 'commercialLead',
                     'o.orderDate' => 'orderDate',
@@ -250,6 +266,10 @@ class OrdersModel{
                     'rclc.idCommercialLead' => 'idCommercialLead',
                     'cl.name' => 'commercialLead',
                     'o.orderDate' => 'orderDate',
+                    'o.billingFirstName' => 'billingFirstName',
+                    'o.billingLastName' => 'billingLastName',
+                    'o.billingMail' => 'billingMail',
+                    'o.billingAddress' => 'billingAddress',
                     'o.estimatedDeliveryDate' => 'estimatedDeliveryDate',
                     'o.deliveryDate' => 'deliveryDate',
                     'MAX(rop.endOfLife)' => 'endOfLife',
@@ -272,6 +292,10 @@ class OrdersModel{
                     'o.idCustomerInstance' => 'idCustomerInstance',
                     'rclc.IdCustomer' => 'idCustomer',
                     'cust.name' => 'customer',
+                    'o.billingFirstName' => 'billingFirstName',
+                    'o.billingLastName' => 'billingLastName',
+                    'o.billingMail' => 'billingMail',
+                    'o.billingAddress' => 'billingAddress',
                     'o.orderDate' => 'orderDate',
                     'o.estimatedDeliveryDate' => 'estimatedDeliveryDate',
                     'o.deliveryDate' => 'deliveryDate',

api-wiaas/server/components/v1/orders/templates/OrderDetailsCustomer.html

@@ -9,4 +9,16 @@
 
     <div class="order-details-label">{{'orders.tables.headers.mail' | translate}}:</div>
     <div class="order-details-info">{{data.customerMail}}</div>
+
+    <div class="order-details-label">{{'orders.tables.headers.billingFirstName' | translate}}:</div>
+    <div class="order-details-info">{{data.billingFirstName}}</div>
+
+    <div class="order-details-label">{{'orders.tables.headers.billingLastName' | translate}}:</div>
+    <div class="order-details-info">{{data.billingLastName}}</div>
+
+    <div class="order-details-label">{{'orders.tables.headers.billingMail' | translate}}:</div>
+    <div class="order-details-info">{{data.billingMail}}</div>
+
+    <div class="order-details-label">{{'orders.tables.headers.billingAddress' | translate}}:</div>
+    <div class="order-details-info">{{data.billingAddress}}</div>
 </div>

api-wiaas/server/components/v1/translate/languages/en.json

@@ -864,7 +864,11 @@
                 "uploadFile" : "Upload files for order package",
                 "idProject" : "Id project",
                 "projectName" : "Project name",
-                "isAvailable" : "Is available"
+                "isAvailable" : "Is available",
+                "billingFirstName" : "Billing first name",
+                "billingLastName" : "Billing last name",
+                "billingMail" : "Invoice mail",
+                "billingAddress" : "Billing address"
             },
             "extra" : {
                 "NOT_ASSIGNED" : "Unassigned",

api-wiaas/server/components/v2/orders/OrdersModel.php

@@ -115,6 +115,10 @@ class OrdersModel{
                     'o.idCustomerInstance' => 'idCustomerInstance',
                     'rclc.IdCustomer' => 'idCustomer',
                     'cust.name' => 'customer',
+                    'o.billingFirstName' => 'billingFirstName',
+                    'o.billingLastName' => 'billingLastName',
+                    'o.billingMail' => 'billingMail',
+                    'o.billingAddress' => 'billingAddress',
                     'rclc.idCommercialLead' => 'idCommercialLead',
                     'cl.name' => 'commercialLead',
                     'IFNULL(b.name, \'\')' => 'assignedTo',
@@ -139,6 +143,10 @@ class OrdersModel{
                     'rclc.idCommercialLead' => 'idCommercialLead',
                     'uc.id' => 'idCustomerUser',
                     'cust.name' => 'customerName',
+                    'o.billingFirstName' => 'billingFirstName',
+                    'o.billingLastName' => 'billingLastName',
+                    'o.billingMail' => 'billingMail',
+                    'o.billingAddress' => 'billingAddress',
                     'cust.phone' => 'phone',
                     'uc.mail' => 'mail',
                     'cl.contactName' => 'clContactName',
@@ -164,6 +172,10 @@ class OrdersModel{
                     'o.idCustomerInstance' => 'idCustomerInstance',
                     'rclc.IdCustomer' => 'idCustomer',
                     'cust.name' => 'customer',
+                    'o.billingFirstName' => 'billingFirstName',
+                    'o.billingLastName' => 'billingLastName',
+                    'o.billingMail' => 'billingMail',
+                    'o.billingAddress' => 'billingAddress',
                     'o.orderDate' => 'orderDate',
                     'o.estimatedDeliveryDate' => 'estimatedDeliveryDate',
                     '\'\'' => 'orderItems',
@@ -318,6 +330,10 @@ class OrdersModel{
                     'o.idCustomerInstance' => 'idCustomerInstance',
                     'rclc.IdCustomer' => 'idCustomer',
                     'cust.name' => 'customer',
+                    'o.billingFirstName' => 'billingFirstName',
+                    'o.billingLastName' => 'billingLastName',
+                    'o.billingMail' => 'billingMail',
+                    'o.billingAddress' => 'billingAddress',
                     'rclc.idCommercialLead' => 'idCommercialLead',
                     'cl.name' => 'commercialLead',
                     'o.orderDate' => 'orderDate',
@@ -344,6 +360,10 @@ class OrdersModel{
                     'rclc.idCommercialLead' => 'idCommercialLead',
                     'uc.id' => 'idCustomerUser',
                     'cust.name' => 'customerName',
+                    'o.billingFirstName' => 'billingFirstName',
+                    'o.billingLastName' => 'billingLastName',
+                    'o.billingMail' => 'billingMail',
+                    'o.billingAddress' => 'billingAddress',
                     'cust.phone' => 'phone',
                     'uc.mail' => 'mail',
                     'cl.name' => 'clName',
@@ -371,6 +391,10 @@ class OrdersModel{
                     'o.idCustomerInstance' => 'idCustomerInstance',
                     'rclc.IdCustomer' => 'idCustomer',
                     'cust.name' => 'customer',
+                    'o.billingFirstName' => 'billingFirstName',
+                    'o.billingLastName' => 'billingLastName',
+                    'o.billingMail' => 'billingMail',
+                    'o.billingAddress' => 'billingAddress',
                     'o.orderDate' => 'orderDate',
                     'o.estimatedDeliveryDate' => 'estimatedDeliveryDate',
                     'o.deliveryDate' => 'deliveryDate',
@@ -761,6 +785,10 @@ class OrdersModel{
                      o.orderNumber,
                      DATE_FORMAT(o.orderDate, '%D %b, %y') as orderDate,
                      o.estimatedDeliveryDate,
+                     o.billingFirstName,
+                     o.billingLastName,
+                     o.billingMail,
+                     o.billingAddress,
                      o.status,
                      o.reference,
                      o.tender,

client-wiaas/src/constants/ordersConstants.js

@@ -161,7 +161,11 @@ export const orderTexts = {
         INSTALLATION_DATE: 'Installation date',
         INSTALLATION_NOT_REQUIRED:'Installation is not required for this package',
         PRELIMINARY_INSTALLATION_DATE_LABEL: 'Preliminary installation date',
-        PROJECT: 'Project'
+        PROJECT: 'Project',
+        BILLING_FIRST_NAME: 'Billing first name',
+        BILLING_LAST_NAME: 'Billing last name',
+        BILLING_MAIL: 'Invoice mail',
+        BILLING_ADDRESS: 'Billing address'
     },
     buttons: {
         ACCEPT_INSTALLATION: 'I agree',

client-wiaas/src/containers/orders/components/OrderInfo.jsx

@@ -54,7 +54,7 @@ class OrderInfo extends Component {
         const orderPackages = installationData.packages;
         const isInstallationInPackage = installationData.isInstallationInPackage;
         const orderInfo = this.props.orderInfo.info;
-
+        
         return (
             <Container fluid={true} id="order-info-description">
                 <Row>
@@ -65,6 +65,16 @@ class OrderInfo extends Component {
                         <span>{orderInfo.commercialLead}</span>
 
                     </Col>
+                    <Col xl="2">
+                        <div className="subtitle"><h6>{orderTexts.labels.BILLING_FIRST_NAME}:</h6></div>
+                        <span>{orderInfo.billingFirstName || '-'}</span>
+                        <div className="subtitle"><h6>{orderTexts.labels.BILLING_LAST_NAME}:</h6></div>
+                        <span>{orderInfo.billingLastName || '-'}</span>
+                        <div className="subtitle"><h6>{orderTexts.labels.BILLING_MAIL}:</h6></div>
+                        <span>{orderInfo.billingMail || '-'}</span>
+                        <div className="subtitle"><h6>{orderTexts.labels.BILLING_ADDRESS}:</h6></div>
+                        <span>{orderInfo.billingAddress || '-'}</span>
+                    </Col>
                     <Col xl="2">
                         <div>
                             <div className="subtitle"><h6>{orderTexts.labels.REFERENCE}:</h6></div>