Payment set fee #670

tangollama · 2016-09-24T23:47:55Z

Addresses #35 by adding a new field to payment profiles, considering it (and amountDiscount) in the calculation of Invoices as well as finally creating some tests for payment profiles.

For your consider mr. @jkleinsc

jkleinsc

@tangollama there are JSCS (formatting) errors that need to be cleared up before this PR can be accepted. Also, can you merge in the latest from master?

jkleinsc · 2016-09-29T13:40:39Z

tests/acceptance/invoices-test.js

@@ -66,6 +66,57 @@ test('print invoice', function(assert) {
  });
 });

+//test pricing profile


@tangollama your code is throwing JSCS (formatting) errors on test. You can verify these yourself by running ember test:

acceptance/invoices-test.js should pass jscs. requireSpaceAfterLineComment: Missing space after line comment at acceptance/invoices-test.js : 67 |}); 68 | 69 |//test pricing profile -------------------^ 70 |test('pricing profiles', function(assert) { 71 | runWithPouchDump('billing', function() { requireSpaceAfterLineComment: Missing space after line comment at acceptance/invoices-test.js : 77 | waitToAppear('h4:contains(New Pricing Profile)'); 78 | }); 79 | //% discount ------------------^ 80 | andThen(function() { 81 | fillIn('.pricing-profile-name input', '50% profile'); disallowTrailingWhitespace: Illegal trailing whitespace at acceptance/invoices-test.js : 80 | andThen(function() { 81 | fillIn('.pricing-profile-name input', '50% profile'); 82 | fillIn('.pricing-profile-percentage input', '50'); ----------------------------------------------------------------^ 83 | click('button:contains(Add)'); 84 | waitToAppear('button:contains(Ok)'); requireSpacesInFunction: Missing space before opening curly brace at acceptance/invoices-test.js : 85 | click('button:contains(Ok)'); 86 | }); 87 | andThen(function(){ ------------------------------^ 88 | click('button:contains(+ new item)'); 89 | waitToAppear('h4:contains(New Pricing Profile)'); requireSpaceBeforeBlockStatements: One (or more) spaces required before opening brace for block expressions at acceptance/invoices-test.js : 85 | click('button:contains(Ok)'); 86 | }); 87 | andThen(function(){ ------------------------------^ 88 | click('button:contains(+ new item)'); 89 | waitToAppear('h4:contains(New Pricing Profile)'); requireSpaceAfterLineComment: Missing space after line comment at acceptance/invoices-test.js : 89 | waitToAppear('h4:contains(New Pricing Profile)'); 90 | }); 91 | //flat discount --------------------^ 92 | andThen(function() { 93 | fillIn('.pricing-profile-name input', '$100 discount'); disallowTrailingWhitespace: Illegal trailing whitespace at acceptance/invoices-test.js : 92 | andThen(function() { 93 | fillIn('.pricing-profile-name input', '$100 discount'); 94 | fillIn('.pricing-profile-discount input', '100'); ---------------------------------------------------------------^ 95 | click('button:contains(Add)'); 96 | waitToAppear('button:contains(Ok)'); requireSpaceBeforeBlockStatements: One (or more) spaces required before opening brace for block expressions at acceptance/invoices-test.js : 97 | click('button:contains(Ok)'); 98 | }); 99 | andThen(function(){ ------------------------------^ 100 | click('button:contains(+ new item)'); 101 | waitToAppear('h4:contains(New Pricing Profile)'); requireSpacesInFunction: Missing space before opening curly brace at acceptance/invoices-test.js : 97 | click('button:contains(Ok)'); 98 | }); 99 | andThen(function(){ ------------------------------^ 100 | click('button:contains(+ new item)'); 101 | waitToAppear('h4:contains(New Pricing Profile)'); requireSpaceAfterLineComment: Missing space after line comment at acceptance/invoices-test.js : 101 | waitToAppear('h4:contains(New Pricing Profile)'); 102 | }); 103 | //flat fee -----------------^ 104 | andThen(function() { 105 | fillIn('.pricing-profile-name input', '$150 fee'); disallowTrailingWhitespace: Illegal trailing whitespace at acceptance/invoices-test.js : 104 | andThen(function() { 105 | fillIn('.pricing-profile-name input', '$150 fee'); 106 | fillIn('.pricing-set-fee input', '150'); ------------------------------------------------------^ 107 | click('button:contains(Add)'); 108 | waitToAppear('button:contains(Ok)'); Log: |

jkleinsc · 2016-09-29T13:42:14Z

app/models/price-profile.js

@@ -19,6 +20,11 @@ export default AbstractModel.extend({
      numericality: {
        allowBlank: true
      }
-    }
+    },


Travis is failing tests due to formatting issues. Please run ember test to check the formatting issues locally.

not ok 736 Chrome 53.0 - JSCS - models/price-profile.js: should pass jscs --- actual: > false expected: > true stack: > at Object.<anonymous> (http://localhost:7357/assets/tests.js:25353:12) at runTest (http://localhost:7357/assets/test-support.js:2995:28) at Object.run (http://localhost:7357/assets/test-support.js:2980:4) at http://localhost:7357/assets/test-support.js:3143:11 at process (http://localhost:7357/assets/test-support.js:2819:24) at begin (http://localhost:7357/assets/test-support.js:2801:2) message: > models/price-profile.js should pass jscs. disallowTrailingWhitespace: Illegal trailing whitespace at models/price-profile.js : 26 | allowBlank: true 27 | } 28 | } -------------^ 29 | } 30 |}); Log: |

# Conflicts: # app/models/invoice.js # app/pricing/profiles/edit/template.hbs

# Conflicts: # app/locales/en/translations.js

… the setFee

tangollama · 2017-03-29T03:36:04Z

@jkleinsc in an effort to close out old PR's, I made some corrections here. If this checks out with Travis, I recommend that we move this PR into master.

…tend into payment-set-fee

jkleinsc

@tangollama thanks for the PR. There are a couple minor tweaks needed to move this forward.

jkleinsc · 2017-03-29T20:20:30Z

app/locales/en/translations.js

@@ -362,6 +362,7 @@ export default {
    }
  },
  labels: {
+    currency_symbol: '$',


this label is unused and also doesn't following naming standards. Should be currencySymbol (if it was used).

jkleinsc · 2017-03-29T20:21:15Z

app/locales/en/translations.js

@@ -385,6 +386,7 @@ export default {
    action: 'Action',
    notes: 'Notes',
    edit: 'Edit',
+    expense_to: 'Expense To',


This label should be expenseTo, not expense_to

jkleinsc · 2017-03-29T20:21:50Z

app/locales/en/translations.js

      discountAmount: 'Discount Amount',
      discountPercentage: 'Discount Percentage'
+    },
+    messages: {
+      flatFeeMsg: 'There is a flat fee for patient financial responsibility of {{currency}}{{setFee}}.',


Looks like currency and currency_symbol are the same thing?

jkleinsc · 2017-03-29T20:23:46Z

app/models/invoice.js

@@ -98,6 +98,26 @@ export default AbstractModel.extend(DateFormat, NumberFormat, {

  patientResponsibilityTotals: Ember.computed.mapBy('lineItems', 'amountOwed'),
  patientResponsibility: Ember.computed.sum('patientResponsibilityTotals'),
+  finalPatientResponsibility: function() {


Use

finalPatientResponsibility: computed('patientResponsibility', 'paymentProfile', function() { ... })

instead of

finalPatientResponsibility: function() { ... }.property('patientResponsibility', 'paymentProfile'),

jkleinsc · 2017-03-29T20:24:19Z

app/pricing/profiles/edit/template.hbs

@@ -7,5 +7,6 @@
    {{em-input property="name" label="Name" class="required pricing-profile-name"}}
    {{number-input property="discountPercentage" label="Discount Percentage" class="pricing-profile-percentage"}}
    {{number-input property="discountAmount" label="Discount Amount" class="pricing-profile-discount"}}
+    {{em-input property="setFee" label="Set Fee" class="pricing-set-fee"}}


label="Set Fee"

should be localized

# Conflicts: # app/locales/en/translations.js

tangollama · 2017-04-23T18:22:12Z

Attaching screen shots.

@jkleinsc

Addressing the noted issues by @jkleinsc in PR #670. I can’t believe I missed the translations.

tangollama

This has been satisfied. I need someone else to approve.

tangollama added 5 commits September 24, 2016 12:00

Adding set fee to payment profiles

7b90609

Missing translation strings

0e61aed

acceptance tests for payment profiles authored

b97ef16

calculate the finalPatientResponsibility

ea76fd5

finalPatientResponsibility and related translations

b6cd465

jkleinsc suggested changes Sep 29, 2016

View reviewed changes

tangollama added 6 commits January 10, 2017 15:22

Merge branch 'master' into payment-set-fee

2d01465

# Conflicts: # app/models/invoice.js # app/pricing/profiles/edit/template.hbs

resolving code style and formatting errors

a3ce0ff

Merge branch 'master' into payment-set-fee

6f165e9

code formatting corrections

5a4a074

Merge branch 'master' into payment-set-fee

d6f7530

# Conflicts: # app/locales/en/translations.js

Ensuring that the patient responsibility and grand total both reflect…

00acd84

… the setFee

jkleinsc added 3 commits March 29, 2017 12:49

Merge branch 'master' into payment-set-fee

344130a

Merge branch 'master' into payment-set-fee

abc6494

Merge branch 'payment-set-fee' of https://github.com/HospitalRun/fron…

2e0726a

…tend into payment-set-fee

jkleinsc suggested changes Mar 29, 2017

View reviewed changes

tangollama added 4 commits April 19, 2017 16:03

Merge branch 'master' into payment-set-fee

949e56d

# Conflicts: # app/locales/en/translations.js

fixing the billing messages

73e3fd8

Merge branch 'master' into payment-set-fee

c3421fe

Addressing a missing translation that was causing a test to fail.

d2fcc81

tangollama added 2 commits April 26, 2017 07:51

Addressing requested changes by @jkleinsc

23ec472

Addressing the noted issues by @jkleinsc in PR #670. I can’t believe I missed the translations.

Merge branch 'master' into payment-set-fee

1f0bd57

tangollama commented Apr 26, 2017

View reviewed changes

jkleinsc approved these changes Apr 26, 2017

View reviewed changes

jkleinsc merged commit 49de1a0 into master Apr 26, 2017

stukalin deleted the payment-set-fee branch August 29, 2018 07:50

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Payment set fee #670

Payment set fee #670

tangollama commented Sep 24, 2016

jkleinsc left a comment

jkleinsc Sep 29, 2016

jkleinsc Sep 29, 2016

tangollama commented Mar 29, 2017

jkleinsc left a comment

jkleinsc Mar 29, 2017

jkleinsc Mar 29, 2017

jkleinsc Mar 29, 2017

jkleinsc Mar 29, 2017

jkleinsc Mar 29, 2017

tangollama commented Apr 23, 2017

tangollama left a comment

Payment set fee #670

Payment set fee #670

Conversation

tangollama commented Sep 24, 2016

jkleinsc left a comment

Choose a reason for hiding this comment

jkleinsc Sep 29, 2016

Choose a reason for hiding this comment

jkleinsc Sep 29, 2016

Choose a reason for hiding this comment

tangollama commented Mar 29, 2017

jkleinsc left a comment

Choose a reason for hiding this comment

jkleinsc Mar 29, 2017

Choose a reason for hiding this comment

jkleinsc Mar 29, 2017

Choose a reason for hiding this comment

jkleinsc Mar 29, 2017

Choose a reason for hiding this comment

jkleinsc Mar 29, 2017

Choose a reason for hiding this comment

jkleinsc Mar 29, 2017

Choose a reason for hiding this comment

tangollama commented Apr 23, 2017

tangollama left a comment

Choose a reason for hiding this comment