This repository has been archived by the owner on Nov 26, 2021. It is now read-only.
Bank transactions #133
Merged
Bank transactions #133
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
with syntax error, unexpected '",i,"' (T_CONSTANT_ENCAPSED_STRING)
…ontroller This has broken the second stage of the upload, where it tries to call __approveMember() which is a private MembersController function This also breaks the related tests
Two of the test are broken, i think something to do with needing to mock the MembersController better but the code they test is due to rewire so note fixing them now
include update to Members/View so members can see the Payment history
Getting an odd error when running all controller test in one go Think its related to them not doing correct teardown/setup in between test as they all run ok individually Error: Call to undefined method Mock_CakeEmail_7ceb9ee0::from() File: /vagrant/app/Controller/AppController.php Line: 262
… missing SQL files
* rfid-test-reactivate-members-fix: Fix up MemberControler Test for new Rfid Tag field in formatted members info Update dataGenerator to make correct timestamps for raid tags Fix up MembersController from reactivate-members branch James had missed one call to __approveMember which needed extra param, but instead i've reworked __approveMember to get the param its self rather than need it passed in Fix Model Member Test (we can now approve members in state 6 as well as 4 Fixing up test with missing RfidTags Fixture # Conflicts: # app/Controller/MembersController.php # app/Test/Case/Controller/MembersControllerTest.php # app/Test/Case/Model/AccountTest.php # app/Test/Case/Model/MemberTest.php # app/Test/Case/Model/StatusTest.php
also missing update from 0.3.7 release Still lot of work TODO before ready: * Email accounts@ with list of any transactions from a cvs import that could not be matched to an account * Members audit, now cvs upload does not auto approve members need way to run an audit * Update setup to generate some bank_transaction data and also test bank CSV for upload in dev environment * work out how to expose uploadCsv and runMemberAudit to cron/curl/api (none login user) * lost of updates to Tests :(
Next up date math
* master: Update breadcrumbs for snackspace view and RFID tags view and a little more code clean up Adding quick view for door codes and wifi Part fix towards issue #9 Little more code clean up Add ability to reactivate cancelled pins for the current members Button only shows if Pin state is cancelled Membership Admin team have access, not Membership Team Needs CSS fixing as we can now display to many nav buttons across the bottom
…nsactions * commit 'f5eb59bfc37efb3bc02fb41166d04c3bcc31fca3': Fix typo in Members model Starting 0.4.1 # Conflicts: # app/Controller/AppController.php
| $authGranted = true; | ||
| } elseif ($this->Member->GroupsMember->isMemberInGroup( $memberId, Group::MEMBERSHIP_ADMIN )) { | ||
| // Only allow 'Full Access' (via parent::isAuthorized) and 'Membership Admins' to view the transaction history of others | ||
| $authGranted = true; |
There was a problem hiding this comment.
Need to review this, not sure I want membership team admins seeing how much everyone pays, should be reserved to trustees only
There was a problem hiding this comment.
going to leave the permission here but in the history view only show the last payment date for MemberAdmins
* master: Email template updates to move last few links into Meta RFID Typo Tools fix to save username to public Calendar but still show real name in HMS Fix #106 # Conflicts: # dev/Setup/Sql/hms_meta_data.sql
… for other members
Just fleshing out logic and table out still need to implement Model and then go clean up warned form Member model stuff
… to address format
* master: Fix test FormHelper::create action updates notEmpty -> not Blank String -> CakeText Update CakePHP lib to 2.8.4 # Conflicts: # app/Controller/MembersController.php # app/Model/FileUpload.php # app/Test/Case/Controller/MembersControllerTest.php
* master: Missing String -> CakeText
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ok so this is huge
HMS 0.5.0 adds automatic Members Audit including the introduction of emailing members with warning about the possible end of the membership and an email when its revokes
Still got a few things might add before this goes to merge
closes #25