Merge branch 'epic/time-based-form-goals-GIVE-565' into feature/form-…

…goal-ui-GIVE-676
impress-org · Apr 29, 2024 · 3f22970 · 3f22970
2 parents abeee7f + aa9572d
commit 3f22970
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 4 deletions.
diff --git a/blocks/donation-form-grid/edit/inspector.js b/blocks/donation-form-grid/edit/inspector.js
@@ -302,7 +302,7 @@ const Inspector = ({attributes, setAttributes}) => {
                 </PanelBody>
             </Panel>
             <PanelColorSettings
-                title={ __( 'Color Settings' ) }
+                title={ __( 'Color Settings', 'give' ) }
                 colorSettings={ [
                     {
                         value: tagBackgroundColor

diff --git a/src/Donations/resources/components/DonationsListTable.tsx b/src/Donations/resources/components/DonationsListTable.tsx
@@ -248,7 +248,7 @@ export default function DonationsListTable() {
                 {__('Import Donations', 'give')}
             </a>
             <button className={tableStyles.addFormButton} onClick={showLegacyDonations}>
-                {__('Switch to Legacy View')}
+                {__('Switch to Legacy View', 'give')}
             </button>
         </ListTablePage>
     );

diff --git a/src/FormBuilder/resources/js/form-builder/src/styles/_components.scss b/src/FormBuilder/resources/js/form-builder/src/styles/_components.scss
@@ -292,6 +292,7 @@ This creates a consistent separator between the tabs and the rest of the sidebar
                 font-size: 16px;
                 line-height: 16px;
                 background-color: var(--givewp-gray-20);
+                width: 100%;
             }
 
             &:checked + label {

diff --git a/src/PaymentGateways/PayPalCommerce/AdminSettingFields.php b/src/PaymentGateways/PayPalCommerce/AdminSettingFields.php
@@ -237,6 +237,7 @@ private function isCountryInNorthAmerica(): bool
     /**
      * Return admin guidance notice to fix PayPal on boarding error.
      *
+     * @unreleased Updated phone number for contact
      * @since 2.9.6
      *
      * @param bool $completeMessage
@@ -248,7 +249,7 @@ public function getAdminGuidanceNotice($completeMessage = true)
         if ($this->isCountryInNorthAmerica()) {
             $telephone = sprintf(
                 '<a href="tel:%1$s">%1$s</a>',
-                '1-888-221-1161'
+                '1-888-350-2387'
             );
 
             $message = sprintf(

diff --git a/src/Promotions/InPluginUpsells/resources/views/payment-gateway.php b/src/Promotions/InPluginUpsells/resources/views/payment-gateway.php
@@ -15,7 +15,7 @@
 echo '</p>
                         <a href="https://docs.givewp.com/feerecovery-settings-gateway" target="_blank"
                            class="givewp-payment-gateway-fee-recovery-recommendation_external">';
-_e('Recover your fees');
+_e('Recover your fees', 'give');
 echo '<img
                                 src="' . esc_url(
         GIVE_PLUGIN_URL . 'assets/dist/images/list-table/external-link-icon.svg'

diff --git a/tests/Unit/TestGive.php b/tests/Unit/TestGive.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Give\Tests\Unit;
+
+use Give\Tests\TestCase;
+
+/**
+ * @unreleased
+ */
+class TestGive extends TestCase
+{
+    /**
+     * @unreleased
+     */
+    public function testReadMeVersionMatchesPluginVersion(): void
+    {
+        $readme = get_file_data(
+            trailingslashit(GIVE_PLUGIN_DIR) . "readme.txt",
+            [
+                "Version" => "Stable tag"
+            ]
+        );
+
+        $plugin = get_plugin_data(GIVE_PLUGIN_FILE);
+
+        $this->assertEquals(GIVE_VERSION, $readme['Version']);
+        $this->assertEquals(GIVE_VERSION, $plugin['Version']);
+        $this->assertEquals($readme['Version'], $plugin['Version']);
+    }
+
+    /**
+     * @unreleased
+     */
+    public function testReadMeRequiresPHPVersionMatchesPluginVersion(): void
+    {
+        $readme = get_file_data(
+            trailingslashit(GIVE_PLUGIN_DIR) . "readme.txt",
+            [
+                "RequiresPHP" => "Requires PHP"
+            ]
+        );
+
+        $plugin = get_plugin_data(GIVE_PLUGIN_FILE);
+
+        $this->assertEquals($plugin['RequiresPHP'], $readme['RequiresPHP']);
+    }
+
+    /**
+     * @unreleased
+     */
+    public function testReadMeRequiresWPVersionMatchesPluginHeaderVersion(): void
+    {
+        $readme = get_file_data(
+            trailingslashit(GIVE_PLUGIN_DIR) . "readme.txt",
+            [
+                "RequiresWP" => "Requires at least"
+            ]
+        );
+
+        $plugin = get_plugin_data(GIVE_PLUGIN_FILE);
+
+        $this->assertEquals($plugin['RequiresWP'], $readme['RequiresWP']);
+    }
+}