eCommerce Product Catalog 2.7.0

2.7.0
impleCode · May 8, 2017 · a756bcb · a756bcb
1 parent 0e074a7
commit a756bcb
Show file tree

Hide file tree

Showing 68 changed files with 4,807 additions and 4,100 deletions.
diff --git a/changelog.txt b/changelog.txt
diff --git a/css/al_product-admin.css b/css/al_product-admin.css
@@ -999,15 +999,25 @@ div.setting-content table.no-limit td{
 
 /* Admin ToolTip */
 
-.ui-tooltip {
+.ui-tooltip, .tooltip {
     background: #edf2f2;
     border: 3px solid #dde4e4;
     padding: 10px;
-    color: #0a063b;
+    color: #0a063b !important;
     border-radius: 5px;
     font: normal 14px "Helvetica Neue", Sans-Serif;
     max-width: 220px;
     position: fixed;
+    opacity: 1 !important;
+}
+#integration_wizard .tooltip {
+    left: 0 !important;
+    font: normal 14px "Helvetica Neue", Sans-Serif;
+}
+#integration_wizard .tooltip * {
+    background: transparent !important;
+    color: #0a063b !important;
+    opacity: 1 !important;
 }
 
 /* Admin Validation */
@@ -1049,4 +1059,19 @@ input.error {
     overflow-y: auto;
     /* prevent horizontal scrollbar */
     overflow-x: hidden;
+}
+
+span.ic_tip, input.ic_tip {
+    cursor: help;
+}
+
+@media (max-width: 782px) {
+    .post-type-al_product .wp-list-table .column-image, .post-type-al_product .wp-list-table .column-img, .post-type-al_product .wp-list-table .column-id {
+        display: none !important;
+        text-align: left;
+        padding-bottom: 0;
+    }
+    .post-type-al_product .wp-list-table td.column-id, .post-type-al_product .wp-list-table td.column-image {
+        padding: 3px 8px 3px 35%;
+    }
 }
diff --git a/css/al_product.css b/css/al_product.css
@@ -2,13 +2,13 @@
  * eCommerce Product Catalog
  * https://impleCode.com
  *
- * Copyright 2014 impleCode
+ * Copyright 2017 impleCode
  * Free to use under the GPLv3 license.
  * http://www.gnu.org/licenses/gpl-3.0.html
  *
  * Contributing author: Norbert Dreszer
  *
- * Note: Do not edit this file. If you wish to add your own CSS we strongly recommend creating your own child theme, or installing a custom CSS plugin.
+ * Note: Do not edit this file. If you wish to add your own CSS we strongly recommend to go to WordPress > Appearance > Additional CSS.
  */
 
 /* Product Archive */
@@ -134,6 +134,7 @@ button.grey-box:hover {
     display: inline-block;
     text-decoration: none;
     background-image: none;
+    margin: 0;
 }
 
 .ic-design.button:hover, article.al_product .ic-design.button:hover, #product_listing .ic-design.button:hover, .ic-design.button:active, article.al_product .ic-design.button:active, #product_listing .ic-design.button:active {
@@ -233,7 +234,7 @@ button.grey-box:hover {
     background-color:transparent;
 }
 
-.product-subcategories .al_archive img, .product-list .al_archive img, .al_archive a img, .page .al_archive a img {
+.product-subcategories .al_archive img, .product-list .al_archive img, .al_archive a img, .page .al_archive a img, body.page .al_archive a img {
     position: absolute;
     top: 0;
     left: 0;
@@ -313,9 +314,10 @@ button.grey-box:hover {
     cursor: pointer;
     margin: 0;
     text-shadow: none;
+    z-index: 10;
 }
 
-.content-area.product-catalog {
+#container.content-area.product-catalog {
     float: none;
     margin: 0 auto;
     width: 100%;
@@ -509,8 +511,10 @@ margin-bottom: 0px;
     line-height: 0;
 }
 
-.modern-grid-element > a {
+.modern-grid-element > a, body .product-list .modern-grid-element > a {
     font-size: 0px;
+    position: initial;
+    display: initial;
 }
 
 .modern-grid-element.wider-bg {
@@ -825,7 +829,7 @@ article#product_listing {
 }
 
 /* Product Page */
-.entry-meta {
+.product-entry .entry-meta {
     clear: left;
 }
 
@@ -883,36 +887,32 @@ article#product_listing {
     border: 0;
 }
 
-.price-value.red-price {
+#container.content-area.product-catalog .price-value.red-price, .price-value.red-price {
     font-size: 30px;
-    color: rgb(253, 0, 2);
-}
-
-.price-value.red-price {
     color: #FD0002;
 }
 
-.price-value.green-price {
+#container.content-area.product-catalog .price-value.green-price, .price-value.green-price {
     color: #63AB00;
 }
 
-.price-value.orange-price {
+#container.content-area.product-catalog .price-value.orange-price, .price-value.orange-price {
     color: #FE3C00;
 }
 
-.price-value.blue-price {
+#container.content-area.product-catalog .price-value.blue-price, .price-value.blue-price {
     color: #123f5c;
 }
 
-.price-value.grey-price {
+#container.content-area.product-catalog .price-value.grey-price, .price-value.grey-price {
     color: rgb(136, 136, 136);
 }
 
-.price-value.big-price, .price-value.big-price div {
+.price-value.big-price, .price-value.big-price div, .boxed #product_details table tr td.price-value.big-price {
     font-size: 1.9em;
 }
 
-.price-value.small-price, .price-value.small-price div {
+.price-value.small-price, .price-value.small-price div, .boxed #product_details table tr td.price-value.small-price {
     font-size: 1.3em;
 }
 
@@ -987,22 +987,26 @@ article#product_listing {
     border: 0;
 }
 
-#product_details.product-details.no-image > * {
+#content #product_details.product-details.no-image > *, #product_details.product-details.no-image > * {
     float: right;
     width: 38%;
     clear: right;
 }
 
+#content .boxed #product_details.product-details.no-image > .price-container {
+    border-top: 1px solid #cccccc
+}
+
 .boxed #product_details.product-details.no-image {
     margin-left: 0;
 }
 
-#product_details.product-details.no-image .shortdesc {
+#content #product_details.product-details.no-image .shortdesc, #product_details.product-details.no-image .shortdesc {
     float: left;
     width: 60%;
     border-bottom: 0;
 }
-#product_details.product-details.no-image > *:nth-child(2) {
+.boxed #product_details.product-details.no-image > *:nth-child(2) {
     border-top: 1px solid #cccccc;
 }
 .product-details.no-image .price-value {
@@ -1074,7 +1078,7 @@ article#product_listing {
     background-position: 1%;
     padding: 10px 10px 10px 60px;
     font-weight: bold;
-    margin: 10px 0 10px 0;
+    margin: 10px 0 10px 2px;
     position: relative;
     display: inline-block;
     max-width: 509px;
@@ -1083,6 +1087,10 @@ article#product_listing {
     line-height: 1.2;
 }
 
+#integration_wizard.opacity {
+    opacity: 0.6;
+}
+
 #product_details .al-box, .boxed #product_details .al-box {
     margin-top: 10px;
 }
@@ -1284,6 +1292,7 @@ div.setting-content table td.longer {
     color: #000;
     border: 1px solid #000;
     padding: 5px;
+    background: transparent;
 }
 
 div.fixed-box {
@@ -1298,6 +1307,10 @@ div.fixed-box {
     box-shadow: 0 0 1px 1px #444;
 }
 
+div.fixed-box.integration_start {
+    max-width: 100%;
+}
+
 div.relative-box {
     width: 95%;
     margin: 0 auto;
@@ -1533,6 +1546,7 @@ div.relative-box {
 }
 .attribute-filter {
     margin: 0 3px 10px 0;
+    display: inline-block;
 }
 .reset-filters {
     margin-top: -10px;
@@ -1665,6 +1679,7 @@ input.product-search-box[type="search"], .entry-content input.product-search-box
 
 .green-box #searchsubmit, .red-box #searchsubmit, .orange-box #searchsubmit, .blue-box #searchsubmit, .grey-box #searchsubmit {
     background-image: url('search.png');
+    text-indent: -9999px;
 }
 .product-sort-bar form.product_order {
     padding: 0;
@@ -1820,6 +1835,8 @@ input.product-search-box[type="search"], .entry-content input.product-search-box
     top: 1px;
     vertical-align: top;
     min-height: 0;
+    height: auto;
+    width: auto;
 }
 
 .empty-filters-info {
@@ -1886,6 +1903,7 @@ article.al_product.boxed * {
     border-top: 0;
     margin: 0;
     line-height: 1;
+    color: #000;
 }
 
 .boxed #product_details > div:first-child, .boxed #product_details > table:first-child, .boxed #product_details > form:first-child, .ic-block:first-child {
@@ -1896,12 +1914,23 @@ article.al_product.boxed * {
 
 .boxed #product_details table tr td {
     padding: 0;
+    border: none;
+    font-size: inherit;
+    vertical-align: middle;
 }
-.boxed #product_details *, .ic-blocks {
+.boxed #product_details > *, .ic-blocks {
     margin: 0;
     list-style-position: inside;
 }
 
+.boxed #product_details * {
+    list-style-position: inside;
+}
+
+.boxed .shipping-table ul {
+    margin-bottom: 0px;
+}
+
 .boxed #product_details p {
     margin-bottom: 0.8em;
 }
@@ -1924,6 +1953,7 @@ article.al_product.boxed * {
 .ic-blocks > div:first-child, .boxed #product_details > div:first-child, #content .ic-blocks > div:first-child, #content .boxed #product_details > div:first-child {
     background: transparent;
     border-top: 1px solid #cccccc;
+    color: inherit;
 }
 
 .boxed #product_details div.shortdesc, #content .boxed #product_details div.shortdesc {

diff --git a/css/images/success.png b/css/images/success.png
diff --git a/ecommerce-product-catalog.php b/ecommerce-product-catalog.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * Plugin Name: eCommerce Product Catalog by impleCode
+ * Plugin Name: eCommerce Product Catalog for WordPress
  * Plugin URI: https://implecode.com/wordpress/product-catalog/#cam=in-plugin-urls&key=plugin-url
  * Description: WordPress eCommerce easy to use, powerful and beautiful plugin from impleCode. Great choice if you want to sell easy and quick. Or just beautifully present your products on WordPress website. Full WordPress integration does great job not only for Merchants but also for Developers and Theme Constructors.
- * Version: 2.6.6
+ * Version: 2.7.0
  * Author: impleCode
  * Author URI: https://implecode.com/#cam=in-plugin-urls&key=author-url
  * Text Domain: ecommerce-product-catalog
  * Domain Path: /lang/
 
-  Copyright: 2016 impleCode.
+  Copyright: 2017 impleCode.
   License: GNU General Public License v3.0
   License URI: http://www.gnu.org/licenses/gpl-3.0.html */
 if ( !defined( 'ABSPATH' ) ) {
@@ -47,7 +47,7 @@ public static function instance() {
 				self::$instance->setup_constants();
 
 				add_action( 'plugins_loaded', array( self::$instance, 'load_textdomain' ) );
-				add_action( 'plugins_loaded', array( self::$instance, 'implecode_addons' ) );
+				add_action( 'plugins_loaded', array( self::$instance, 'implecode_addons' ), 30 );
 				add_action( 'admin_enqueue_scripts', array( self::$instance, 'implecode_run_admin_styles' ) );
 				add_action( 'init', array( self::$instance, 'implecode_register_styles' ) );
 				add_action( 'admin_init', array( self::$instance, 'implecode_register_admin_styles' ) );
@@ -57,6 +57,7 @@ public static function instance() {
 
 				//register_activation_hook( __FILE__, 'add_product_caps' );
 				//register_activation_hook( __FILE__, 'epc_activation_function' );
+				do_action( 'ic_epc_loaded' );
 			}
 			return self::$instance;
 		}
@@ -120,7 +121,6 @@ private function includes() {
 			require_once(AL_BASE_PATH . '/includes/index.php' );
 			require_once(AL_BASE_PATH . '/includes/product.php' );
 			require_once(AL_BASE_PATH . '/includes/product-settings.php' );
-			require_once(AL_BASE_PATH . '/includes/settings-defaults.php' );
 			require_once(AL_BASE_PATH . '/functions/base.php' );
 			require_once(AL_BASE_PATH . '/functions/capabilities.php' );
 			require_once(AL_BASE_PATH . '/functions/functions.php' );
@@ -141,6 +141,7 @@ public function implecode_register_styles() {
 			wp_register_style( 'al_product_styles', plugins_url() . '/' . dirname( plugin_basename( __FILE__ ) ) . '/css/al_product.css?' . filemtime( plugin_dir_path( __FILE__ ) . '/css/al_product.css' ), array( 'dashicons' ) );
 			do_action( 'register_catalog_styles' );
 			wp_register_script( 'ic-integration', AL_PLUGIN_BASE_PATH . 'js/integration-script.js?' . filemtime( AL_BASE_PATH . '/js/integration-script.js' ), array( 'al_product_scripts' ) );
+			wp_register_style( 'al_product_admin_styles', plugins_url() . '/' . dirname( plugin_basename( __FILE__ ) ) . '/css/al_product-admin.css?' . filemtime( plugin_dir_path( __FILE__ ) . '/css/al_product-admin.css' ), array( 'wp-color-picker' ) );
 		}
 
 		/**
@@ -178,6 +179,7 @@ public function implecode_enqueue_styles() {
 			wp_localize_script( 'al_product_scripts', 'product_object', array( 'ajaxurl' => admin_url( 'admin-ajax.php' ), 'lightbox_settings' => $colorbox_set ) );
 			wp_enqueue_script( 'al_product_scripts' );
 			if ( is_ic_integration_wizard_page() ) {
+				wp_enqueue_style( 'al_product_admin_styles' );
 				wp_enqueue_script( 'ic-integration' );
 			}
 			do_action( 'enqueue_catalog_scripts' );
@@ -203,9 +205,10 @@ public function implecode_addons() {
 
 } // End if class_exists check
 
-add_action( 'plugins_loaded', 'impleCode_EPC', -2 );
 if ( !function_exists( 'impleCode_EPC' ) ) {
 
+	add_action( 'plugins_loaded', 'impleCode_EPC', -2 );
+
 	/**
 	 * The main function responsible for returning eCommerce_Product_Catalog
 	 *
@@ -218,10 +221,11 @@ function impleCode_EPC() {
 
 }
 
-register_activation_hook( __FILE__, 'IC_EPC_install' );
 
 if ( !function_exists( 'IC_EPC_install' ) ) {
 
+	register_activation_hook( __FILE__, 'IC_EPC_install' );
+
 	function IC_EPC_install() {
 		eCommerce_Product_Catalog::instance();
 		update_option( 'IC_EPC_install', 1 );

diff --git a/ext-comp/index.php b/ext-comp/index.php
@@ -11,7 +11,7 @@
  * @package		ecommerce-product-catalog/ext-comp
  * @author 		Norbert Dreszer
  */
-add_action( 'plugins_loaded', 'run_ext_comp_files' );
+add_action( 'ic_epc_loaded', 'run_ext_comp_files' );
 
 function run_ext_comp_files() {
 	if ( function_exists( 'pll_get_post' ) || function_exists( 'icl_object_id' ) ) {
@@ -28,7 +28,7 @@ function run_ext_comp_files() {
 }
 
 if ( !function_exists( 'run_ic_session' ) ) {
-	add_action( 'plugins_loaded', 'run_ic_session', -1 );
+	add_action( 'ic_epc_loaded', 'run_ic_session', -1 );
 
 	function run_ic_session() {
 		if ( (!is_admin() || (defined( 'DOING_AJAX' ) && DOING_AJAX )) && !class_exists( 'WP_Session' ) && !ic_use_php_session() ) {