Revert to master

vippsas · Dec 4, 2024 · 6eed4af · 6eed4af
1 parent ac73607
commit 6eed4af
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 26 deletions.
diff --git a/Blocks/dist/buy-now/render.php b/Blocks/dist/buy-now/render.php
@@ -10,5 +10,5 @@
 
 // Only create button if the product has woo-vipps express checkout enabled. LP 29.11.2024
 if ($supports) {
-	echo $vipps->get_buy_now_button($product->get_id(), false);
+	echo "<div class='wp-block-button wc-block-components-product-button wc-block-button-vipps'>" . $vipps->get_buy_now_button($product->get_id(), false) . "</div>";
 }
diff --git a/Vipps.class.php b/Vipps.class.php
@@ -2082,7 +2082,17 @@ public function woocommerce_loaded() {
         add_filter('woocommerce_blocks_product_grid_item_html', function ($html, $data, $product) {
             if (!$this->loop_single_product_is_express_checkout_purchasable($product)) return $html; 
             $stripped = preg_replace("!</li>$!", "", $html);
-            $button = $this->get_buy_now_button($product->get_id(), false);
+            $pid = $product->get_id();
+            $title = sprintf(__('Buy now with %1$s', 'woo-vipps'), $this->get_payment_method_name());
+            $logo = $this->get_payment_logo();
+            $a=1;
+            $button = <<<EOF
+<div class="wp-block-button wc-block-components-product-button wc-block-button-vipps">
+    <a javascript="void(0)" data-product_id="$pid" class="single-product button vipps-buy-now wp-block-button__link" title="$title">
+        <img class="inline vipps-logo negative" src="$logo" alt="$title" border="0">
+    </a>
+    </div>
+EOF;
             return $stripped . $button . "</li>";
         }, 10, 3);
     }
@@ -3934,7 +3944,7 @@ public function get_buy_now_button($product_id,$variation_id=null,$sku=null,$dis
         if ($product_id) $data['product_id'] = $product_id;
         if ($variation_id) $data['variation_id'] = $variation_id;
 
-        $buttoncode = "<div class='wp-block-button wc-block-components-product-button wc-block-button-vipps'><a href='javascript:void(0)' $disabled ";
+        $buttoncode = "<a href='javascript:void(0)' $disabled ";
         foreach($data as $key=>$value) {
             $value = esc_attr($value);
             $buttoncode .= " data-$key='$value' ";
@@ -3953,7 +3963,7 @@ public function get_buy_now_button($product_id,$variation_id=null,$sku=null,$dis
         }
         if ($classes) $classes = " $classes";
 
-        $buttoncode .=  " class='single-product button vipps-buy-now $disabled$classes' title='$title'>$message</a></div>";
+        $buttoncode .=  " class='single-product button vipps-buy-now $disabled$classes' title='$title'>$message</a>";
         return apply_filters('woo_vipps_buy_now_button', $buttoncode, $product_id, $variation_id, $sku, $disabled);
     }
 

diff --git a/css/admin.css b/css/admin.css
@@ -60,21 +60,18 @@ table.webhook-table td.actions {
  max-height: 32px;
 }
 
-.wp-block-button.wc-block-components-product-button.wc-block-button-vipps {
+/* Gutenberg buy-now product block, copied from vipps.css LP 02.12.2024 */
+div.wp-block-button.wc-block-components-product-button.wc-block-button-vipps {
     text-align: center;
 }
-.wp-block-button.wc-block-components-product-button.wc-block-button-vipps .single-product.button.vipps-buy-now {
-    margin-left: auto;
-    margin-right: auto;
+div.wp-block-button.wc-block-components-product-button.wc-block-button-vipps a.single-product.button.vipps-buy-now{
+    /* margin-left: auto;
+    margin-right: auto; */
     display: inline-block;
-    border: 0;
 }
-.wp-block-button.wc-block-components-product-button.wc-block-button-vipps .single-product.button.vipps-buy-now img{
+div.wp-block-button.wc-block-components-product-button.wc-block-button-vipps a.single-product.button.vipps-buy-now img{
     max-width: 10rem;
 }
-body.single-product .wp-block-button.wc-block-components-product-button.wc-block-button-vipps .single-product.button.vipps-buy-now img {
-    max-width: 15rem;
-}
 
 /* Admin-menu for vipps */
 li#toplevel_page_vipps_admin_menu .wp-menu-image.dashicons-before img {

diff --git a/css/vipps.css b/css/vipps.css
@@ -45,34 +45,27 @@ SOFTWARE.
 }
 
 .wc-block-grid__product .single-product.button.vipps-buy-now {
+ min-width:15em;
 }
 
 /* This is for the badge block IOK 2022-11-16 */
 .vipps-badge-wrapper.aligncenter {
   text-align: center;
 }
 
-/* Product buy-now button. LP 02.12.2024 */
-.wp-block-button.wc-block-components-product-button.wc-block-button-vipps {
+/* Gutenberg buy-now product block. LP 02.12.2024 */
+div.wp-block-button.wc-block-components-product-button.wc-block-button-vipps {
     text-align: center;
 }
-.wp-block-button.wc-block-components-product-button.wc-block-button-vipps .single-product.button.vipps-buy-now {
+div.wp-block-button.wc-block-components-product-button.wc-block-button-vipps a.single-product.button.vipps-buy-now{
     margin-left: auto;
     margin-right: auto;
     display: inline-block;
 }
-.wp-block-button.wc-block-components-product-button.wc-block-button-vipps .single-product.button.vipps-buy-now img{
+div.wp-block-button.wc-block-components-product-button.wc-block-button-vipps a.single-product.button.vipps-buy-now img{
     max-width: 10rem;
 }
 
-body.single-product .wp-block-button.wc-block-components-product-button.wc-block-button-vipps {
-    display: inline-block;
-}
-
-body.single-product .wp-block-button.wc-block-components-product-button.wc-block-button-vipps .single-product.button.vipps-buy-now img {
-    max-width: 100%;
-}
-
 /* end block stuff for now */
 
 form#vippsdata {

diff --git a/src/Blocks/src/buy-now/render.php b/src/Blocks/src/buy-now/render.php
@@ -10,5 +10,5 @@
 
 // Only create button if the product has woo-vipps express checkout enabled. LP 29.11.2024
 if ($supports) {
-	echo $vipps->get_buy_now_button($product->get_id(), false);
+	echo "<div class='wp-block-button wc-block-components-product-button wc-block-button-vipps'>" . $vipps->get_buy_now_button($product->get_id(), false) . "</div>";
 }