search

RespectNetwork / csp-provisioning-application

MIT License
3 stars 6 forks source link

Apply cost overrides for gift card and dependent purchase flows #10

Closed lfielke closed 10 years ago

lfielke commented 10 years ago

Uses the verified phone number stored in SQL table signup_info to apply a cost override to gift code and dependent cloud name purchases. This means that these purchases will be charged at the same cost as their original purchase.

The override is queried at the start of the flow, then the actual currency and cost is stored in the session (regSession).

animeshc commented 10 years ago

Hi, Would it be possible for you to merge master to your branch and then create a pull request ? I've made some minor UI fixes and two one-line changes to PersonalCloudInviteController.java and PersonalCloudDependentController.java to fix the amount calculation. However I see that you've already taken care of the amount calculation in your change. So, you can disregard my amount calc. change in those two files. If you can do the merge, I can do the auto-merge from your pull request. Thanks, Animesh

On Thu, May 1, 2014 at 11:51 PM, Luke Fielke notifications@github.comwrote:

Uses the verified phone number stored in SQL table signup_info to apply a cost override to gift code and dependent cloud name purchases. This means that these purchases will be charged at the same cost as their original purchase.

The override is queried at the start of the flow, then the actual currency

and cost is stored in the session (regSession).

You can merge this Pull Request by running

git pull https://github.com/onexuscloud/csp-provisioning-application master

Or view, comment on, or merge it at:

https://github.com/RespectNetwork/csp-provisioning-application/pull/10 Commit Summary

  • Apply cost overrides for gift card and dependent purchase flows

File Changes

  • M src/main/java/net/respectnetwork/csp/application/controller/PersonalCloudController.javahttps://github.com/RespectNetwork/csp-provisioning-application/pull/10/files#diff-0(24)
  • M src/main/java/net/respectnetwork/csp/application/controller/PersonalCloudDependentController.javahttps://github.com/RespectNetwork/csp-provisioning-application/pull/10/files#diff-1(41)
  • M src/main/java/net/respectnetwork/csp/application/controller/PersonalCloudInviteController.javahttps://github.com/RespectNetwork/csp-provisioning-application/pull/10/files#diff-2(85)
  • M src/main/java/net/respectnetwork/csp/application/controller/RegistrationController.javahttps://github.com/RespectNetwork/csp-provisioning-application/pull/10/files#diff-3(73)
  • A src/main/java/net/respectnetwork/csp/application/csp/CurrencyCost.javahttps://github.com/RespectNetwork/csp-provisioning-application/pull/10/files#diff-4(50)
  • M src/main/webapp/WEB-INF/views/invite.htmlhttps://github.com/RespectNetwork/csp-provisioning-application/pull/10/files#diff-5(2)
  • M src/main/webapp/WEB-INF/views/inviteReview.htmlhttps://github.com/RespectNetwork/csp-provisioning-application/pull/10/files#diff-6(5)

Patch Links:

- https://github.com/RespectNetwork/csp-provisioning-application/pull/10.patch

https://github.com/RespectNetwork/csp-provisioning-application/pull/10.diff

— Reply to this email directly or view it on GitHubhttps://github.com/RespectNetwork/csp-provisioning-application/pull/10 .

lfielke commented 10 years ago

Hi Animesh, I've resolved the conflicts with your latest commit, it should merge cleanly now.