Merge branch 'develop'

Author: Marten Jansen

composer.json

@@ -21,8 +21,7 @@
     "issues": "https://github.com/CreditClick/PriceModuleMagento2/issues"
   },
   "require": {
-    "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0",
-	"magento/framework": "*"
+    "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0"
   },
   "autoload": {
     "files": [

etc/module.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="CreditClick_PriceModule" setup_version="1.0.1">
+    <module name="CreditClick_PriceModule" setup_version="1.0.2">
     </module>
 </config>

view/frontend/templates/product/view/catalog_category.phtml

@@ -14,16 +14,26 @@ $price = 0;
         <?=$custom_css;?>
     </style>
     <script type="text/javascript">
+        String.prototype.replaceAll = function(target, replacement) {
+            return this.split(target).join(replacement);
+        };
         require(["jquery","domReady!"], function ($) {
 
             $('.products.list.items.product-items').children('li').each(function( index ) {
                 let price_module = $(this).find('.cc-price-module-catalog_category');
+                let price_box = $(this).find('.price-wrapper');
+
                 if ($(price_module[0]).hasClass('cc-loc-changed') === false) {
                     let target = $(this).find('.price-box.price-final_price');
                     let price = $(this).find('[data-price-amount]').data('price-amount') * 100;
                     $(price_module[0]).attr('data-cc', price);
                     $(price_module[0]).appendTo(target);
                     $(price_module[0]).addClass('cc-loc-changed');
+                    $(price_box).on('DOMSubtreeModified', function() {
+                        let price2 = ($('.price', price_box).html() + "").replaceAll('€', '').replaceAll(' ', '').replaceAll('&nbsp;', '').replaceAll('.', '').replaceAll(',', '');
+                        $(price_module[0]).attr('data-cc', price2);
+                        loadCreditClick();
+                    });
                 }
             });
             loadCreditClick();

view/frontend/templates/product/view/catalog_product.phtml

@@ -15,7 +15,19 @@ $custom_css = $block->escapeHtml($this->helper('\CreditClick\PriceModule\Helper\
 <div class="cc-price-module-catalog_product" data-cc="<?=$price;?>" data-cc-btn="<?=$button_type?>"></div>
 <script type="text/javascript">
     require(["jquery","domReady!"], function ($) {
+        String.prototype.replaceAll = function(target, replacement) {
+            return this.split(target).join(replacement);
+        };
         loadCreditClick();
+        $(document).ready(function () {
+            let price_box = $(this).find('.price-wrapper');
+            debugger;
+            $(price_box).on('DOMSubtreeModified', function () {
+                let price2 = ($('.price', price_box).html() + "").replaceAll('€', '').replaceAll(' ', '').replaceAll('&nbsp;', '').replaceAll('.', '').replaceAll(',', '');
+                $('.cc-price-module-catalog_product').attr('data-cc', price2);
+                loadCreditClick();
+            });
+        });
     });
 </script>
 <style>

view/frontend/templates/product/view/catalogsearch_result.phtml

@@ -19,16 +19,25 @@ $price = 0;
     <?=$custom_css;?>
 </style>
 <script type="text/javascript">
+    String.prototype.replaceAll = function(target, replacement) {
+        return this.split(target).join(replacement);
+    };
     require(["jquery","domReady!"], function ($) {
 
         $('.products.list.items.product-items').children('li').each(function( index ) {
             let price_module = $(this).find('.cc-price-module-catalogsearch_result');
+            let price_box = $(this).find('.price-wrapper');
             if ($(price_module[0]).hasClass('cc-loc-changed') === false) {
                 let target = $(this).find('[data-price-box]');
                 let price = $(this).find('[data-price-amount]').data('price-amount') * 100;
                 $(price_module[0]).attr('data-cc', price);
                 $(price_module[0]).appendTo(target);
                 $(price_module[0]).addClass('cc-loc-changed');
+                $(price_box).on('DOMSubtreeModified', function() {
+                    let price2 = ($('.price', price_box).html() + "").replaceAll('€', '').replaceAll(' ', '').replaceAll('&nbsp;', '').replaceAll('.', '').replaceAll(',', '');
+                    $(price_module[0]).attr('data-cc', price2);
+                    loadCreditClick();
+                });
             }
         });
         loadCreditClick();