Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes issue #29 and allows optional fields to be omitted during object creation #30

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions lib/batch/control.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
const utils = require('../utils')

module.exports = {
recordTypeCode: {
name: 'Record Type Code',
Expand Down Expand Up @@ -70,7 +72,7 @@ module.exports = {
required: false,
type: 'alphanumeric',
blank: true,
value: ''
value: utils.SPACE.repeat(19)
},

reserved: {
Expand All @@ -80,7 +82,7 @@ module.exports = {
required: false,
type: 'alphanumeric',
blank: true,
value: ''
value: utils.SPACE.repeat(6)
},

originatingDFI: {
Expand Down
8 changes: 5 additions & 3 deletions lib/batch/header.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
const utils = require('../utils')

module.exports = {
recordTypeCode: {
name: 'Record Type Code',
Expand Down Expand Up @@ -33,7 +35,7 @@ module.exports = {
required: false,
type: 'alphanumeric',
blank: true,
value: ''
value: utils.SPACE.repeat(20)
},

companyIdentification: {
Expand Down Expand Up @@ -69,7 +71,7 @@ module.exports = {
position: 8,
required: false,
type: 'alphanumeric',
value: ''
value: utils.SPACE.repeat(6)
},

effectiveEntryDate: {
Expand All @@ -88,7 +90,7 @@ module.exports = {
required: false,
type: 'numeric',
blank: true,
value: ''
value: utils.SPACE.repeat(3)
},

originatorStatusCode: {
Expand Down
6 changes: 4 additions & 2 deletions lib/entry-addenda/fields.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
const utils = require('../utils');

module.exports = {
recordTypeCode: {
name: 'Record Type Code',
Expand All @@ -14,7 +16,7 @@ module.exports = {
position: 2,
required: true,
type: 'numeric',
value: '05'
value: '05'
},

paymentRelatedInformation: {
Expand All @@ -23,7 +25,7 @@ module.exports = {
position: 3,
required: false,
type: 'alphanumeric',
value: ''
value: utils.SPACE.repeat(80)
},

addendaSequenceNumber: {
Expand Down
6 changes: 4 additions & 2 deletions lib/entry/fields.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
const utils = require('../utils');

module.exports = {
recordTypeCode: {
name: 'Record Type Code',
Expand Down Expand Up @@ -59,7 +61,7 @@ module.exports = {
position: 7,
required: false,
type: 'alphanumeric',
value: ''
value: utils.SPACE.repeat(15)
},

individualName: {
Expand All @@ -77,7 +79,7 @@ module.exports = {
position: 9,
required: false,
type: 'alphanumeric',
value: '',
value: utils.SPACE.repeat(2)
},

addendaId: {
Expand Down
2 changes: 1 addition & 1 deletion lib/error.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ var nACHError = function(errorObj) {
nACHError.prototype = Object.create(Error.prototype);
nACHError.prototype.constructor = nACHError;

module.exports = nACHError;
module.exports = nACHError;
2 changes: 1 addition & 1 deletion lib/file/control.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,4 @@ module.exports = {
blank: true,
value: ''
}
};
};
217 changes: 107 additions & 110 deletions lib/file/header.js
Original file line number Diff line number Diff line change
@@ -1,125 +1,122 @@
var utils = require('../utils');

// The date/time defaults are dynamic, so always create a new object
module.exports = function () {
return {
recordTypeCode: {
name: 'Record Type Code',
width: 1,
position: 1,
required: true,
type: 'numeric',
value: '1'
},
module.exports = {
recordTypeCode: {
name: 'Record Type Code',
width: 1,
position: 1,
required: true,
type: 'numeric',
value: '1'
},

priorityCode: {
name: 'Priority Code',
width: 2,
position: 2,
required: true,
type: 'numeric',
value: '01'
},
priorityCode: {
name: 'Priority Code',
width: 2,
position: 2,
required: true,
type: 'numeric',
value: '01'
},

immediateDestination: {
name: 'Immediate Destination',
width: 10,
position: 3,
required: true,
type: 'ABA',
paddingChar: ' ',
value: ''
},
immediateDestination: {
name: 'Immediate Destination',
width: 10,
position: 3,
required: true,
type: 'ABA',
paddingChar: ' ',
value: ''
},

immediateOrigin: {
name: 'Immediate Origin',
width: 10,
position: 4,
required: true,
type: 'numeric',
paddingChar: ' ',
value: ''
},
immediateOrigin: {
name: 'Immediate Origin',
width: 10,
position: 4,
required: true,
type: 'numeric',
paddingChar: ' ',
value: ''
},

fileCreationDate: {
name: 'File Creation Date',
width: 6,
position: 5,
required: true,
type: 'numeric',
value: utils.formatDate(new Date())
},
fileCreationDate: {
name: 'File Creation Date',
width: 6,
position: 5,
required: true,
type: 'numeric',
value: utils.formatDate(new Date())
},

fileCreationTime: {
name: 'File Creation Time',
width: 4,
position: 6,
required: true,
type: 'numeric',
value: utils.formatTime(new Date())
},
fileCreationTime: {
name: 'File Creation Time',
width: 4,
position: 6,
required: true,
type: 'numeric',
value: utils.formatTime(new Date())
},

fileIdModifier: {
name: 'File Modifier',
width: 1,
position: 7,
required: true,
type: 'alphanumeric',
value: 'A'
},
fileIdModifier: {
name: 'File Modifier',
width: 1,
position: 7,
required: true,
type: 'alphanumeric',
value: 'A'
},

recordSize: {
name: 'Record Size',
width: 3,
position: 8,
type: 'numeric',
required: true,
value: '094'
},
recordSize: {
name: 'Record Size',
width: 3,
position: 8,
type: 'numeric',
required: true,
value: '094'
},

blockingFactor: {
name: 'Blocking Factor',
width: 2,
position: 9,
type: 'numeric',
required: true,
value: '10'
},
blockingFactor: {
name: 'Blocking Factor',
width: 2,
position: 9,
type: 'numeric',
required: true,
value: '10'
},

formatCode: {
name: 'Format Code',
width: 1,
position: 10,
required: true,
type: 'numeric',
value: '1'
},
formatCode: {
name: 'Format Code',
width: 1,
position: 10,
required: true,
type: 'numeric',
value: '1'
},

immediateDestinationName: {
name: 'Immediate Destination Name',
width: 23,
position: 11,
required: true,
type: 'alphanumeric',
value: ''
},
immediateDestinationName: {
name: 'Immediate Destination Name',
width: 23,
position: 11,
required: true,
type: 'alphanumeric',
value: ''
},

immediateOriginName: {
name: 'Immediate Origin Name',
width: 23,
position: 12,
required: true,
type: 'alphanumeric',
value: ''
},
immediateOriginName: {
name: 'Immediate Origin Name',
width: 23,
position: 12,
required: true,
type: 'alphanumeric',
value: ''
},

referenceCode: {
name: 'Reference Code',
width: 8,
position: 13,
required: true,
type: 'alphanumeric',
value: ''
}
};
referenceCode: {
name: 'Reference Code',
width: 8,
position: 13,
required: false,
type: 'alphanumeric',
value: utils.SPACE.repeat(8)
}
};
4 changes: 2 additions & 2 deletions lib/file/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function File(options) {
this._batches = [];

// Allow the batch header/control defaults to be overriden if provided
this.header = options.header ? _.merge(options.header, require('./header')(), _.defaults) : require('./header')();
this.header = options.header ? _.merge(options.header, require('./header'), _.defaults) : _.cloneDeep(require('./header'));
this.control = options.control ? _.merge(options.header, require('./control'), _.defaults) : _.cloneDeep(require('./control'));

// Configure high-level overrides (these override the low-level settings if provided)
Expand Down Expand Up @@ -183,4 +183,4 @@ File.prototype.generateFile = function(cb) {
});
};

module.exports = File;
module.exports = File;
4 changes: 3 additions & 1 deletion lib/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ var _ = require('lodash');
var moment = require('moment');
var nACHError = require('./error');
var counter = 0;
const SPACE = " ";

// Pad a given string to a fixed width using any character or number (defaults to one blank space)
// Both a string and width are required params for this function, but it also takes two optional
Expand Down Expand Up @@ -157,4 +158,5 @@ module.exports.getNextMultiple = getNextMultiple;
module.exports.overrideLowLevel = overrideLowLevel;
module.exports.computeCheckDigit = computeCheckDigit;
module.exports.computeBusinessDay = computeBusinessDay;
module.exports.getNextMultipleDiff = getNextMultipleDiff;
module.exports.getNextMultipleDiff = getNextMultipleDiff;
module.exports.SPACE = SPACE;
Loading