Bump to version 5.5.0

Author: debba

.distignore

@@ -6,3 +6,6 @@
 .distignore
 .gitignore
 README.md
+gulpfile.js
+package.json
+package-lock.json

.wordpress-org/readme/README.md

@@ -4,7 +4,7 @@ Contributors: dueclic
 Tags: emailchef,newsletter,woocommerce,ecommerce,email 
 Requires at least:6.0
 Tested up to: 6.7
-Stable tag: 5.4
+Stable tag: 5.5.0
 WC requires at least: 8.3.1 
 WC tested up to: 9.6.1
 License: GPLv2 or later
@@ -71,6 +71,9 @@ add_filter('emailchef_abandoned_cart_image_size', 'emailchef_abandoned_cart_imag
 
 == Changelog ==
 
+= 5.5.0 =
+* Small fixes
+
 = 5.4 =
 * Responsive fixes in Admin Area
 

includes/class-wc-emailchef-handler.php

@@ -12,11 +12,16 @@ final class WC_Emailchef_Handler {
 
 		private $namespace;
 
+        private $id = "emailchef";
+
+		/**
+		 * @var WC_Emailchef_Plugin
+		 */
+		private $wcec;
+
 		public function __construct() {
 
-			$this->id        = 'emailchef';
 			$this->namespace = 'wc_' . $this->id;
-			$this->label     = __( 'Emailchef', 'emailchef-for-woocommerce' );
 			$this->wcec      = WCEC();
 			$this->hooks();
 

includes/class-wc-emailchef-plugin.php

@@ -56,7 +56,6 @@ public static function get_instance() {
 			self::$instance->includes();
 			self::$instance->emailchef();
 			self::$instance->handler = WC_Emailchef_Handler::get_instance();
-			self::$instance->load_translations();
 
 
 			do_action( "wc_emailchef_loaded" );
@@ -83,12 +82,7 @@ public static function version_check( $version = '3.0' ) {
 	 */
 
 	public static function version() {
-		if ( ! function_exists( 'get_plugin_data' ) ) {
-			require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
-		}
-		$plugin_data = get_plugin_data( WC_EMAILCHEF_FILE );
-
-		return $plugin_data['Version'];
+		return WC_EMAILCHEF_VERSION;
 	}
 
 	public static function activate() {
@@ -178,7 +172,7 @@ public function enqueue_scripts() {
 
 			wp_register_script( 'woocommerce-emailchef-backend-js',
 				WC_EMAILCHEF_URL . "dist/js/emailchef.min.js", array( 'jquery' ),
-				self::version() );
+				WC_EMAILCHEF_VERSION );
 
 			wp_localize_script( 'woocommerce-emailchef-backend-js', 'wcec', array(
 				"namespace"                           => $this->namespace,
@@ -259,7 +253,7 @@ public function enqueue_scripts() {
 
 			wp_register_style( 'woocommerce-emailchef-backend-css',
 				WC_EMAILCHEF_URL . "dist/css/emailchef.min.css", array(),
-				self::version() );
+				WC_EMAILCHEF_VERSION );
 
 			wp_enqueue_script( 'woocommerce-emailchef-backend-js' );
 			wp_enqueue_style( 'woocommerce-emailchef-backend-css' );
@@ -342,20 +336,12 @@ private function add_hooks() {
 
     public function ecwc_plugin_update_check() {
 
-	    if (!function_exists('get_plugin_data')) {
-		    require_once(ABSPATH . 'wp-admin/includes/plugin.php');
-	    }
-
-
-        /*
 	    $last_run_version = get_option('ecwc_last_run_version', '5.2');
 
-        if (version_compare( $last_run_version, self::version(), '<')) {
+        if (version_compare( $last_run_version, '5.4', '<')) {
             self::deactivate();
-            update_option( 'ecwc_last_run_version', self::version() );
+            update_option( 'ecwc_last_run_version', WC_EMAILCHEF_VERSION );
         }
-        */
-
 
     }
 
@@ -446,22 +432,6 @@ public function footer_text() {
 	public function dueclic_copyright() {
 		add_filter( 'admin_footer_text', array( $this, 'footer_text' ), 11 );
 	}
-
-	/**
-	 * Load translations
-	 */
-
-	public function load_translations() {
-		$lang_path = dirname( dirname( plugin_basename( __FILE__ ) ) )
-		             . '/languages/';
-
-		load_plugin_textdomain(
-			'emailchef-for-woocommerce',
-			false,
-			$lang_path
-		);
-	}
-
 	/**
 	 * Include libraries
 	 */
@@ -523,7 +493,6 @@ public function get_api_url() {
 
 	public function define_constants() {
 		// Plugin version
-		$this->define( "WC_EMAILCHEF_VERSION", self::version() );
 
 		// Plugin folder path
 		$this->define( "WC_EMAILCHEF_DIR",

includes/class-wc-emailchef.php

@@ -654,7 +654,7 @@ public function delete_integration( $list_id ) {
 		$integrations = $this->get_integrations($list_id);
 		foreach ($integrations as $integration) {
 			if ($integration['id'] == 3 && $integration['website'] == get_home_url()){
-				$route = "/lists/${list_id}/integrations/${integration["row_id"]}";
+				$route = "/lists/".$list_id."/integrations/".$integration["row_id"];
 				$response = $this->json( $route, array(), "DELETE" );
 				return ( $response["status"] == "OK" );
 			}