-
Notifications
You must be signed in to change notification settings - Fork 192
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Feature: Add additional gateway notice (#7477)
- Loading branch information
Showing
8 changed files
with
182 additions
and
0 deletions.
There are no files selected for viewing
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
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
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
4 changes: 4 additions & 0 deletions
4
src/FormBuilder/resources/js/form-builder/src/blocks/fields/payment-gateways/index.tsx
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,13 @@ | ||
import settings from './settings'; | ||
import {FieldBlock} from '@givewp/form-builder/types'; | ||
import {addFilter} from "@wordpress/hooks"; | ||
import withAdditionalPaymentGatewayNotice from './withAdditionalPaymentGatewayNotice'; | ||
|
||
const paymentGateways: FieldBlock = { | ||
name: 'givewp/payment-gateways', | ||
settings, | ||
}; | ||
|
||
addFilter('editor.BlockEdit', 'givewp/stripe-payment-element', withAdditionalPaymentGatewayNotice, 999); | ||
|
||
export default paymentGateways; |
51 changes: 51 additions & 0 deletions
51
...js/form-builder/src/blocks/fields/payment-gateways/withAdditionalPaymentGatewayNotice.tsx
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
import {createHigherOrderComponent} from "@wordpress/compose"; | ||
import {PanelRow} from "@wordpress/components"; | ||
import InspectorNotice from "@givewp/form-builder/components/settings/InspectorNotice"; | ||
import {__} from "@wordpress/i18n"; | ||
import {InspectorControls} from "@wordpress/block-editor"; | ||
import {useState} from "react"; | ||
|
||
declare const window: { | ||
additionalPaymentGatewaysNotificationData: { | ||
actionUrl: string; | ||
isDismissed: boolean; | ||
}; | ||
} & Window; | ||
|
||
const AdditionalPaymentGatewaysNotice = () => { | ||
const {actionUrl, isDismissed} = window.additionalPaymentGatewaysNotificationData; | ||
const [showNotification, setShowNotification] = useState(!window.additionalPaymentGatewaysNotificationData.isDismissed); | ||
const onDismissNotification = () => fetch(actionUrl, {method: 'POST'}).then(() => setShowNotification(false)) | ||
|
||
return ( | ||
<InspectorControls> | ||
{showNotification && ( | ||
<PanelRow> | ||
<InspectorNotice | ||
title={__('Additional Payment Gateways', 'give')} | ||
description={__('Enable multiple payment gateways on your forms via the global settings.', 'give')} | ||
helpText={__('Go to payment gateway settings', 'give')} | ||
helpUrl={'/wp-admin/edit.php?post_type=give_forms&page=give-settings&tab=gateways§ion=gateways-settings&group=v3'} | ||
onDismiss={onDismissNotification} | ||
/> | ||
</PanelRow> | ||
)} | ||
</InspectorControls> | ||
) | ||
} | ||
|
||
const withAdditionalPaymentGatewayNotice = createHigherOrderComponent((BlockEdit) => { | ||
return (props) => { | ||
if (props.name === 'givewp/payment-gateways') { | ||
return ( | ||
<> | ||
<BlockEdit {...props} /> | ||
<AdditionalPaymentGatewaysNotice {...props} /> | ||
</> | ||
); | ||
} | ||
return <BlockEdit {...props} />; | ||
}; | ||
}, 'withAdditionalPaymentGatewayNotice'); | ||
|
||
export default withAdditionalPaymentGatewayNotice; |
29 changes: 29 additions & 0 deletions
29
src/FormBuilder/resources/js/form-builder/src/components/settings/InspectorNotice/index.tsx
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
import {Icon} from "@wordpress/components"; | ||
import {close, external} from "@wordpress/icons"; | ||
import './styles.scss' | ||
|
||
/** | ||
* @unreleased | ||
*/ | ||
const InspectorNotice = ({title, description, helpText, helpUrl, onDismiss}) => { | ||
|
||
return ( | ||
<div className='givewp-inspector-notice__container'> | ||
<span className='givewp-inspector-notice__title'> | ||
{title} | ||
<Icon icon={close} className='givewp-inspector-notice__closeIcon' onClick={onDismiss} /> | ||
</span> | ||
<span> | ||
{description} | ||
</span> | ||
<span> | ||
<a href={helpUrl} target="_blank"> | ||
<Icon icon={external} className='givewp-inspector-notice__externalIcon' /> | ||
{helpText} | ||
</a> | ||
</span> | ||
</div> | ||
) | ||
} | ||
|
||
export default InspectorNotice; |
36 changes: 36 additions & 0 deletions
36
...FormBuilder/resources/js/form-builder/src/components/settings/InspectorNotice/styles.scss
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
.givewp-inspector-notice { | ||
&__container { | ||
position: relative; | ||
display: flex; | ||
flex-direction: column; | ||
gap: 8px; | ||
padding: 12px; | ||
border-radius: 2px; | ||
background-color: #f2f2f2; | ||
color: #0e0e0e; | ||
font-size: 12px; | ||
margin: var(--givewp-spacing-4) | ||
} | ||
|
||
&__title { | ||
font-weight: 600; | ||
} | ||
|
||
&__closeIcon { | ||
cursor: pointer; | ||
height: 16px; | ||
width: 16px; | ||
position: absolute; | ||
right: 12px; | ||
top: 12px; | ||
} | ||
|
||
&__externalIcon { | ||
height: 18px; | ||
width: 18px; | ||
fill: #2271b1; | ||
float: left; | ||
margin-top: 2px; | ||
margin-right: 8px; | ||
} | ||
} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
<?php | ||
|
||
namespace Give\Tests\Unit\FormBuilder; | ||
|
||
use Give\Tests\TestCase; | ||
use Give\Tests\TestTraits\RefreshDatabase; | ||
|
||
/** | ||
* @unreleased | ||
*/ | ||
class ServiceProviderTest extends TestCase | ||
{ | ||
use RefreshDatabase; | ||
|
||
/** | ||
* @unreleased | ||
*/ | ||
public function testItDismissesTheAdditionalPaymentGatewaysNotice() { | ||
|
||
$userId = $this->factory()->user->create(); | ||
wp_set_current_user($userId); | ||
|
||
do_action('wp_ajax_givewp_additional_payment_gateways_hide_notice'); | ||
|
||
$this->assertTrue( | ||
(bool) get_user_meta($userId, 'givewp-additional-payment-gateways-notice-dismissed', true) | ||
); | ||
} | ||
} |