Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in
concrexit
concrexit
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 70
    • Issues 70
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 10
    • Merge Requests 10
  • Operations
    • Operations
    • Incidents
  • Analytics
    • Analytics
    • Repository
    • Value Stream
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Commits
  • Issue Boards
  • thalia
  • concrexitconcrexit
  • Merge Requests
  • !1421

Closed
Opened Nov 13, 2019 by Job Doesburg@jdoesburgContributor
  • Report abuse
Report abuse

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b "thalia-pay-for-renewals" "origin/thalia-pay-for-renewals"

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "master"
git merge --no-ff "thalia-pay-for-renewals"

Step 4. Push the result of the merge to GitLab

git push origin "master"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Thalia pay for renewals

  • Overview 6
  • Commits 14
  • Changes 9

Closes #939

Short description

Membership renewals can now be paid with Thalia Pay

Steps to use this feature

  1. Set Thalia Pay to True in /website/thaliawebsite/settings/settings.py
  2. Make a renewal request. The memberships overview page will now show the status of the latest renewal request.
  3. If the request is accepted, the email will contain new instructions and the memberships overview page will show a Thalia Pay button.
  4. Pay with Thalia Pay.
Edited Nov 20, 2019 by Job Doesburg
Assignee
Assign to
31
Milestone
31
Assign milestone
Time tracking
Reference: thalia/concrexit!1421
Source branch: thalia-pay-for-renewals