senaduka/old-new-wiaas
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

use new object property names

Browse Source
This commit is contained in:
GotPPay
2018-08-15 22:21:29 +02:00
parent 5399e3901b
commit 74a6905a23
8 changed files with 49 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
frontend/src/containers/orders/ProcessContainer.jsx
View File

@@ -52,7 +52,7 @@ class ProcessContainer extends Component {
if(this.props.orderInfo) {
this.props.orderInfo.packages.forEach(orderPackage => {
orderPackagePairs.push(orderPackage.idOrder + '-' + orderPackage.idPackage);
orderPackagePairs.push(this.props.orderInfo.id + '-' + orderPackage.id);
});
}
this.setState({
@@ -71,11 +71,11 @@ class ProcessContainer extends Component {
if(installCompanies && isComponentDisabled && earliestInstallDate) {
if(nextProps.orderInfo) {
const idOrder = nextProps.orderInfo.id;
nextProps.orderInfo.packages.forEach(orderPackage => {
const idOrder = orderPackage && orderPackage.idOrder;
const idOrderPackagePair = orderPackage ? idOrder + '-' + orderPackage.idPackage : '';
const idOrderPackagePair = orderPackage ? idOrder + '-' + orderPackage.id : '';
orderPackage.idOrderPackagePair = idOrderPackagePair;
areComponentsDisabled[idOrder] = this.checkIfComponentIsDisabled(orderPackage.idOrder, isComponentDisabled, earliestInstallDate);
areComponentsDisabled[idOrder] = this.checkIfComponentIsDisabled(idOrder, isComponentDisabled, earliestInstallDate);
const availableCompanies = {};
const selectedCompanies = {};
@@ -101,7 +101,7 @@ class ProcessContainer extends Component {
});
const isSchedulingDisabled = Object.assign({}, this.state.isSchedulingDisabled);
isSchedulingDisabled[nextProps.orderInfo.info.id] = allPackagesScheduleInstallDisabled.every(isDisabled => {return isDisabled === true;});
isSchedulingDisabled[nextProps.orderInfo.id] = allPackagesScheduleInstallDisabled.every(isDisabled => {return isDisabled === true;});
this.setState({
isSchedulingDisabled,
areComponentsDisabled,
@@ -126,16 +126,16 @@ class ProcessContainer extends Component {
return true;
}
calculatetTotalPrice(packages) {
let fixedPrice = priceHelper.sumPrices(packages.map(pkg => { return pkg.units * pkg.packageFixedPrice}));
let recurrentPrice = priceHelper.sumPrices(packages.map(pkg => { return pkg.units * pkg.packageRecuringPrice}));
let servicesPrice = priceHelper.sumPrices(packages.map(pkg => { return pkg.units * pkg.packageServicePrice}));
calculatetTotalPrice(packages, currency) {
let fixedPrice = priceHelper.sumPrices(packages.map(pkg => { return pkg.quantity * pkg.price}));
let recurrentPrice = priceHelper.sumPrices(packages.map(pkg => { return pkg.quantity * pkg.recurringPrice}));
let servicesPrice = priceHelper.sumPrices(packages.map(pkg => { return pkg.quantity * pkg.servicePrice}));
return {
fixedPrice,
recurrentPrice: priceHelper.sumPrices([recurrentPrice, servicesPrice]),
periodUnit: packages[0].periodUnit,
currency: packages[0].packageCurrency.currency
currency: currency
}
}
@@ -158,15 +158,10 @@ class ProcessContainer extends Component {
if(this.state.packageNameFilter === 'all') {
return true;
}else{
return orderPackage.packageName === this.state.packageNameFilter;
return orderPackage.name === this.state.packageNameFilter;
}
}
getProcess(process){
const processKeys = Object.keys(process) || [];
return processKeys.length > 0 ? process[processKeys[0]] : {};
}
getButtonClass() {
if(this.props.orderInfo) {
return this.state.isSchedulingDisabled[this.props.orderInfo.id] ? 'schedule-inactive' : 'schedule-active';
@@ -198,7 +193,7 @@ class ProcessContainer extends Component {
getActiveView: this.getActiveView,
installationData: this.state
}}>
<OrderInfo totalPrice={this.calculatetTotalPrice(orderInfo.packages)} orderDetails={orderInfo} installationData={this.state}/>
<OrderInfo totalPrice={this.calculatetTotalPrice(orderInfo.packages, orderInfo.currency)} orderDetails={orderInfo} installationData={this.state}/>
</WiaasBox>
{
this.state.activeView !== 'info' &&
@@ -221,9 +216,10 @@ class ProcessContainer extends Component {
>
{
orderInfo.packages.filter(this.filterPackages).map(orderPackage =>
<ProcessPackage key={orderPackage.idPackage}
<ProcessPackage key={orderPackage.id}
onViewChange={this.onViewChange}
idCommercialLead={orderInfo.info.idCommercialLead}
idCommercialLead={orderInfo.commercialLead.id}
currency={orderInfo.currency}
orderPackage={orderPackage}/>
)
}
@@ -231,18 +227,18 @@ class ProcessContainer extends Component {
}
{
this.state.activeView === 'comments' &&
<OrderComments orderInfo={orderInfo.info} orderComments={orderInfo.orderComments} orderPackages={orderInfo.packages}/>
<OrderComments orderInfo={orderInfo} orderComments={orderInfo.comments} orderPackages={orderInfo.packages}/>
}
{
this.state.activeView === 'documents' &&
<OrderDocuments idOrder={orderInfo.info.id} />
<OrderDocuments idOrder={orderInfo.id} />
}
</div>
}
{
(orderInfo && !orderInfo.info && !isLoading) &&
(!orderInfo && !isLoading) &&
<div className="no-rigths">
{orderTexts.labels.NOT_AVAILABLE}!
</div>