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

Fix SPCO Copy Attendee Data Closes #3102 #3116

Merged
merged 2 commits into from
Sep 4, 2020
Merged

Fix SPCO Copy Attendee Data Closes #3102 #3116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a1489f
load JqueryAssetManager for all asset requests
tn3rb Sep 4, 2020
572a5cc
localize eei18n for espresso_core script
tn3rb Sep 4, 2020
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
14 changes: 8 additions & 6 deletions core/domain/entities/routing/handlers/shared/AssetRequests.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
namespace EventEspresso\core\domain\entities\routing\handlers\shared;

use EE_Dependency_Map;
use EventEspresso\core\domain\services\assets\CoreAssetManager;
use EventEspresso\core\domain\services\assets\JqueryAssetManager;
use EventEspresso\core\domain\services\assets\ReactAssetManager;
use EventEspresso\core\services\assets\Barista;
use EventEspresso\core\services\routing\Route;

Expand Down Expand Up @@ -42,12 +45,10 @@ protected function registerDependencies()
'EventEspresso\core\services\assets\AssetCollection' => EE_Dependency_Map::load_new_object,
'EventEspresso\core\services\assets\Registry' => EE_Dependency_Map::load_from_cache,
];
$this->dependency_map->registerDependencies(JqueryAssetManager::class, $default_dependencies);
$this->dependency_map->registerDependencies(ReactAssetManager::class, $default_dependencies);
$this->dependency_map->registerDependencies(
'EventEspresso\core\domain\services\assets\ReactAssetManager',
$default_dependencies
);
$this->dependency_map->registerDependencies(
'EventEspresso\core\domain\services\assets\CoreAssetManager',
CoreAssetManager::class,
[
'EventEspresso\core\services\assets\AssetCollection' => EE_Dependency_Map::load_new_object,
'EE_Currency_Config' => EE_Dependency_Map::load_from_cache,
Expand Down Expand Up @@ -117,7 +118,8 @@ protected function requestHandler()
$barista->initialize();
$this->loader->getShared('EventEspresso\core\services\assets\Registry');
}
$this->loader->getShared('EventEspresso\core\domain\services\assets\CoreAssetManager');
$this->loader->getShared(JqueryAssetManager::class);
$this->loader->getShared(CoreAssetManager::class);
if ($this->canLoadBlocks()) {
$this->loader->getShared(
'EventEspresso\core\services\editor\BlockRegistrationManager'
Expand Down
79 changes: 44 additions & 35 deletions core/domain/services/assets/CoreAssetManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use DomainException;
use EE_Currency_Config;
use EE_Registry;
use EE_Template_Config;
use EED_Core_Rest_Api;
use EEH_DTT_Helper;
Expand Down Expand Up @@ -33,16 +34,16 @@ class CoreAssetManager extends AssetManager
// WordPress core / Third party JS asset handles
const JS_HANDLE_JS_CORE = 'eejs-core';

const JS_HANDLE_CORE = 'espresso_core';
const JS_HANDLE_CORE = 'espresso_core';

const JS_HANDLE_I18N = 'eei18n';
const JS_HANDLE_I18N = 'eei18n';

const JS_HANDLE_VENDOR = 'eventespresso-vendor';
const JS_HANDLE_VENDOR = 'eventespresso-vendor';

// EE CSS assets handles
const CSS_HANDLE_DEFAULT = 'espresso_default';

const CSS_HANDLE_CUSTOM = 'espresso_custom_css';
const CSS_HANDLE_CUSTOM = 'espresso_custom_css';

/**
* @var EE_Currency_Config $currency_config
Expand Down Expand Up @@ -78,13 +79,13 @@ public function __construct(


/**
* @since 4.9.62.p
* @throws DomainException
* @throws DuplicateCollectionIdentifierException
* @throws InvalidArgumentException
* @throws InvalidDataTypeException
* @throws InvalidEntityException
* @throws InvalidInterfaceException
* @since 4.9.62.p
*/
public function addAssets()
{
Expand All @@ -94,13 +95,13 @@ public function addAssets()


/**
* @since 4.9.62.p
* @throws DomainException
* @throws DuplicateCollectionIdentifierException
* @throws InvalidArgumentException
* @throws InvalidDataTypeException
* @throws InvalidEntityException
* @throws InvalidInterfaceException
* @since 4.9.62.p
*/
public function addJavascriptFiles()
{
Expand All @@ -110,23 +111,23 @@ public function addJavascriptFiles()
$this->registry->addData('eejs_api_nonce', wp_create_nonce('wp_rest'));
$this->registry->addData(
'paths',
array(
'base_rest_route' => rest_url(),
'rest_route' => rest_url('ee/v4.8.36/'),
[
'base_rest_route' => rest_url(),
'rest_route' => rest_url('ee/v4.8.36/'),
'collection_endpoints' => EED_Core_Rest_Api::getCollectionRoutesIndexedByModelName(),
'primary_keys' => EED_Core_Rest_Api::getPrimaryKeyNamesIndexedByModelName(),
'site_url' => site_url('/'),
'admin_url' => admin_url('/'),
)
'primary_keys' => EED_Core_Rest_Api::getPrimaryKeyNamesIndexedByModelName(),
'site_url' => site_url('/'),
'admin_url' => admin_url('/'),
]
);
// Event Espresso brand name
$this->registry->addData('brandName', Domain::brandName());
/** site formatting values **/
$this->registry->addData(
'site_formats',
array(
'date_formats' => EEH_DTT_Helper::convert_php_to_js_and_moment_date_formats()
)
[
'date_formats' => EEH_DTT_Helper::convert_php_to_js_and_moment_date_formats(),
]
);
/** currency data **/
$this->registry->addData(
Expand All @@ -136,25 +137,33 @@ public function addJavascriptFiles()
/** site timezone */
$this->registry->addData(
'default_timezone',
array(
[
'pretty' => EEH_DTT_Helper::get_timezone_string_for_display(),
'string' => get_option('timezone_string'),
'offset' => EEH_DTT_Helper::get_site_timezone_gmt_offset(),
)
]
);
/** site locale (user locale if user logged in) */
$this->registry->addData(
'locale',
array(
[
'user' => get_user_locale(),
'site' => get_locale()
)
'site' => get_locale(),
]
);

$this->addJavascript(
CoreAssetManager::JS_HANDLE_CORE,
EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js',
array(JqueryAssetManager::JS_HANDLE_JQUERY)
[JqueryAssetManager::JS_HANDLE_JQUERY]
)->setInlineDataCallback(
function() {
wp_localize_script(
CoreAssetManager::JS_HANDLE_CORE,
CoreAssetManager::JS_HANDLE_I18N,
EE_Registry::$i18n_js_strings
);
}
);
}

Expand All @@ -174,38 +183,38 @@ public function addStylesheetFiles()
is_readable(EVENT_ESPRESSO_UPLOAD_DIR . 'css/espresso_default.css')
? EVENT_ESPRESSO_UPLOAD_URL . 'css/espresso_default.css'
: EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css',
array('dashicons')
['dashicons']
);
//Load custom style sheet if available
if ($this->template_config->custom_style_sheet !== null) {
$this->addStylesheet(
CoreAssetManager::CSS_HANDLE_CUSTOM,
EVENT_ESPRESSO_UPLOAD_URL . 'css/' . $this->template_config->custom_style_sheet,
array(CoreAssetManager::CSS_HANDLE_DEFAULT)
[CoreAssetManager::CSS_HANDLE_DEFAULT]
);
}
}
}



/**
* Returns configuration data for the js Currency VO.
* @since 4.9.71.p
*
* @return array
* @since 4.9.71.p
*/
private function getCurrencySettings()
{
return array(
'code' => $this->currency_config->code,
'singularLabel' => $this->currency_config->name,
'pluralLabel' => $this->currency_config->plural,
'sign' => $this->currency_config->sign,
'signB4' => $this->currency_config->sign_b4,
'decimalPlaces' => $this->currency_config->dec_plc,
'decimalMark' => $this->currency_config->dec_mrk,
return [
'code' => $this->currency_config->code,
'singularLabel' => $this->currency_config->name,
'pluralLabel' => $this->currency_config->plural,
'sign' => $this->currency_config->sign,
'signB4' => $this->currency_config->sign_b4,
'decimalPlaces' => $this->currency_config->dec_plc,
'decimalMark' => $this->currency_config->dec_mrk,
'thousandsSeparator' => $this->currency_config->thsnds,
);
];
}


Expand Down