Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#253 Contributor stripe dashboard opens in a new tab. #281

Merged
merged 2 commits into from
Dec 23, 2020
Merged

#253 Contributor stripe dashboard opens in a new tab. #281

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb580c1
#253 Contributor stripe dashboard opens in a new tab.
criske Dec 19, 2020
bd9bdd4
#253 Contributor stripe dashboard opens in a new tab.
criske Dec 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/main/resources/public/js/getAndAddContracts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
* but this a good practice since "$" is not "reserved" to jQuery.
* Now "$" is just a function argument name and not the jQuery
* alias anymore. It could named "foo" fo ex, thus making a call like foo("#contracts") valid.
* @todo #253:60min On frontend, in Contracts tab, after adding a new contract, we should add the new
* contract to contract table, instead of updating table by re-fetching all contracts again.
* Same logic should be applied to "markContractForRemove" and "restoreContract".
*/
(function getAndAddContracts($, contractsService, usersService, confirmDialog){

Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/public/js/wallets.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,8 @@ function getProjectWallets() {
* @param owner Owner of the repo/project.
* @param name Name of the repo.
* @param type Type of the wallet (fake or stripe).
* @todo #195#60min On frontend, enable wallet activation. Right now `activateWallet()` function is not used.
* @todo #253:30min On frontend, enable wallet activation.
* Right now `activateWallet()` function is not used ('activate' button doesn't work).
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@criske I don't think we need this TODO, wallet activation works fine since a month ago I think.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@amihaiemil on my end is not working
Self XDSD

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@criske the button is inactive because the Limit is 0. Try setting up a Limit, then it should work.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@criske and also at least a Payment Method.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks, it works now.

*/
function activateWallet(owner, name, type) {
if(type == 'stripe') {
Expand Down
4 changes: 3 additions & 1 deletion src/main/resources/templates/contributor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,9 @@ <h4>Account ID: <span id="accountId"></span></h4>
data: form.serialize(),
success: function (payoutMethod) {
console.log("Opening SCA Dashboard page: " + payoutMethod.stripeLoginLink)
window.location.replace(payoutMethod.stripeLoginLink);
$("<a href=" + payoutMethod.stripeLoginLink + " target='_blank'></a>")[0].click();
$("#stripeDashboardButton").removeClass("disabled");
$("#loadingStripeDashboardForm").hide();
},
error: function(jqXHR, error, errorThrown) {
$("#stripeDashboardButton").removeClass("disabled");
Expand Down