Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

1.3.20 #16

Merged
merged 8 commits into from
Oct 9, 2024
Merged

1.3.20 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cc1bfb0
Update readme
daanrijpkemacb Oct 7, 2024
63902c0
Refactor usage of Deprecated `utf_decode` function
daanrijpkemacb Oct 7, 2024
ec28224
Minor optimizations
daanrijpkemacb Oct 7, 2024
49a2040
Escaping escaping escaping
daanrijpkemacb Oct 8, 2024
7464a22
Even more escaping
daanrijpkemacb Oct 8, 2024
a253268
Minor reformatting
daanrijpkemacb Oct 8, 2024
589ec19
Final changes before 1.3.20
daanrijpkemacb Oct 9, 2024
e11c4a9
Reduce tag count
daanrijpkemacb Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 28 additions & 11 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ add_git_hooks:

PLUGIN_SLUG = bluem
SVN_URL = https://plugins.svn.wordpress.org/$(PLUGIN_SLUG)
SVN_DIR = svn-directory/${PLUGIN_SLUG}
SVN_DIR = svn-directory
CURRENT_DIR = $(shell pwd)
BUILD_DIR = $(CURRENT_DIR)/build

Expand All @@ -65,9 +65,8 @@ BLUE => \033[34m
NC = \033[0m # No Color


.PHONY: release

release: check-tag confirm svn-check repo-check pre-deployment add-tag add-tag-to-svn svn-commit update-trunk clean-up
.PHONY: prepare-release
prepare-release: check-tag confirm svn-check repo-check pre-deployment add-tag update-trunk clean-up
# send-email

check-tag:
Expand Down Expand Up @@ -114,13 +113,13 @@ add-tag:
@mkdir -p $(SVN_DIR)/tags/$(NEW_TAG)
@cp -R $(BUILD_DIR)/ $(SVN_DIR)/tags/$(NEW_TAG)/

add-tag-to-svn:
@echo "$(BLUE)Adding new tag $(NEW_TAG) to SVN repository...$(NC)"
@#cd $(SVN_DIR)/tags/$(NEW_TAG) && svn add --force * --auto-props --parents --depth infinity -q
#add-tag-to-svn:
# @echo "$(BLUE)Adding new tag $(NEW_TAG) to SVN repository...$(NC)"
# @#cd $(SVN_DIR)/tags/$(NEW_TAG) && svn add --force * --auto-props --parents --depth infinity -q

svn-commit:
@echo "$(BLUE)Committing new tag $(NEW_TAG) to SVN repository...$(NC)"
@#cd $(SVN_DIR)/tags/$(NEW_TAG) && svn commit -m "Tagging version $(NEW_TAG)"
#svn-commit:
# @echo "$(BLUE)Committing new tag $(NEW_TAG) to SVN repository...$(NC)"
# @#cd $(SVN_DIR)/tags/$(NEW_TAG) && svn commit -m "Tagging version $(NEW_TAG)"

update-trunk:
@echo "$(BLUE)Also updating trunk files to latest tag $(NEW_TAG)...$(NC)"
Expand All @@ -133,12 +132,30 @@ update-trunk:
@cp -R $(BUILD_DIR)/* $(SVN_DIR)/trunk/.
@echo "$(BLUE)Commit trunk to SVN to this latest tag $(NEW_TAG)...$(NC)"
@echo "$(RED) Don't forget to actually commit to SVN now."

# @cd $(SVN_DIR)/trunk && svn add --force * --auto-props --parents --depth infinity -q
# @cd $(SVN_DIR)/trunk && svn commit -m "Updating trunk to version $(NEW_TAG)"

commit-to-svn:
svn add tags/$(NEW_TAG)
svn commit -m "Added tags/$(NEW_TAG)"
svn delete trunk
svn add trunk --force
svn commit -m "Replaced trunk folder with version $(NEW_TAG)"

get-fresh-svn:
svn checkout $(SVN_URL) svn-directory
# https://plugins.svn.wordpress.org/bluem

.PHONY: release
release: commit-to-svn

clean-up:
@echo "$(BLUE)Cleaning up...$(NC)"
@rm -rf $(BUILD_DIR)
@#rm -rf $(BUILD_DIR)

copy-to-docker:
make pre-deployment; cp -r build/* ../plugins/bluem/.

#send-email:
# @./loadenv.sh
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ The stable, production-ready version of the plug-in is available from the WordPr
Use this repository to get insight and possibly contribute to the development of this plug-in.

# Requirements
This plug-in requires PHP >= 7.4 | PHP >= 8.0, which is the standard WordPress recommendation (https://wordpress.org/about/requirements/).
This plug-in requires PHP >= 8.0.

If you use our plug-in files or databases in your own custom development, please disable auto-update and check each update manually before installing.
Our plug-in files or database tables structure may change during time.
Expand Down
10 changes: 8 additions & 2 deletions bluem-db.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ function bluem_db_create_request( $request_object ): int
}
bluem_db_request_log(
$request_id,
__("Verzoek aangemaakt",'bluem')
esc_html__("Verzoek aangemaakt",'bluem')
);

return $wpdb->insert_id;
Expand Down Expand Up @@ -351,7 +351,13 @@ function bluem_db_update_request( $request_id, $request_object ): bool
if ( $update_result ) {
bluem_db_request_log(
$request_id,
__("Transactie bijgewerkt. Nieuwe data: ",'bluem') . json_encode( $request_object )
wp_kses_post(
sprintf(
/* translators: %s: data in JSON */
esc_html__("Transactie bijgewerkt. Nieuwe data: %s",'bluem'),
esc_js(json_encode( $request_object ))
)
)
);

return true;
Expand Down
439 changes: 218 additions & 221 deletions bluem-idin.php
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions bluem-integrations.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ function bluem_woocommerce_integration_wpcf7_ajax()
// $bluem_config->eMandateReason = $bluem_mandate_reason . ' (' . $debtorReference . ')';
// } else
if (!empty($bluem_config->eMandateReason)) {
$bluem_config->eMandateReason = utf8_decode($bluem_config->eMandateReason);
$bluem_config->eMandateReason = mb_convert_encoding($bluem_config->eMandateReason, 'ISO-8859-1', 'UTF-8');
} else {
$bluem_config->eMandateReason = "Incasso machtiging " . $debtorReference;
}
Expand Down Expand Up @@ -407,7 +407,7 @@ function bluem_woocommerce_integration_wpcf7_submit() {
if (!empty($bluem_mandate_reason)) {
$bluem_config->eMandateReason = $bluem_mandate_reason . ' (' . $debtorReference . ')';
} elseif (!empty($bluem_config->eMandateReason)) {
$bluem_config->eMandateReason = utf8_decode($bluem_config->eMandateReason);
$bluem_config->eMandateReason = mb_convert_encoding($bluem_config->eMandateReason, 'ISO-8859-1', 'UTF-8');
} else {
$bluem_config->eMandateReason = "Incasso machtiging " . $debtorReference;
}
Expand Down Expand Up @@ -847,7 +847,7 @@ function bluem_woocommerce_integration_gform_submit( $entry, $form ) {
if (!empty($bluem_mandate_reason)) {
$bluem_config->eMandateReason = $bluem_mandate_reason . ' (' . $debtorReference . ')';
} elseif (!empty($bluem_config->eMandateReason)) {
$bluem_config->eMandateReason = utf8_decode($bluem_config->eMandateReason);
$bluem_config->eMandateReason = mb_convert_encoding($bluem_config->eMandateReason, 'ISO-8859-1', 'UTF-8');
} else {
$bluem_config->eMandateReason = "Incasso machtiging " . $debtorReference;
}
Expand Down
Loading
Loading