Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Stripe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Extensions
Stripe
Commits
1dab1dc5
Commit
1dab1dc5
authored
3 years ago
by
mattwire
Browse files
Options
Downloads
Patches
Plain Diff
SweetAlert 10/11 compatibility - require SweetAlert extension 1.5
parent
29bae6e5
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!167
SweetAlert 10/11 compatibility - require SweetAlert extension 1.5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CRM/Stripe/Check.php
+1
-1
1 addition, 1 deletion
CRM/Stripe/Check.php
docs/releasenotes.md
+5
-0
5 additions, 0 deletions
docs/releasenotes.md
js/civicrmStripeConfirm.js
+3
-3
3 additions, 3 deletions
js/civicrmStripeConfirm.js
js/civicrm_stripe.js
+5
-5
5 additions, 5 deletions
js/civicrm_stripe.js
with
14 additions
and
9 deletions
CRM/Stripe/Check.php
+
1
−
1
View file @
1dab1dc5
...
...
@@ -26,7 +26,7 @@ class CRM_Stripe_Check {
* @var string
*/
const
MIN_VERSION_MJWSHARED
=
'1.0'
;
const
MIN_VERSION_SWEETALERT
=
'1.
4.1
'
;
const
MIN_VERSION_SWEETALERT
=
'1.
5
'
;
const
MIN_VERSION_FIREWALL
=
'1.1.3'
;
public
static
function
checkRequirements
(
&
$messages
)
{
...
...
This diff is collapsed.
Click to expand it.
docs/releasenotes.md
+
5
−
0
View file @
1dab1dc5
...
...
@@ -9,6 +9,10 @@ Releases use the following numbering system:
*
**[BC]**
: Items marked with [BC] indicate a breaking change that will require updates to your code if you are using that code in your extension.
## Release 6.6.2 (not yet released)
*
SweetAlert 10/11 compatibility - require SweetAlert extension 1.5
## Release 6.6.1
*
Fix PHP notice when there are no Stripe customers.
...
...
@@ -18,6 +22,7 @@ Releases use the following numbering system:
*
Fixes to PaymentRequest button
[
#313
](
https://lab.civicrm.org/extensions/stripe/-/issues/313
)
:
*
Hide submit buttons when paymentRequest button is active.
*
Fix loading of paymentRequest element when multiple payment processors available.
*
Fix no payment element loading in browser when no saved cards and paymentRequest is default.
*
Fix
[
#331
](
https://lab.civicrm.org/extensions/stripe/-/issues/331
)
The API Stripe.importsubscription returns authorization failed.
## Release 6.6
...
...
This diff is collapsed.
Click to expand it.
js/civicrmStripeConfirm.js
+
3
−
3
View file @
1dab1dc5
...
...
@@ -233,7 +233,7 @@
swalFire
:
function
(
parameters
,
scrollToElement
,
fallBackToAlert
)
{
if
(
typeof
Swal
===
'
function
'
)
{
if
(
scrollToElement
.
length
>
0
)
{
parameters
.
onAfter
Close
=
function
()
{
window
.
scrollTo
(
$
(
scrollToElement
).
position
());
};
parameters
.
did
Close
=
function
()
{
window
.
scrollTo
(
$
(
scrollToElement
).
position
());
};
}
Swal
.
fire
(
parameters
);
}
...
...
@@ -276,8 +276,8 @@
confirm
.
swalFire
({
title
:
ts
(
'
Please wait...
'
),
allowOutsideClick
:
false
,
onBefore
Open
:
function
()
{
Swal
.
showLoading
();
will
Open
:
function
()
{
Swal
.
showLoading
(
Swal
.
getConfirmButton
()
);
}
},
''
,
false
);
...
...
This diff is collapsed.
Click to expand it.
js/civicrm_stripe.js
+
5
−
5
View file @
1dab1dc5
...
...
@@ -252,8 +252,8 @@
title
:
ts
(
'
Please wait
'
),
text
:
ts
(
'
while we pre-authorize your card...
'
),
allowOutsideClick
:
false
,
onBefore
Open
:
function
()
{
Swal
.
showLoading
();
will
Open
:
function
()
{
Swal
.
showLoading
(
Swal
.
getConfirmButton
()
);
}
},
''
,
false
);
CRM
.
api3
(
'
StripePaymentintent
'
,
'
Process
'
,
{
...
...
@@ -315,8 +315,8 @@
title
:
ts
(
'
Please wait
'
),
text
:
ts
(
'
preparing your payment...
'
),
allowOutsideClick
:
false
,
onBefore
Open
:
function
()
{
Swal
.
showLoading
();
will
Open
:
function
()
{
Swal
.
showLoading
(
Swal
.
getConfirmButton
()
);
}
},
''
,
false
);
CRM
.
api3
(
'
StripePaymentintent
'
,
'
Process
'
,
{
...
...
@@ -1028,7 +1028,7 @@
function
swalFire
(
parameters
,
scrollToElement
,
fallBackToAlert
)
{
if
(
typeof
Swal
===
'
function
'
)
{
if
(
scrollToElement
.
length
>
0
)
{
parameters
.
onAfter
Close
=
function
()
{
window
.
scrollTo
(
$
(
scrollToElement
).
position
());
};
parameters
.
did
Close
=
function
()
{
window
.
scrollTo
(
$
(
scrollToElement
).
position
());
};
}
Swal
.
fire
(
parameters
);
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment