(#119-3)To make it look a bit more receipt like, table with EIN #250

ronaldblanco · 2017-09-27T22:14:10Z

#119 -3 To make it look a bit more receipt like, there could be another table as part of the donation receipt with the organization details and EIN number from general settings.
Solution tested locally and checked with lint command.

jspaine · 2017-09-28T09:54:21Z

I meant it should be part of the receipt placeholder. You can't edit tables with Quill and I'm not sure what'll happen if you insert one into the editor like that. What does it look like!?

ronaldblanco · 2017-09-28T12:25:07Z

In the console.log looks well (the same way that the other).
Or, Are you thinking in a new placeholder for the recipe?

jspaine · 2017-09-28T16:25:00Z

I mean what does it look like in the email editor?

I think it should be in the same placeholder as the receipt.

ronaldblanco · 2017-09-29T19:09:02Z

I will be checking.

ronaldblanco · 2017-09-29T21:07:57Z

Hey @jspaine check now, I did create a new placeholder I think it is a better solution (as I understand)
Let me know.

Thanks.

common/placeholders.js

@@ -10,6 +10,7 @@ const placeholders = [
  {id: 'url', label: 'Foodbank Website'},
  {id: 'clientIntakeNumber', label: 'Client Intake Number'},
  {id: 'supportNumber', label: 'Support Number'},
+  {id: 'EIN', label: 'EIN Number'},


server/models/settings.js

@@ -51,7 +51,7 @@ const SettingsSchema = new Schema({
  EIN: {
    type: String,
    trim: true,
-    default: ''
+    default: '0'


common/placeholders.js

+  let head = ['Foodbank Name','Foodbank Address','Foodbank Website','Client Intake Number', 'Support Number','EIN Number']
+  let tableFinal = `<table>`
+  for (let i = 0; i < 6; i++) {
+    tableFinal += `<tr><td><p>"${head[i]}":</p></td><td><p>"${placeholders[i]}"</p></td></tr>`


server/models/settings.js

@@ -51,7 +51,7 @@ const SettingsSchema = new Schema({
  EIN: {


ronaldblanco · 2017-10-02T20:50:43Z

Hello @jspaine; check now, I did left the ein default: '0' because the ein placeholder have problems with an empty string.

jspaine

Looks good!

server/lib/mail/mail-generator.js

  const id = getAttr(node, 'data-id')
  const placeholder = placeholders.find(pl => pl.id === id)

+  //Receipt Placeholder only
+  if (id === 'receipt') {


common/placeholders.js

@@ -40,6 +41,13 @@ const placeholders = [
    required: true,


ronaldblanco · 2017-10-03T14:00:24Z

Check now and let me know!!

server/lib/mail/mail-generator.js

  const id = getAttr(node, 'data-id')
  const placeholder = placeholders.find(pl => pl.id === id)

+  //Receipt Placeholder only
+  if (id === 'receipt') {


common/placeholders.js

-    tableFinal += `<tr><td><p>"${value[i].name}"</p></td><td><p>"${value[i].value}"</p></td></tr>`
-    total += value[i].value
+  for (let i = 0; i < items.length; i++) {
+    table += `<tr><td><p>"${items[i].name}"</p></td><td><p>"${items[i].value}"</p></td></tr>`


common/placeholders.js

@@ -40,6 +41,13 @@ const placeholders = [
    required: true,


jspaine · 2017-10-03T21:39:18Z

What was the problem with the ein field being an empty string by default?

ronaldblanco · 2017-10-03T22:04:45Z

When ein = "" the placeholder ein does not return, it give a problem of "No placeholder with that id" or something like that.
I thing that have to be with the mail-generator.js, some validation missing.

ronaldblanco · 2017-10-03T22:07:32Z

OK, I will be checking the rest you told me.

jspaine · 2017-10-03T22:13:03Z

Ah I think it's line 89 in the mail generator:

if (!bindings[id] && placeholder.type !== placeholderTypes.ATTACHMENT)

should probably be:

// import {isUndefined} from 'lodash'
if (isUndefined(bindings[id]) && placeholder.type !== placeholderTypes.ATTACHMENT)

ronaldblanco · 2017-10-04T13:53:05Z

You were right with the correction on line 89.
Check now and let me know.

jspaine

Yeah it looks good!

common/placeholders.js

-    tableFinal += `<tr><td><p>"${value[i].name}"</p></td><td><p>"${value[i].value}"</p></td></tr>`
-    total += value[i].value
+  for (let i = 0; i < items.length; i++) {
+    table += `<tr><td><p>"${items[i].name}"</p></td><td><p>"${items[i].value}"</p></td></tr>`


…th EIN

ronaldblanco · 2017-10-04T16:14:01Z

Ready.

jspaine · 2017-10-04T18:03:03Z

Thanks!

ronaldblanco force-pushed the fix/119#3 branch from 2815125 to c4eda1a Compare September 29, 2017 21:03

jspaine reviewed Sep 30, 2017

View reviewed changes

server/models/settings.js Outdated

@@ -51,7 +51,7 @@ const SettingsSchema = new Schema({

EIN: {

This comment was marked as off-topic.

Sign in to view

ronaldblanco force-pushed the fix/119#3 branch from 8a27330 to c6ad08e Compare October 2, 2017 20:46

jspaine reviewed Oct 3, 2017

View reviewed changes

ronaldblanco force-pushed the fix/119#3 branch from c6ad08e to 29e8680 Compare October 3, 2017 13:59

jspaine reviewed Oct 3, 2017

View reviewed changes

ronaldblanco force-pushed the fix/119#3 branch from 29e8680 to fe4bc4a Compare October 4, 2017 13:49

jspaine reviewed Oct 4, 2017

View reviewed changes

(freeCodeCamp#119-3)To make it look a bit more receipt like, table wi…

fcf8c70

…th EIN

ronaldblanco force-pushed the fix/119#3 branch from fe4bc4a to fcf8c70 Compare October 4, 2017 16:13

jspaine merged commit 0cc56e5 into freeCodeCamp:staging Oct 4, 2017

ronaldblanco deleted the fix/119#3 branch December 6, 2017 14:39

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

(#119-3)To make it look a bit more receipt like, table with EIN #250

(#119-3)To make it look a bit more receipt like, table with EIN #250

ronaldblanco commented Sep 27, 2017

jspaine commented Sep 28, 2017

ronaldblanco commented Sep 28, 2017 •

edited

Loading

jspaine commented Sep 28, 2017

ronaldblanco commented Sep 29, 2017

ronaldblanco commented Sep 29, 2017

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

ronaldblanco commented Oct 2, 2017

jspaine left a comment

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

ronaldblanco commented Oct 3, 2017

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

jspaine commented Oct 3, 2017

ronaldblanco commented Oct 3, 2017

ronaldblanco commented Oct 3, 2017

jspaine commented Oct 3, 2017

ronaldblanco commented Oct 4, 2017

jspaine left a comment

This comment was marked as off-topic.

ronaldblanco commented Oct 4, 2017

jspaine commented Oct 4, 2017

(#119-3)To make it look a bit more receipt like, table with EIN #250

(#119-3)To make it look a bit more receipt like, table with EIN #250

Conversation

ronaldblanco commented Sep 27, 2017

jspaine commented Sep 28, 2017

ronaldblanco commented Sep 28, 2017 • edited Loading

jspaine commented Sep 28, 2017

ronaldblanco commented Sep 29, 2017

ronaldblanco commented Sep 29, 2017

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

ronaldblanco commented Oct 2, 2017

jspaine left a comment

Choose a reason for hiding this comment

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

ronaldblanco commented Oct 3, 2017

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

jspaine commented Oct 3, 2017

ronaldblanco commented Oct 3, 2017

ronaldblanco commented Oct 3, 2017

jspaine commented Oct 3, 2017

ronaldblanco commented Oct 4, 2017

jspaine left a comment

Choose a reason for hiding this comment

This comment was marked as off-topic.

ronaldblanco commented Oct 4, 2017

jspaine commented Oct 4, 2017

ronaldblanco commented Sep 28, 2017 •

edited

Loading