prepare release v1.4.2

gmn42 · Jan 1, 2023 · 44a5713 · 44a5713
1 parent 59b0278
commit 44a5713
Show file tree

Hide file tree

Showing 39 changed files with 1,895 additions and 5,447 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -8,6 +8,7 @@ module.exports = {
 	globals: {
 		wp: true,
 		es6: true,
+		wc_serial_numbers_vars: true,
 	},
 	rules: {
 		camelcase: 0,

diff --git a/.gitignore b/.gitignore
@@ -1,54 +1,56 @@
-# Editors
-project.xml
-project.properties
-/nbproject/private/
-.buildpath
-.project
-.settings*
-.idea
-.vscode
-*.sublime-project
-*.sublime-workspace
-.sublimelinterrc
-
-# Grunt
-/node_modules/
-none
-
-# Sass
-.sass-cache/
-
-# OS X metadata
+# IDEs
+/.settings
+/.project
+/.idea
+*.esproj
+*.tmproj
+*.tmproject
+tmtags
+.*.sw[a-z]
+*.un~
+Session.vim
+*.swp
+
+# Mac OSX
 .DS_Store
+._*
+.Spotlight-V100
+.Trashes
 
-# Windows junk
+# Windows
 Thumbs.db
+Desktop.ini
 
-# ApiGen
-/wc-apidocs/
+# NPM packages used by Grunt.js
+node_modules
+bower_components
+.idea
+*.log
+npm-debug.log
 
-# Behat/CLI Tests
-tests/cli/installer
-tests/cli/composer.phar
-tests/cli/composer.lock
-tests/cli/composer.json
-tests/cli/vendor
+# Composer
+/vendor
 
-# Unit tests
+# PHPUnit
 /tmp
-/tests/bin/tmp
-/tests/e2e-tests/config/local-*.json
-/tests/e2e-tests/config/local.json
 
-# Logs
-/logs
+# Misc
+*.zip
+.cache
+.sass-cache*
+.husky
+*.lock
+
+# Tests
+codeception.yml
+.env
+/tests/_data/dump.sql
+.env.testing
+
+# Framework
+lib
 
-# Composer
-/vendor/
-contributors.md
 
-# Screenshots for e2e tests failures
-/screenshots/
+# Build
+assets/dist
 
-#build
-build
diff --git a/assets/css/settings.scss b/assets/css/settings.scss
diff --git a/assets/js/admin-script.js b/assets/js/admin-script.js
@@ -5,108 +5,102 @@
  * Copyright (c) 2018 pluginever
  * Licensed under the GPLv2+ license.
  */
-
-(function ($, window) {
+/* global jQuery, wc_serial_numbers_vars */
+( function( $, window ) {
 	'use strict';
-	$.wc_serial_numbers_admin = function () {
-		var plugin = this;
-		plugin.init = function () {
-			plugin.init_select2('.wc-serial-numbers-select-product', 'wc_serial_numbers_search_products', wc_serial_numbers_admin_i10n.i18n.search_product);
-			plugin.init_datepicker('.wc-serial-numbers-select-date');
-			plugin.encrypt_decrypt();
-		};
 
-		plugin.init_select2 = function (el, action, placeholder) {
-			placeholder = placeholder || 'Select..';
-			$(el).select2({
+	if ( typeof wc_serial_numbers_vars === 'undefined' ) {
+		return false;
+	}
+
+	var wc_serial_numbers_admin = {
+		init: function() {
+			this.select2( '.wc_serial_numbers_search_product', 'wc_serial_numbers_search_product' );
+			$(document).on('click', '.wc-serial-numbers-decrypt-key', this.encrypt_decrypt_key);
+			this.init_datepicker('.wc-serial-numbers-select-date');
+		},
+		select2: function( el, action ) {
+			var $el = $( el );
+			console.log($el);
+			if ( ! $el.length ) {
+				return;
+			}
+			$el.select2( {
 				ajax: {
 					cache: true,
 					delay: 500,
-					url: window.wc_serial_numbers_admin_i10n.ajaxurl,
+					url: window.wc_serial_numbers_vars.ajaxurl,
 					method: 'POST',
 					dataType: 'json',
-					data: function (params) {
+					data( params ) {
 						return {
-							action: action,
-							nonce: window.wc_serial_numbers_admin_i10n.nonce,
+							action,
+							nonce: window.wc_serial_numbers_vars.search_nonce,
 							search: params.term,
-							page: params.page
+							page: params.page,
 						};
 					},
-					processResults: function (data, params) {
-						params.page = params.page || 1;
-						return {
-							results: data.results,
-							pagination: {
-								more: data.pagination.more
-							}
-						};
-					}
 				},
-				placeholder: placeholder,
+				placeholder: $( el ).attr( 'placeholder' ),
 				minimumInputLength: 1,
-				allowClear: true
+				allowClear: true,
+			} );
+			$( document.body ).trigger( 'wc_serial_numbers_init_select2_' + action, { $el: $el } );
+		},
+		encrypt_decrypt_key: function( e ) {
+			e.preventDefault();
+			var self = $(this);
+			var id = self.data('serial-id');
+			var nonce = self.data('nonce') || null;
+			var td = self.closest('td');
+			var code = td.find('.serial-key');
+			var spinner = td.find('.serial-spinner');
+			spinner.show();
+			if (!code.hasClass('encrypted')) {
+				code.addClass('encrypted');
+				spinner.hide();
+				code.text('');
+				self.text(wc_serial_numbers_vars.i18n.show);
+				return false;
+			}
+			wp.ajax.send('wc_serial_numbers_decrypt_key', {
+				data: {
+					serial_id: id,
+					nonce: nonce
+				},
+				success: function (res) {
+					code.text(res.key);
+					spinner.hide();
+					code.removeClass('encrypted');
+					self.text(wc_serial_numbers_vars.i18n.hide);
+				},
+				error: function () {
+					spinner.hide();
+					code.text('');
+					code.addClass('encrypted');
+					self.text(wc_serial_numbers_vars.i18n.show);
+					alert('Decrypting key failed');
+				}
 			});
-		};
-		plugin.init_datepicker = function (el) {
+		},
+		init_datepicker: function(el) {
+			// If datepicker is not defined, exit.
+			if ( typeof $.fn.datepicker === 'undefined' ) {
+				return;
+			}
 			$(el).datepicker({
 				changeMonth: true,
 				changeYear: true,
 				dateFormat: 'yy-mm-dd',
 				firstDay: 7,
 				minDate: new Date()
 			});
-		};
-
-
-		plugin.encrypt_decrypt = function () {
-			//show decrypted value
-			$(document).on('click', '.wc-serial-numbers-decrypt-key', function (e) {
-				e.preventDefault();
-				var self = $(this);
-				var id = self.data('serial-id');
-				var nonce = self.data('nonce') || null;
-				var td = self.closest('td');
-				var code = td.find('.serial-key');
-				var spinner = td.find('.serial-spinner');
-				spinner.show();
-				if (!code.hasClass('encrypted')) {
-					code.addClass('encrypted');
-					spinner.hide();
-					code.text('');
-					self.text(wc_serial_numbers_admin_i10n.i18n.show);
-					return false;
-				}
-				wp.ajax.send('wc_serial_numbers_decrypt_key', {
-					data: {
-						serial_id: id,
-						nonce: nonce
-					},
-					success: function (res) {
-						code.text(res.key);
-						spinner.hide();
-						code.removeClass('encrypted');
-						self.text(wc_serial_numbers_admin_i10n.i18n.hide);
-					},
-					error: function () {
-						spinner.hide();
-						code.text('');
-						code.addClass('encrypted');
-						self.text(wc_serial_numbers_admin_i10n.i18n.show);
-						alert('Decrypting key failed');
-					}
-				});
-
-				return false;
-			});
-		};
-		plugin.init();
-	};
+		}
+	}
 
-	//$.fn
-	$.fn.wc_serial_numbers_admin = function () {
-		return new $.wc_serial_numbers_admin();
-	};
+	// Initialize the script on document ready.
+	$( document ).ready( function() {
+		wc_serial_numbers_admin.init();
+	} );
 
-	$.wc_serial_numbers_admin();
-})(jQuery, window);
+}( jQuery, window ) );
diff --git a/assets/js/settings.js b/assets/js/settings.js
diff --git a/composer.json b/composer.json
@@ -14,11 +14,14 @@
     {
       "url": "[email protected]:pluginever/framework-plugin.git",
       "type": "github"
+    },
+    {
+      "url": "[email protected]:pluginever/framework-settings.git",
+      "type": "github"
     }
   ],
   "require": {
-    "php": ">=7.2",
-    "illuminate/database": "^8.83"
+    "php": ">=7.0"
   },
   "require-dev": {
     "byteever/byteever-sniffs": "dev-master",
@@ -34,7 +37,8 @@
     "coenjacobs/mozart": "^0.7.1",
     "lucatume/wp-browser": "^3.1",
     "phpcompatibility/php-compatibility": "9.3.5",
-    "pluginever/framework-plugin": "dev-master"
+    "pluginever/framework-plugin": "dev-master",
+    "pluginever/framework-settings": "dev-master"
   },
   "config": {
     "optimize-autoloader": true,
@@ -80,12 +84,13 @@
   "extra": {
     "mozart": {
       "dep_namespace": "WooCommerceSerialNumbers\\",
-      "dep_directory": "/src/",
-      "classmap_directory": "/src/classes/",
+      "dep_directory": "/lib/",
+      "classmap_directory": "/lib/classes/",
       "classmap_prefix": "WooCommerceSerialNumbers_",
       "delete_vendor_directories": true,
       "packages": [
-        "pluginever/framework-plugin"
+        "pluginever/framework-plugin",
+        "pluginever/framework-settings"
       ]
     }
   }

diff --git a/examples/api-test.php b/examples/api-test.php
@@ -4,9 +4,9 @@
 if ( ! current_user_can( 'manage_options' ) ) die();
 
 
-// API variables, please override
-$base_url    = 'http://wcdevelop.test';
-$email       = 'manikdrmc@gmail.com';
+// API variables, please override.
+$base_url    = 'http://domain.com';
+$email       = 'example@domain.com';
 $product_id  = '24';
 $license_key = 'Serial-0000000001163';
 $instance    = '15924263261';

diff --git a/includes/admin/class-wc-serial-numbers-admin-menus.php b/includes/admin/class-wc-serial-numbers-admin-menus.php
@@ -60,28 +60,6 @@ public function register_pages() {
 			'wc-serial-numbers-activations',
 			array( 'WC_Serial_Numbers_Admin_Activations_Screen', 'output' )
 		);
-
-		add_submenu_page(
-			'wc-serial-numbers',
-			__( 'Settings', 'wc-serial-numbers' ),
-			__( 'Settings', 'wc-serial-numbers' ),
-			$role,
-			'wc-serial-numbers-settings',
-			array( 'WC_Serial_Numbers_Admin_Settings', 'output' )
-		);
-
-		if ( ! defined( 'WC_SERIAL_NUMBER_PRO_PLUGIN_VERSION' ) ) {
-			add_submenu_page(
-				'wc-serial-numbers',
-				'',
-				'<span style="color:#ff7a03;"><span class="dashicons dashicons-star-filled" style="font-size: 17px"></span> ' . __( 'Go Pro', 'wc-serial-numbers' ) . '</span>',
-				'edit_others_posts',
-				'go_wcsn_pro',
-				array( $this, 'go_pro_redirect' )
-			);
-		}
-
-
 		add_action( 'load-' . $serial_number_page, array( $this, 'load_serial_numbers_page' ) );
 	}