Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Backend - Engine
Minds Backend - Engine
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 241
    • Issues 241
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 30
    • Merge Requests 30
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Packages
    • Packages
    • List
    • Container Registry
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Minds
  • Minds Backend - EngineMinds Backend - Engine
  • Merge Requests
  • !254

Open
Opened 1 month ago by Mark Harding@markeharding
  • Report abuse
Report abuse

&37 - Multi-currency

Depends on front!508

Edited 18 minutes ago by Mark Harding

Check out, review, and merge locally

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

git fetch origin
git checkout -b epic/37-wire origin/epic/37-wire

Step 2. Review the changes locally

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

git fetch origin
git checkout origin/master
git merge --no-ff epic/37-wire

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.

Request to merge epic/37-wire into master
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #78666971 passed for f1f6cc1c on epic/37-wire
          Requires 2 more approvals from Devs.
          Brian Hatchet
          Brian Hatchet
          Marcelo Rivera
          Marcelo Rivera
          Emiliano Balbuena
          Emiliano Balbuena
          Rami Albatal
          Rami Albatal
          Martin Santangelo
          Martin Santangelo
          Ready to be merged automatically. Ask someone with write access to this repository to merge this request

          Deletes source branch

          • Discussion 1
          • Commits 10
          • Pipelines 15
          • Changes 64
          0/1 thread resolved
          • Loading...
          • Mark Harding @markeharding added MR::Requires Changes scoped label 1 month ago

            added MR::Requires Changes scoped label

          • Mark Harding @markeharding added 1 commit 1 month ago

            added 1 commit

            • 6247063d - (chore): increase upload limit

            Compare with previous version

          • Mark Harding @markeharding added 24 commits 1 month ago

            added 24 commits

            • 31775e64 - (refactor): support hydrating the first batch of entities
            • c490a207 - (chore): increase price to 1.25
            • b8e8318e - (fix): onchain wire notifications now trigger
            • fec067c2 - (feat): Retry queue for ElasticSearch
            • 61b2956a - (feat): feed fixes including pinned posts for containers
            • 4a65cc9f - (fix): failing spec tests
            • 8f6ba21b - (fix): if no hydrated entities don't return entities
            • 48d61f9d - (chore) crushing cockroach and cleaning up installer
            • ac2d0e9f - Feat/email schema 187
            • e4218a4e - (feat): whitehouse email template
            • 1b6f465d - (feat): Client uploader
            • fbc655fb - sprint/InterestingIguana: Blocked users can no longer send you a wire transactions #608 (closed)
            • 0f3c1f46 - (chore): If mobile app then return generic urn
            • 1c7c67cb - (fix): if faux activities then cast as such
            • 12928e86 - (fix): reverse pinned posts array
            • d1c86abe - (feat): transcoder now only listens for single message
            • 6819a904 - (fix): 500 error on firehose
            • 0e8b04fb - (fix): map to the entity
            • 7c9aeeb4 - (fix): failing tests for firehose
            • 941e6f9e - InterestingIguana Fixed blog edits not saving #593 (closed)
            • 9026f4d1 - Resolve "(bug): publishing a blog that was saved as a draft or "unlisted" does...
            • 0b951a37 - (fix): ensure arrays are sent to tags and not objects
            • df35a293 - (fix): decode search query
            • bf4cb175 - Sprint/InterestingIguana Add GitLab to settings example

            Compare with previous version

            Toggle commit list
          • Mark Harding @markeharding added 1 commit 1 month ago

            added 1 commit

            • de39c72f - (refactor): Add new Stripe Managers and refactor Wire to be abstracted from Paywall

            Compare with previous version

          • Mark Harding @markeharding added 4 commits 1 month ago

            added 4 commits

            • 2ba461cf - (fix): export account not merchant
            • 959d2470 - (fix): set API key for stripe OO instances
            • 1c39ee43 - (fix): minor patches to stripe connect module
            • d4433729 - (fix): pass arguments not array

            Compare with previous version

            Toggle commit list
          • Mark Harding @markeharding added Squad::Blue scoped label 1 month ago

            added Squad::Blue scoped label

          • Mark Harding @markeharding added 1 commit 1 month ago

            added 1 commit

            • c2099aa6 - (feat): working stripe with wire

            Compare with previous version

          • Mark Harding @markeharding added 70 commits 1 month ago

            added 70 commits

            • c2099aa6...0abf1410 - 68 commits from branch master
            • 5d80ca91 - (chore): bump stripe version
            • a852d273 - Merge branch 'master' of gitlab.com:minds/engine into epic/37-wire

            Compare with previous version

          • Mark Harding @markeharding added 1 commit 1 month ago

            added 1 commit

            • 78cfd1bc - (wip): Stripe wire changes

            Compare with previous version

          • Olivia Madrid @omadrid marked the task ERC-20's as completed 1 month ago

            marked the task ERC-20's as completed

          • Olivia Madrid @omadrid marked the task ERC-20's as incomplete 1 month ago

            marked the task ERC-20's as incomplete

          • Mark Harding @markeharding added 2 commits 1 week ago

            added 2 commits

            • aaa7ba14 - (feat): wire emails support multiple currencies
            • 5b753d1c - (feat): btc support

            Compare with previous version

          • Mark Harding @markeharding added 1 commit 1 week ago

            added 1 commit

            • 9658b9c8 - (chore): bump up composer

            Compare with previous version

          • Mark Harding @markeharding added 1 commit 1 week ago

            added 1 commit

            • 4ef022e1 - (fix): resolve backend tests for new wire features

            Compare with previous version

          • Mark Harding @markeharding mentioned in merge request front!508 6 days ago

            mentioned in merge request front!508

          • Mark Harding @markeharding changed the description 6 days ago

            changed the description

          • Mark Harding @markeharding added 76 commits 4 days ago

            added 76 commits

            • 4ef022e1...c1dac85a - 75 commits from branch master
            • 5b1950ec - Merge branch 'master' of gitlab.com:minds/engine into epic/37-wire-redux

            Compare with previous version

          • Mark Harding @markeharding added 1 commit 4 days ago

            added 1 commit

            • e091b442 - Merge branch 'master' of gitlab.com:minds/engine into epic/37-wire-redux

            Compare with previous version

          • Mark Harding @markeharding added 1 commit 1 hour ago

            added 1 commit

            • 31fdb7fc - (fix): email issues with wire, and other patches

            Compare with previous version

          • Mark Harding @markeharding added 9 commits 1 hour ago

            added 9 commits

            • 31fdb7fc...8e6942b6 - 6 commits from branch master
            • 710463c4 - (chore): lint project before merge with master
            • ff29e70c - Merge branch 'master' of gitlab.com:minds/engine into epic/37-wire
            • f1f6cc1c - (fix): failing tests

            Compare with previous version

            Toggle commit list
          • Mark Harding @markeharding unmarked as a Work In Progress 18 minutes ago

            unmarked as a Work In Progress

          • Brian Hatchet
            Brian Hatchet :speech_balloon: @brianhatchet started a thread on the diff 9 minutes ago
            Controllers/api/v2/payments/stripe/paymentmethods.php
            21 $paymentMethodsManager = new Stripe\PaymentMethods\Manager();
            22 $paymentMethods = $paymentMethodsManager->getList([
            23 'limit' => 12,
            24 'user_guid' => $user->getGuid(),
            25 ]);
            26
            27 return Factory::response([
            28 'paymentmethods' => Factory::exportable($paymentMethods),
            29 ]);
            30 }
            31
            32 public function post($pages)
            33 {
            34 $user = Session::getLoggedInUser();
            35 switch ($pages[0]) {
            36 case 'apply':
            • Brian Hatchet
              Brian Hatchet :speech_balloon: @brianhatchet · 9 minutes ago
              Developer

              This isn't really RESTful and these switch statements on methods create the newsfeed/ switch monstrosities. If we POST to payment methods, we should be creating a payment method and the PUT should replace the resource by intent ID.

              Granted, we have a lot of refactoring to do with the new routers, but this is a green field endpoint so it might be a good place to get more RESTful.

            • Please register or sign in to reply
          • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
          Please register or sign in to reply
          0 Assignees
          None
          Assign to
          None
          Milestone
          None
          Assign milestone
          None
          Time tracking
          No estimate or time spent
          2
          Labels
          MR::Requires Changes Squad::Blue
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          8
          8 participants
          user avatar
          Brian Hatchet
          user avatar
          Marcelo Rivera
          user avatar
          Emiliano Balbuena
          user avatar
          Rami Albatal
          user avatar
          Martin Santangelo
          user avatar
          Ben Hayward
          user avatar
          Mark Harding
          Reference: minds/engine!254