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 the loading issue in WooCommerce block cart #477

Merged
merged 1 commit into from
Sep 26, 2024
Merged

Fix the loading issue in WooCommerce block cart #477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions includes/blocks/gateways/abstract-omise-block-apm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,13 @@ public function is_active() {
public function get_payment_method_script_handles() {
if ( ! wp_script_is( 'wc-omise-one-click-apms-payments-blocks', 'enqueued' ) ) {
$script_asset = require_once __DIR__ . '/../assets/js/build/omise-one-click-apms.asset.php';
wp_register_script(
wp_enqueue_script(
"wc-omise-one-click-apms-payments-blocks",
plugin_dir_url( __DIR__ ) . 'assets/js/build/omise-one-click-apms.js',
$script_asset[ 'dependencies' ],
$script_asset[ 'version' ],
true
);

wp_enqueue_script( 'wc-omise-one-click-apms-payments-blocks' );
}

return [ 'wc-omise-one-click-apms-payments-blocks' ];
Expand Down
4 changes: 1 addition & 3 deletions includes/blocks/gateways/abstract-omise-block-payment.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,13 @@ public function is_active() {
public function get_payment_method_script_handles() {
if (!wp_script_is("wc-{$this->name}-payments-blocks", 'enqueued')) {
$script_asset = require_once __DIR__ . "/../assets/js/build/{$this->name}.asset.php";
wp_register_script(
wp_enqueue_script(
"wc-{$this->name}-payments-blocks",
plugin_dir_url(__DIR__) . "assets/js/build/{$this->name}.js",
$script_asset['dependencies'],
$script_asset['version'],
true
);

wp_enqueue_script("wc-{$this->name}-payments-blocks");
}

return ["wc-{$this->name}-payments-blocks"];
Expand Down
20 changes: 15 additions & 5 deletions includes/blocks/gateways/omise-block-credit-card.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,18 @@ public function is_active() {
* @return array
*/
public function get_payment_method_script_handles() {
if ( is_checkout() && $this->is_active() ) {
$script_asset = require_once __DIR__ . '/../assets/js/build/credit_card.asset.php';
if ($this->is_active()) {
$script_asset_path = __DIR__ . '/../assets/js/build/credit_card.asset.php';
$script_asset = file_exists( $script_asset_path )
? require_once( $script_asset_path )
: [
'dependencies' => [],
'version' => '1.0.0'
];

if (is_array($script_asset)) {
wp_register_script(
// Load the script related to OmiseJS in checkout
if (is_checkout()) {
wp_enqueue_script(
'embedded-js',
plugins_url( '../../assets/javascripts/omise-embedded-card.js', __FILE__ ),
['omise-js'],
Expand All @@ -54,8 +61,11 @@ public function get_payment_method_script_handles() {
);

$script_asset['dependencies'] = array_merge($script_asset['dependencies'], ['embedded-js']);
}

wp_register_script(
// Load the script for UI in checkout and cart page.
if (is_checkout() || is_cart() || is_page('cart')) {
wp_enqueue_script(
"{$this->name}-payments-blocks",
plugin_dir_url( __DIR__ ) . 'assets/js/build/credit_card.js',
$script_asset[ 'dependencies' ],
Expand Down
1 change: 0 additions & 1 deletion tests/unit/includes/blocks/gateways/abstract-omise-block-apm-test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ public function get_payment_method_data()
public function get_payment_method_script_handles()
{
Monkey\Functions\expect('wp_script_is')->andReturn(false);
Monkey\Functions\expect('wp_register_script');
Monkey\Functions\expect('plugin_dir_url');
Monkey\Functions\expect('wp_enqueue_script');

Expand Down
1 change: 0 additions & 1 deletion tests/unit/includes/blocks/gateways/abstract-omise-block-payment-test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ public function get_payment_method_script_handles()
$name_property->setValue($this->obj, 'omise_atome');

Monkey\Functions\expect('wp_script_is')->andReturn(false);
Monkey\Functions\expect('wp_register_script');
Monkey\Functions\expect('plugin_dir_url');
Monkey\Functions\expect('wp_enqueue_script');

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/includes/blocks/gateways/omise-block-credit-card-test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public function get_payment_method_data()
public function get_payment_method_script_handles()
{
Monkey\Functions\expect('wp_script_is');
Monkey\Functions\expect('wp_register_script');
Monkey\Functions\expect('wp_enqueue_script');
Monkey\Functions\expect('plugin_dir_url');
Monkey\Functions\expect('plugins_url');
Monkey\Functions\expect('is_checkout')->andReturn(true);
Expand Down
Loading