Skip to content

Commit

Permalink
Merge branch 'trunk' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
davidperezgar authored Dec 3, 2024
2 parents 434465c + b3ddec6 commit 9a9d92c
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 15 deletions.
6 changes: 3 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ updates:
schedule:
interval: weekly
open-pull-requests-limit: 10
target-branch: "develop"
target-branch: "trunk"

- package-ecosystem: npm
directory: '/'
schedule:
interval: weekly
open-pull-requests-limit: 10
target-branch: "develop"
target-branch: "trunk"

- package-ecosystem: composer
directory: '/'
schedule:
interval: weekly
open-pull-requests-limit: 10
target-branch: "develop"
target-branch: "trunk"
13 changes: 12 additions & 1 deletion .github/workflows/build-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,15 @@ jobs:
uses: actions/checkout@v3

- name: Run plugin check
uses: wordpress/plugin-check-action@v1
uses: wordpress/plugin-check-action@v1
with:
repo-token: ''
build-dir: './'
checks: ''
exclude-checks: ''
categories: 'plugin_repo'
exclude-directories: 'tests/*'
ignore-warnings: ''
ignore-errors: ''
include-experimental: ''
wp-version: 'latest'
2 changes: 1 addition & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
"homepage": "https://github.com/closemarketing/formscrm#readme",
"dependencies": {
"@wordpress/env": "^10.13.0",
"csv-parse": "^5.4.0"
"csv-parse": "^5.6.0"
},
"devDependencies": {
"@playwright/test": "^1.47.0",
"@playwright/test": "^1.49.0",
"@types/node": "^22.10.1",
"@wordpress/e2e-test-utils-playwright": "^1.13.0"
}
Expand Down
4 changes: 2 additions & 2 deletions tests/debugtest.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ function formscrm_check_url_crm( $url ) {
//* Sends an email to administrator when it not creates the lead
function formscrm_debug_email_lead($crm, $error, $data) {
$to = 'david@closemarketing.es';
$subject = 'GravityForms CRM - '.__('Error creating the Lead','gravityformscrm');
$body = '<p>'.__('There was an error creating the Lead in the CRM','gravityformscrm').' '.$crm.':</p><p><strong>'.$error.'</strong></p><p>'.__('Lead Data','gravityformscrm').':</p>';
$subject = 'GravityForms CRM - '.__('Error creating the Lead','formscrm');
$body = '<p>'.__('There was an error creating the Lead in the CRM','formscrm').' '.$crm.':</p><p><strong>'.$error.'</strong></p><p>'.__('Lead Data','formscrm').':</p>';
foreach($data as $dataitem){
$body .= '<p><strong>'.$dataitem['name'].': </strong>'.$dataitem['value'].'</p>';
}
Expand Down

0 comments on commit 9a9d92c

Please sign in to comment.