CRM: 3416 - SQLite + WP Playground compatibility tweaks (#35201)

* SQLite translation requires second param on WEEK

* Set permalinks in blueprint

* Add changelog

* Support non-pretty permalink calls to REST API

* Update changelog

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/7631370504

Author: tbradsha

.wordpress-org/blueprints/blueprint.json

@@ -10,6 +10,10 @@
 			"step": "login",
 			"username": "admin",
 			"password": "password"
+		},
+		{
+			"step": "runPHP",
+			"code": "<?php require_once 'wordpress/wp-load.php'; global $wp_rewrite; $wp_rewrite->set_permalink_structure('/%postname%/'); $wp_rewrite->flush_rules();"
 		}
 	]
 }

CHANGELOG.md

@@ -20,6 +20,8 @@ This is an alpha version! The changes listed here are not final.
 - Backend: Add fallback for dev site detection.
 - Contacts: Updated default statuses.
 - Custom fields: More robust fallbacks for slug creation.
+- Dashboard: Adjust queries for SQLite compatibility.
+  REST API: Allow calls when not using pretty permalinks.
 - Database: Ensure logs table is initiated with all columns.
 - Fixed: Escape output in typeaheads.
 - Invoices: Fixed total amount in preview and pdf when refunds or credit notes are applied.

admin/dashboard/dashboard.ajax.php

@@ -76,7 +76,7 @@ function jetpackcrm_dash_refresh() {
 	$sql     = $wpdb->prepare( 'SELECT count(ID) as count, zbsc_created as ts, MONTH(FROM_UNIXTIME(zbsc_created)) as month, YEAR(FROM_UNIXTIME(zbsc_created)) as year FROM ' . $ZBSCRM_t['contacts'] . ' WHERE zbsc_created > %d AND zbsc_created < %d GROUP BY month, year ORDER BY year, month', $start_date, $end_date ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.VariableNotSnakeCase
 	$monthly = $wpdb->get_results( $sql );
 
-	$sql    = $wpdb->prepare( 'SELECT count(ID) as count, zbsc_created as ts, WEEK(FROM_UNIXTIME(zbsc_created)) as week, YEAR(FROM_UNIXTIME(zbsc_created)) as year FROM ' . $ZBSCRM_t['contacts'] . ' WHERE zbsc_created > %d AND zbsc_created < %d GROUP BY week, year ORDER BY year, week', $start_date, $end_date ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.VariableNotSnakeCase
+	$sql    = $wpdb->prepare( 'SELECT count(ID) as count, zbsc_created as ts, WEEK(FROM_UNIXTIME(zbsc_created), 1) as week, YEAR(FROM_UNIXTIME(zbsc_created)) as year FROM ' . $ZBSCRM_t['contacts'] . ' WHERE zbsc_created > %d AND zbsc_created < %d GROUP BY week, year ORDER BY year, week', $start_date, $end_date ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.VariableNotSnakeCase
 	$weekly = $wpdb->get_results( $sql );
 
 	$sql   = $wpdb->prepare( 'SELECT count(ID) as count, zbsc_created as ts, DAY(FROM_UNIXTIME(zbsc_created)) as day, MONTH(FROM_UNIXTIME(zbsc_created)) as month, YEAR(FROM_UNIXTIME(zbsc_created)) as year FROM ' . $ZBSCRM_t['contacts'] . ' WHERE zbsc_created > %d AND zbsc_created < %d GROUP BY day, month, year ORDER BY year, month, day', $start_date, $end_date ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.VariableNotSnakeCase

includes/ZeroBSCRM.CustomerFilters.php

@@ -50,14 +50,19 @@ function zeroBSCRM_CustomerTypeList( $jsCallbackFuncStr = '', $inputDefaultValue
 		global $haszbscrmBHURLCustomersOut;
 	if ( ! isset( $haszbscrmBHURLCustomersOut ) ) {
 
-		// cachebusting for now... (ESP needed when migrating from DAL1 -> DAL2)
+		$nonce         = wp_create_nonce( 'wp_rest' );
+		$rest_base_url = get_rest_url();
 
-		$cacheBusterStr = '&time=' . time();
+		// handle bare permalink structure
+		if ( empty( get_option( 'permalink_structure' ) ) ) {
+			$param_separator = '&';
+		} else {
+			$param_separator = '?';
+		}
+		$rest_url = $rest_base_url . 'zbscrm/v1/contacts' . $param_separator . '_wpnonce=' . $nonce;
+
+		$ret .= '<script type="text/javascript">var zbscrmBHURLCustomers = "' . $rest_url . '";</script>';
 
-		// change to proper WP REST (not cached) and wont be impacted by setup connection issues. Is also the "proper" way to do it
-		$nonce                      = wp_create_nonce( 'wp_rest' );
-		$rest_url                   = esc_url( get_rest_url() . 'zbscrm/v1/contacts?_wpnonce=' . $nonce );
-		$ret                       .= '<script type="text/javascript">var zbscrmBHURLCustomers = "' . $rest_url . '";</script>';
 		$haszbscrmBHURLCustomersOut = true;
 	}
 
@@ -125,9 +130,19 @@ function zeroBSCRM_CompanyTypeList( $jsCallbackFuncStr = '', $inputDefaultValue
 		global $haszbscrmBHURLCompaniesOut;
 		if ( ! isset( $haszbscrmBHURLCompaniesOut ) ) {
 
-			$nonce                      = wp_create_nonce( 'wp_rest' );
-			$rest_url                   = esc_url( get_rest_url() . 'zbscrm/v1/companies?_wpnonce=' . $nonce );
-			$ret                       .= '<script type="text/javascript">var zbscrmBHURLCompanies = "' . $rest_url . '";</script>';
+			$nonce         = wp_create_nonce( 'wp_rest' );
+			$rest_base_url = get_rest_url();
+
+			// handle bare permalink structure
+			if ( empty( get_option( 'permalink_structure' ) ) ) {
+				$param_separator = '&';
+			} else {
+				$param_separator = '?';
+			}
+			$rest_url = $rest_base_url . 'zbscrm/v1/companies' . $param_separator . '_wpnonce=' . $nonce;
+
+			$ret .= '<script type="text/javascript">var zbscrmBHURLCompanies = "' . $rest_url . '";</script>';
+
 			$haszbscrmBHURLCompaniesOut = true;
 		}
 

js/ZeroBSCRM.admin.invoicebuilder.js

@@ -1663,7 +1663,8 @@ function zbscrm_JS_calculatediscount() {
  */
 function zbscrm_JS_invoice_typeahead_bind() {
 	// endpoint - pass nonce this was as before send wasn't working weirdly in Bloodhound.
-	endpoint = wpApiSettings.root + 'zbscrm/v1/concom?_wpnonce=' + wpApiSettings.nonce;
+	param_separator = wpApiSettings.root.indexOf('?rest_route=/') === -1 ? '?' : '&';
+	endpoint = wpApiSettings.root + 'zbscrm/v1/concom' + param_separator + '_wpnonce=' + wpApiSettings.nonce;
 
 	var zbsInvoiceTo = new Bloodhound( {
 		datumTokenizer: function ( d ) {
@@ -1687,7 +1688,7 @@ function zbscrm_JS_invoice_typeahead_bind() {
 		},
 		remote: {
 			// this checks when users type, via ajax search ... useful addition to (cached) prefetch
-			url: wpApiSettings.root + 'zbscrm/v1/concom?_wpnonce=' + wpApiSettings.nonce + '&s=%QUERY',
+			url: wpApiSettings.root + 'zbscrm/v1/concom' + param_separator + '_wpnonce=' + wpApiSettings.nonce + '&s=%QUERY',
 			wildcard: '%QUERY',
 		},
 	} );