Merge pull request #269 from addonify/development

🦄 Includes security bug fixes and new features.
addonify · Jul 19, 2024 · ab5c39f · ab5c39f
2 parents fb5e363 + 3bdb2d2
commit ab5c39f
Show file tree

Hide file tree

Showing 92 changed files with 21,425 additions and 10,107 deletions.
diff --git a/.distignore b/.distignore
@@ -17,6 +17,7 @@ gulpfile.js
 webpack.config.js
 pnpm-lock.yaml
 webpack.mix.js
+webpack.mix.cjs
 package.json
 package-lock.json
 sftp-config.json

diff --git a/addonify-quick-view.php b/addonify-quick-view.php
@@ -10,10 +10,10 @@
  * Plugin Name:       Addonify - Quick View For WooCommerce
  * Plugin URI:        https://addonify.com/downloads/woocommerce-quick-view/
  * Description:       Addonify WooCommerce Quick View plugin adds functionality to have a WooCommerce product quick preview on a modal window.
- * Version:           1.2.16
- * Requires at least: 6.3
+ * Version:           1.2.17
+ * Requires at least: 6.4
  * Requires PHP:      7.4
- * Tested up to:      6.5
+ * Tested up to:      6.6
  * Author:            Addonify
  * Author URI:        https://addonify.com
  * License:           GPL v2 or later
@@ -34,7 +34,7 @@
  * Start at version 1.0.0 and use SemVer - https://semver.org
  * Rename this for your plugin and update it as you release new versions.
  */
-define( 'ADDONIFY_QUICK_VIEW_VERSION', '1.2.16' );
+define( 'ADDONIFY_QUICK_VIEW_VERSION', '1.2.17' );
 define( 'ADDONIFY_QUICK_VIEW_BASENAME', plugin_basename( __FILE__ ) );
 define( 'ADDONIFY_DB_INITIALS', 'addonify_qv_' );
 
@@ -88,19 +88,17 @@ function addonify_quick_view_run() {
 		if ( class_exists( 'WooCommerce' ) ) {
 			$plugin = new Addonify_Quick_View();
 			$plugin->run();
-		} else {
-			if ( version_compare( get_bloginfo( 'version' ), '6.5', '<' ) ) {
-				add_action(
-					'admin_notices',
-					function() {
-						?>
-						<div class="notice notice-error">
-							<p><?php echo esc_html__( 'Addonify Quick View is enabled but not effective. It requires WooCommerce in order to work.', 'addonify-quick-view' ); ?></p>
-						</div>
-						<?php
-					}
-				);
-			}
+		} elseif ( version_compare( get_bloginfo( 'version' ), '6.5', '<' ) ) {
+			add_action(
+				'admin_notices',
+				function () {
+					?>
+					<div class="notice notice-error">
+						<p><?php echo esc_html__( 'Addonify Quick View is enabled but not effective. It requires WooCommerce in order to work.', 'addonify-quick-view-pro' ); ?></p>
+					</div>
+					<?php
+				}
+			);
 		}
 	}
 

diff --git a/admin/assets/js/main.js b/admin/assets/js/main.js
diff --git a/admin/assets/js/vendor.js b/admin/assets/js/vendor.js
diff --git a/admin/src/App.vue b/admin/src/App.vue
@@ -4,6 +4,6 @@
 	<Footer />
 </template>
 <script setup>
-	import Header from "./components/layouts/Header.vue";
-	import Footer from "./components/layouts/Footer.vue";
+import Header from "./components/layouts/Header.vue";
+import Footer from "./components/layouts/Footer.vue";
 </script>
diff --git a/admin/src/components/icons/ModalRows.vue b/admin/src/components/icons/ModalRows.vue
@@ -13,20 +13,12 @@ const props = defineProps({
 </script>
 <template>
 	<template v-if="props.layout === 'default'">
-		<svg
-			xmlns="http://www.w3.org/2000/svg"
-			class="check"
-			viewBox="0 0 24 24"
-		>
+		<svg xmlns="http://www.w3.org/2000/svg" class="check" viewBox="0 0 24 24">
 			<path
 				d="M12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12C22 17.5228 17.5228 22 12 22ZM11.0026 16L18.0737 8.92893L16.6595 7.51472L11.0026 13.1716L8.17421 10.3431L6.75999 11.7574L11.0026 16Z"
 			></path>
 		</svg>
-		<svg
-			viewBox="0 0 160 110"
-			fill="none"
-			xmlns="http://www.w3.org/2000/svg"
-		>
+		<svg viewBox="0 0 160 110" fill="none" xmlns="http://www.w3.org/2000/svg">
 			<rect width="160" height="110" rx="10" fill="#EAEAEA" />
 			<rect x="13" y="15" width="55" height="45" rx="4" fill="#DBDBDB" />
 			<rect x="13" y="68" width="15" height="15" rx="2" fill="#DBDBDB" />
@@ -62,21 +54,13 @@ const props = defineProps({
 		</svg>
 	</template>
 	<template v-if="props.layout === 'row-reversed'">
-		<svg
-			xmlns="http://www.w3.org/2000/svg"
-			class="check"
-			viewBox="0 0 24 24"
-		>
+		<svg xmlns="http://www.w3.org/2000/svg" class="check" viewBox="0 0 24 24">
 			<path
 				d="M12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12C22 17.5228 17.5228 22 12 22ZM11.0026 16L18.0737 8.92893L16.6595 7.51472L11.0026 13.1716L8.17421 10.3431L6.75999 11.7574L11.0026 16Z"
 			></path>
 		</svg>
 
-		<svg
-			viewBox="0 0 160 110"
-			fill="none"
-			xmlns="http://www.w3.org/2000/svg"
-		>
+		<svg viewBox="0 0 160 110" fill="none" xmlns="http://www.w3.org/2000/svg">
 			<rect width="160" height="110" rx="10" fill="#EAEAEA" />
 			<rect x="93" y="15" width="55" height="45" rx="4" fill="#DBDBDB" />
 			<rect x="93" y="68" width="15" height="15" rx="2" fill="#DBDBDB" />

diff --git a/admin/src/components/inputs/Checkbox.vue b/admin/src/components/inputs/Checkbox.vue
@@ -1,31 +1,31 @@
 <script setup>
-	import { computed } from "vue";
-	import { ElCheckbox } from "element-plus";
+import { computed } from "vue";
+import { ElCheckbox } from "element-plus";
 
-	/**
-	 * Define props.
-	 *
-	 * @since 1.0.0
-	 */
-	const props = defineProps({
-		modelValue: [Boolean],
-		label: [String],
-	});
+/**
+ * Define props.
+ *
+ * @since 1.0.0
+ */
+const props = defineProps({
+	modelValue: [Boolean],
+	label: [String],
+});
 
-	/**
-	 * Define emit.
-	 *
-	 * @since 1.0.0
-	 */
-	const emit = defineEmits(["update:modelValue"]);
-	const value = computed({
-		get() {
-			return props.modelValue;
-		},
-		set(newValue) {
-			emit("update:modelValue", newValue);
-		},
-	});
+/**
+ * Define emit.
+ *
+ * @since 1.0.0
+ */
+const emit = defineEmits(["update:modelValue"]);
+const value = computed({
+	get() {
+		return props.modelValue;
+	},
+	set(newValue) {
+		emit("update:modelValue", newValue);
+	},
+});
 </script>
 <template>
 	<el-checkbox v-model="value" label="{{props.label}}" size="large" />

diff --git a/admin/src/components/inputs/CheckboxButton.vue b/admin/src/components/inputs/CheckboxButton.vue
@@ -1,31 +1,31 @@
 <script setup>
-	import { computed } from "vue";
-	import { ElCheckboxGroup, ElCheckboxButton } from "element-plus";
+import { computed } from "vue";
+import { ElCheckboxGroup, ElCheckboxButton } from "element-plus";
 
-	/**
-	 * Define props.
-	 *
-	 * @since 1.0.0
-	 */
-	const props = defineProps({
-		modelValue: [Array],
-		choices: Object,
-	});
+/**
+ * Define props.
+ *
+ * @since 1.0.0
+ */
+const props = defineProps({
+	modelValue: [Array],
+	choices: Object,
+});
 
-	/**
-	 * Define emit.
-	 *
-	 * @since 1.0.0
-	 */
-	const emit = defineEmits(["update:modelValue"]);
-	const value = computed({
-		get() {
-			return props.modelValue;
-		},
-		set(newValue) {
-			emit("update:modelValue", newValue);
-		},
-	});
+/**
+ * Define emit.
+ *
+ * @since 1.0.0
+ */
+const emit = defineEmits(["update:modelValue"]);
+const value = computed({
+	get() {
+		return props.modelValue;
+	},
+	set(newValue) {
+		emit("update:modelValue", newValue);
+	},
+});
 </script>
 <template>
 	<el-checkbox-group v-model="value" size="large">

diff --git a/admin/src/components/inputs/ColorPicker.vue b/admin/src/components/inputs/ColorPicker.vue
@@ -1,42 +1,42 @@
 <script setup>
-	import { computed } from "vue";
-	import { ElColorPicker } from "element-plus";
+import { computed } from "vue";
+import { ElColorPicker } from "element-plus";
 
-	/**
-	 * Define props.
-	 *
-	 * @since 1.0.0
-	 */
-	const props = defineProps({
-		colorVal: String,
-		isAlpha: [Boolean, String],
-		label: String,
-	});
+/**
+ * Define props.
+ *
+ * @since 1.0.0
+ */
+const props = defineProps({
+	colorVal: String,
+	isAlpha: [Boolean, String],
+	label: String,
+});
 
-	/**
-	 * Define emit.
-	 *
-	 * @since 1.0.0
-	 */
-	const emit = defineEmits(["update:colorVal"]);
-	const value = computed({
-		get() {
-			return props.colorVal;
-		},
-		set(newValue) {
-			emit("update:colorVal", newValue);
-		},
-	});
+/**
+ * Define emit.
+ *
+ * @since 1.0.0
+ */
+const emit = defineEmits(["update:colorVal"]);
+const value = computed({
+	get() {
+		return props.colorVal;
+	},
+	set(newValue) {
+		emit("update:colorVal", newValue);
+	},
+});
 
-	/**
-	 * Handle color changed.
-	 * Emit the color immediately. Don't wait till the "ok" button is clicked.
-	 *
-	 * @since 1.0.0
-	 */
-	const handleColorChanged = (color) => {
-		emit("update:colorVal", color);
-	};
+/**
+ * Handle color changed.
+ * Emit the color immediately. Don't wait till the "ok" button is clicked.
+ *
+ * @since 1.0.0
+ */
+const handleColorChanged = (color) => {
+	emit("update:colorVal", color);
+};
 </script>
 <template>
 	<el-color-picker

diff --git a/admin/src/components/inputs/InvalidControl.vue b/admin/src/components/inputs/InvalidControl.vue
@@ -1,5 +1,5 @@
 <script setup>
-	const { __ } = wp.i18n;
+const { __ } = wp.i18n;
 </script>
 <template>
 	<span class="unsupported-control-text">
@@ -16,33 +16,33 @@
 	</span>
 </template>
 <style lang="scss">
-	.unsupported-control-text {
-		font-size: 14px;
+.unsupported-control-text {
+	font-size: 14px;
+}
+.adfy-button.fake-button.forward-to-doc-link {
+	font-size: 14px;
+	fill: var(--addonify_primary_color);
+	color: var(--addonify_primary_color);
+
+	&::after,
+	&::before {
+		content: "";
+		bottom: -5px;
+		height: 2px;
+	}
+	&::after {
+		content: "";
+		background-color: var(--addonify_primary_color);
 	}
-	.adfy-button.fake-button.forward-to-doc-link {
-		font-size: 14px;
-		fill: var(--addonify_primary_color);
-		color: var(--addonify_primary_color);
+	&:hover {
+		fill: var(--addonify_base_text_color);
+		color: var(--addonify_base_text_color);
 
 		&::after,
 		&::before {
 			content: "";
-			bottom: -5px;
-			height: 2px;
-		}
-		&::after {
-			content: "";
-			background-color: var(--addonify_primary_color);
-		}
-		&:hover {
-			fill: var(--addonify_base_text_color);
-			color: var(--addonify_base_text_color);
-
-			&::after,
-			&::before {
-				content: "";
-				background-color: var(--addonify_base_text_color);
-			}
+			background-color: var(--addonify_base_text_color);
 		}
 	}
+}
 </style>