diff --git a/api-wiaas/client/js/components/orders/orders.directive.js b/api-wiaas/client/js/components/orders/orders.directive.js
index a111803..60b56c5 100644
--- a/api-wiaas/client/js/components/orders/orders.directive.js
+++ b/api-wiaas/client/js/components/orders/orders.directive.js
@@ -147,6 +147,10 @@
'idCommercialLeadUser',
'idCustomerInstance',
'deliveryAddress',
+ 'billingFirstName',
+ 'billingLastName',
+ 'billingMail',
+ 'billingAddress',
'customerPhone',
'customerMail',
'commercialLeadPhone',
diff --git a/api-wiaas/server/components/v1/orders/OrdersModel.php b/api-wiaas/server/components/v1/orders/OrdersModel.php
index 1f5e373..2b61030 100644
--- a/api-wiaas/server/components/v1/orders/OrdersModel.php
+++ b/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',
diff --git a/api-wiaas/server/components/v1/orders/templates/OrderDetailsCustomer.html b/api-wiaas/server/components/v1/orders/templates/OrderDetailsCustomer.html
index 68c8c80..3385fd8 100644
--- a/api-wiaas/server/components/v1/orders/templates/OrderDetailsCustomer.html
+++ b/api-wiaas/server/components/v1/orders/templates/OrderDetailsCustomer.html
@@ -9,4 +9,16 @@
{{'orders.tables.headers.mail' | translate}}:
{{data.customerMail}}
+
+ {{'orders.tables.headers.billingFirstName' | translate}}:
+ {{data.billingFirstName}}
+
+ {{'orders.tables.headers.billingLastName' | translate}}:
+ {{data.billingLastName}}
+
+ {{'orders.tables.headers.billingMail' | translate}}:
+ {{data.billingMail}}
+
+ {{'orders.tables.headers.billingAddress' | translate}}:
+ {{data.billingAddress}}
diff --git a/api-wiaas/server/components/v1/translate/languages/en.json b/api-wiaas/server/components/v1/translate/languages/en.json
index 4d6009d..c481000 100644
--- a/api-wiaas/server/components/v1/translate/languages/en.json
+++ b/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",
diff --git a/api-wiaas/server/components/v2/orders/OrdersModel.php b/api-wiaas/server/components/v2/orders/OrdersModel.php
index 2075fc3..f5eb59e 100644
--- a/api-wiaas/server/components/v2/orders/OrdersModel.php
+++ b/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,
diff --git a/client-wiaas/src/constants/ordersConstants.js b/client-wiaas/src/constants/ordersConstants.js
index 6b1f69d..acec399 100644
--- a/client-wiaas/src/constants/ordersConstants.js
+++ b/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',
diff --git a/client-wiaas/src/containers/orders/components/OrderInfo.jsx b/client-wiaas/src/containers/orders/components/OrderInfo.jsx
index 89bd912..ab25834 100644
--- a/client-wiaas/src/containers/orders/components/OrderInfo.jsx
+++ b/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 (
@@ -65,6 +65,16 @@ class OrderInfo extends Component {
{orderInfo.commercialLead}
+
+ {orderTexts.labels.BILLING_FIRST_NAME}:
+ {orderInfo.billingFirstName || '-'}
+ {orderTexts.labels.BILLING_LAST_NAME}:
+ {orderInfo.billingLastName || '-'}
+ {orderTexts.labels.BILLING_MAIL}:
+ {orderInfo.billingMail || '-'}
+ {orderTexts.labels.BILLING_ADDRESS}:
+ {orderInfo.billingAddress || '-'}
+
{orderTexts.labels.REFERENCE}: