Merge branch 'develop'

Author: Marten Jansen

README.md

@@ -17,7 +17,12 @@ for consumers not coming back.
 The CreditClick Price Module enhances conversion by highlighting the estimated cost per month already on the product page and in the shopping cart ("Pay at once or pay X per month").  The estimated cost per month is calculated automatically and is explained to the consumer in compliance with the local credit regulation.
 
 Please note that the CreditClick Price Module is only displayed on the product page when the
-product offered costs at least € 250 and up to € 1,000. 
+product offered amount is within the limits of the country.
+
+|  | Minimum amount | Maximum amount |
+| --- |---| --- |
+| The Netherlands | € 250,- | € 1000,- |
+| Germany  | € 150,- | € 5000,- |
 
 Download the special WooCommerce module [here](https://github.com/CreditClick/PriceModuleWooCommerce/releases)
 

ceditclick-pm/credit_click_pm.php

@@ -41,7 +41,7 @@ public function get_ad($amount, $class=''){
 		ob_start();
 		?>
 		<style><?=$this->get_option('style');?></style>
-		<div class="<?=$class?>" data-cc="<?=$amount;?>" data-cc-btn="<?=$this->get_option('type_class');?>"></div>
+		<div class="<?=$class?>" data-cc="<?=$amount;?>" data-cc-country="<?=$this->get_option('country');?>"></div>
 		<?php
 		return ob_get_clean();
 	}
@@ -94,7 +94,7 @@ public function get_timestamp(){
 
 	public function enqueue_script() {
 
-		wp_register_script('cca-script', 'https://ecom.creditclick.eu/cc_nl.min.js','', $this->get_timestamp(), false);
+		wp_register_script('cca-script', 'https://ecom.creditclick.eu/cc.min.js','', $this->get_timestamp(), false);
 		wp_enqueue_script('cca-script');
 		wp_add_inline_script( 'cca-script', 'loadCreditClick(); jQuery(function($) { $( document.body ).on( "updated_cart_totals", function(event) { loadCreditClick(); }); });' );
 	}

ceditclick-pm/credit_click_pm_admin.php

@@ -113,15 +113,22 @@ public function page_init()
 			$this->option_section_name // Section
 		);
 
-
-		// Ad type / class
-		add_settings_field(
-			'type_class', // ID
-			'Choose type of button (example: 1 or 2)', // Title
-			array( $this, 'type_class_callback' ), // Callback
+        add_settings_field(
+			'country', // ID
+			'Select Country', // Title
+			array( $this, 'country_callback' ), // Callback
 			$this->option_page_name, // Page
 			$this->option_section_name  // Section
 		);
+
+//		// Ad type / class
+//		add_settings_field(
+//			'type_class', // ID
+//			'Choose type of button (example: 1 or 2)', // Title
+//			array( $this, 'type_class_callback' ), // Callback
+//			$this->option_page_name, // Page
+//			$this->option_section_name  // Section
+//		);
 		// Custom CSS
 		add_settings_field(
 			'style',  // ID
@@ -153,9 +160,12 @@ public function sanitize($input)
 		if(isset($input['cart_enable']))
 			$new_input['cart_enable'] = absint(intval($input['cart_enable']));
 
-		// Ad type / class
-		if(isset($input['type_class']))
-			$new_input['type_class'] = absint(intval($input['type_class']));
+        if(isset($input['country']))
+            $new_input['country'] = sanitize_textarea_field($input['country']);
+
+//		// Ad type / class
+//		if(isset($input['type_class']))
+//			$new_input['type_class'] = absint(intval($input['type_class']));
 
 		// Custom CSS
 		if(isset($input['style']))
@@ -207,18 +217,31 @@ public function cart_enable_callback()
 		);
 	}
 
+    /**
+     *
+     */
+    public function  country_callback() {
+        $items = array("NL", "DE");
+        echo "<select id='country' name='" . $this->option_name . "[country]'>";
+        foreach($items as $item) {
+            $selected = ($this->options['country'] == $item) ? 'selected="selected"' : '';
+            echo "<option value='$item' $selected>$item</option>";
+        }
+        echo "</select>";
+    }
+
 
 	/**
 	 *
 	 */
-	public function type_class_callback()
-	{
-		printf(
-			'<input type="number" id="type_class" name="%s[type_class]" value="%s" />',
-			$this->option_name,
-			isset( $this->options['type_class']) ? esc_attr( $this->options['type_class']) : ''
-		);
-	}
+//	public function type_class_callback()
+//	{
+//		printf(
+//			'<input type="number" id="type_class" name="%s[type_class]" value="%s" />',
+//			$this->option_name,
+//			isset( $this->options['type_class']) ? esc_attr( $this->options['type_class']) : ''
+//		);
+//	}
 
 	/**
 	 *

ceditclick-pm/index.php

@@ -3,12 +3,12 @@
 Plugin Name: CreditClick Price Module
 Plugin URI: https://github.com/CreditClick/PriceModuleWooCommerce
 Description: Extends WooCommerce with a CreditClick pricing information on products.
-Version: 1.2.0
+Version: 2.0.0
 Author: CreditClick
 Author URI: https://creditclick.eu/
 Text Domain: creditclick-pm-
 Domain Path: /lang
-Copyright: © 2018 CreditClick
+Copyright: © 2019 CreditClick
 License: BSD 2-Clause
 License URI: https://github.com/CreditClick/PriceModuleWooCommerce/blob/master/LICENSE
 */