diff --git a/Blocks/woo-vipps-blocks.php b/Blocks/woo-vipps-blocks.php
index c500be7..7614923 100644
--- a/Blocks/woo-vipps-blocks.php
+++ b/Blocks/woo-vipps-blocks.php
@@ -2,36 +2,30 @@
// This is the new script to register blocks built into ./dist. At this time only the vipps-badge block. LP 19.11.2024
-/**
- * Init hooks and inline script for the block vipps-badge. LP 14.11.2024.
- *
- * @return void
- */
-function vipps_badge_block_hooks() {
- add_action('init', function () {
+add_action('init', function () {
register_block_type(__DIR__ . '/dist/vipps-badge');
- });
+});
- // Inject block config variables to vipps-badge editor script. LP 15.11.2024
- add_action('enqueue_block_editor_assets', function () {
+// Inject block config variables to vipps-badge editor script. LP 15.11.2024
+add_action('enqueue_block_editor_assets', function () {
$vipps = Vipps::instance();
$variants = $variants = [
- ['label' => __('White', 'woo-vipps'), 'value' => 'white'],
- ['label' => __('Grey', 'woo-vipps'), 'value' => 'grey'],
- ['label' => __('Filled', 'woo-vipps'), 'value' => 'filled'],
- ['label' => __('Light', 'woo-vipps'), 'value' => 'light'],
- ['label' => __('Purple', 'woo-vipps'), 'value' => 'purple']];
+ ['label' => __('White', 'woo-vipps'), 'value' => 'white'],
+ ['label' => __('Grey', 'woo-vipps'), 'value' => 'grey'],
+ ['label' => __('Filled', 'woo-vipps'), 'value' => 'filled'],
+ ['label' => __('Light', 'woo-vipps'), 'value' => 'light'],
+ ['label' => __('Purple', 'woo-vipps'), 'value' => 'purple']];
// Set a default language for the vipps-badge. LP 21.11.2024
$store_language = substr(get_bloginfo('language'), 0, 2);
if ($store_language == 'nb' || $store_language == 'nn') {
- $store_language = 'no';
+ $store_language = 'no';
}
if ($store_language == 'da') {
- $store_language = 'dk';
+ $store_language = 'dk';
}
if (!in_array($store_language, ['en', 'no', 'dk', 'fi'])) {
- $store_language = 'en';
+ $store_language = 'en';
} // english default fallback
$block_config = [
@@ -50,10 +44,9 @@ function vipps_badge_block_hooks() {
],
];
- wp_add_inline_script('woo-vipps-vipps-badge-editor-script',
- 'const injectedVippsBadgeBlockConfig = ' . json_encode($block_config),
- 'before');
- });
-}
+ wp_add_inline_script('woo-vipps-vipps-badge-editor-script',
+ 'const injectedVippsBadgeBlockConfig = ' . json_encode($block_config),
+ 'before');
+});
+
-vipps_badge_block_hooks();
diff --git a/Vipps.class.php b/Vipps.class.php
index 051b8a0..45a6c39 100644
--- a/Vipps.class.php
+++ b/Vipps.class.php
@@ -398,29 +398,6 @@ public function maybe_add_vipps_badge_feature () {
}
- // Comment out vipps-senere stuff. LP 18.11.2024
- // $price = 0;
- // $supported_currencies = ['NOK'];
- // $currency = get_woocommerce_currency();
- // if ($product && in_array($currency, $supported_currencies)) {
- // // Currently only supports NOK! 2022-11-11 IOK
- // $price = $product->get_price();
- // $price = round($price * 100);
- // $attr .= " amount ='". $price. "' ";
- // }
-
- // $showlater = @$badge_options['later'] && $price>=intval(@$badge_options['minLater']);
- // $showlaterforthis = $product->get_meta('_vipps_badge_pay_later', true);
- // if ($showlaterforthis == 'no') {
- // $showlater = false;
- // } else if ($showlaterforthis == 'later') {
- // $showlater = true;
- // }
-
- // if (apply_filters('woo_vipps_product_badge_show_later', $showlater, $product)) {
- // $attr .= " vipps-senere='" . sanitize_title($badge_options['later']) . "' ";
- // }
-
$lang = $this->get_customer_language();
if ($lang) {
$attr .= " language='". $lang . "' ";
@@ -748,9 +725,7 @@ public function badge_menu_page () {
documented here) or you can use the shortcode.', 'woo-vipps'), Vipps::CompanyName(), "https://developer.vippsmobilepay.com/docs/knowledge-base/design-guidelines/on-site-messaging/"); ?>
[vipps-mobilepay-badge variant={white|filled|light|grey|purple}
language={en|no|fi|dk}]
[vipps-mobilepay-badge variant={white|filled|light|grey|purple}
language={en|no|fi|dk} ]