Skip to content

Commit

Permalink
Merge pull request #689 from godaddy-wordpress/release/4.12.6
Browse files Browse the repository at this point in the history
Release v5.12.6
  • Loading branch information
nmolham-godaddy authored Jul 31, 2024
2 parents 92a6583 + ccc7866 commit f5cbe91
Show file tree
Hide file tree
Showing 8 changed files with 102 additions and 4 deletions.
24 changes: 24 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE/release.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Summary

_If needed, include a brief high level summary: this is what the release will contain_

### Stories

- [ ] [MWC-1234](https://godaddy-corp.atlassian.net/browse/MWC-1234)
- [ ] [MWC-5678](https://godaddy-corp.atlassian.net/browse/MWC-5678)

### Final story

[MWC-5678](https://godaddy-corp.atlassian.net/browse/MWC-5678) _(the last story that has to be completed to release/deploy)_

## Details

_Additional details to expand on the summary, if needed_

## Resources

_List of related issues, pull requests, external pages, etc_

## Before merge

- [ ] I have confirmed the final story is merged
42 changes: 42 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Summary

_Include a brief high level summary: this is what the PR contains_

### Story: [MWC-1234](https://godaddy-corp.atlassian.net/browse/MWC-1234)
### Release: #1234 (release PR)

## Details

_Additional details to expand on the summary, if needed_

## UI Changes

_If this PR changes any UI elements, add relevant screenshots, and a brief summary of each as needed_

- _This was changed_ [screenshot URL]
- _This was also changed_ [screenshot URL]

## QA

_If applicable, add specific steps for the reviewer to perform as part of their QA process prior to approving this pull request. Steps should be in a step -> success? format, like below_

### Setup

_List any configuration requirements for testing_

- This setting is configured
- Taxes are enabled

### Steps

Steps should be in a step => success? format, like below:

1. Do this
1. And this
- [ ] The result is this

- [ ] Code review

## Before merge

- [ ] I have confirmed these changes in each supported minor WooCommerce version
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "skyverge/wc-plugin-framework",
"description": "The official SkyVerge WooCommerce plugin framework",
"version": "5.12.5",
"version": "5.12.6",
"license": "GPL-3.0",
"minimum-stability": "dev",
"prefer-stable": true,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "wc-plugin-framework",
"version": "5.12.5",
"version": "5.12.6",
"title": "WooCommerce Plugin Framework",
"author": "SkyVerge Team",
"homepage": "https://github.com/skyverge/wc-plugin-framework#readme",
Expand Down
2 changes: 1 addition & 1 deletion woocommerce-framework-plugin-loader-sample.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class SV_WC_Framework_Plugin_Loader {
const MINIMUM_WC_VERSION = '3.9';

/** SkyVerge plugin framework version used by this plugin */
const FRAMEWORK_VERSION = '5.12.5'; // TODO: framework version
const FRAMEWORK_VERSION = '5.12.6'; // TODO: framework version


/** the plugin name, for displaying notices */
Expand Down
2 changes: 2 additions & 0 deletions woocommerce/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
*** SkyVerge WooCommerce Plugin Framework Changelog ***

2024.nn.nn - version 5.12.6

2024.06.28 - version 5.12.5
* Fix - Prevent blank orders from being generated when adding a payment method

Expand Down
2 changes: 1 addition & 1 deletion woocommerce/class-sv-wc-plugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ abstract class SV_WC_Plugin {


/** Plugin Framework Version */
const VERSION = '5.12.5';
const VERSION = '5.12.6';

/** @var object single instance of plugin */
protected static $instance;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1085,6 +1085,7 @@ public function render_js() {

switch ( current_action() ) :
case 'wp_footer' :
$this->renderScriptDependencies();
$this->payment_form_js_rendered[] = $gateway_id;
?><script type="text/javascript">jQuery(function($){<?php echo $this->get_safe_handler_js(); ?>});</script><?php
break;
Expand All @@ -1095,6 +1096,35 @@ public function render_js() {
endswitch;
}

/**
* Renders the payment form JS dependencies.
*
* @see SV_WC_Payment_Gateway_Payment_Form::render_js()
*
* @since 4.12.6
*/
protected function renderScriptDependencies() : void
{
if (! $dependencies = $this->getFormScriptDependencies()) {
return;
}

wp_print_scripts($dependencies);
}

/**
* Gets the payment form JS list of dependencies handles.
*
* @see SV_WC_Payment_Gateway_Payment_Form::renderScriptDependencies()
*
* @since 4.12.6
*
* @return string[]
*/
protected function getFormScriptDependencies() : array
{
return ['jquery'];
}

/**
* Gets the handler instantiation JS.
Expand Down

0 comments on commit f5cbe91

Please sign in to comment.