verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 61 Releases Wiki Activity

added invoiceOut descriptor #377

Merged
carlosjr merged 5 commits from 2446-ticket_index_overlap_ref_and_state into dev 2020-09-14 14:41:21 +00:00
Conversation 0 Commits 5 Files Changed 3 +5 -4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f7a5b4bdce - Show all commits

9
print/core/config.js
View File

@ -13,14 +13,15 @@ let configFiles = [
];
for (let configFile of configFiles) {
const filePath = path.join(__dirname, configFile);
if (fs.existsSync(filePath)) {
const conf = require(filePath);
if (!configFile.includes(configPath))
configFile = path.join(__dirname, configFile);
if (fs.existsSync(configFile)) {
const conf = require(configFile);
for (let prop in conf)
Object.assign(config[prop], conf[prop]);
}
}
config.env = env;
module.exports = config;