Eoxia / wpshop

includes/modules/wps_dashboard/templates/backend/dashboard.php

Spacing +46 added lines, -46 removed lines

@@ -1,16 +1,16 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
 <div class="wrap wpshopMainWrap" >
 	<div id="wpshopLoadingPicture" class="wpshopHide" ><img src="<?php echo WPSHOP_LOADING_ICON; ?>" alt="loading picture" class="wpshopPageMessage_Icon" /></div>
-	<div id="wpshopMessage" class="fade below-h2 wpshopPageMessage <?php echo ( !empty( $actionInformationMessage ) ? 'wpshopPageMessage_Updated' : ''); ?>" ><?php !empty( $actionInformationMessage ) ? _e( $actionInformationMessage, 'wpshop' ) : ''; ?></div>
+	<div id="wpshopMessage" class="fade below-h2 wpshopPageMessage <?php echo (!empty($actionInformationMessage) ? 'wpshopPageMessage_Updated' : ''); ?>" ><?php !empty($actionInformationMessage) ? _e($actionInformationMessage, 'wpshop') : ''; ?></div>
 
 	<div class="pageTitle" id="pageTitleContainer" >
-		<h2 ><?php _e( 'Shop dashboard', 'wpshop'); ?></h2>
+		<h2 ><?php _e('Shop dashboard', 'wpshop'); ?></h2>
 	</div>
 	<div id="champsCaches" class="wpshop_cls wpshopHide" ></div>
 	<div class="wpshop_cls" id="wpshopMainContent" >
 
-	<?php apply_filters( 'wps-dashboard-notice', '' ); ?>
+	<?php apply_filters('wps-dashboard-notice', ''); ?>
 
 	<div id="wpshop_dashboard">
 
@@ -30,7 +30,7 @@ 
 
 									<td class="first b"><a href="edit.php?post_type=<?php echo WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT; ?>"><?php
 										$num_posts = wp_count_posts(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
-										$number_of_products = number_format_i18n( $num_posts->publish );
+										$number_of_products = number_format_i18n($num_posts->publish);
 										echo $number_of_products;
 									?></a></td>
 									<td class="t"><a href="edit.php?post_type=<?php echo WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT; ?>"><?php _e('Products', 'wpshop'); ?></a></td>
@@ -46,7 +46,7 @@ 
 								</tr>
 								<tr>
 									<?php
-									$query = $wpdb->prepare( "SELECT COUNT( DISTINCT us.ID ) FROM {$wpdb->users} us JOIN {$wpdb->posts} ON us.ID = post_author AND post_type = %s", WPSHOP_NEWTYPE_IDENTIFIER_ORDER );
+									$query = $wpdb->prepare("SELECT COUNT( DISTINCT us.ID ) FROM {$wpdb->users} us JOIN {$wpdb->posts} ON us.ID = post_author AND post_type = %s", WPSHOP_NEWTYPE_IDENTIFIER_ORDER);
 									$result = $wpdb->get_var($query);
 									?>
 									<td class="first b"><a href="users.php"><?php echo $result; ?></a></td>
@@ -76,8 +76,8 @@ 
 								if ($orders) {
 									foreach ($orders as $o) {
 										$order = get_post_meta($o->ID, '_order_postmeta', true);
-										if(!empty($order['order_status'])){
-											switch($order['order_status']) {
+										if (!empty($order['order_status'])) {
+											switch ($order['order_status']) {
 												case 'completed': $order_completed++; break;
 												case 'shipped': $order_shipped++; break;
 												case 'awaiting_payment': $order_awaiting_payment++; break;
@@ -136,11 +136,11 @@ 
 				<h3 class="hndle"><span class="dashicons dashicons-performance"></span> <span><?php _e('Quick Links', 'wpshop') ?></span></h3>
 				<div class="inside">
 					<div class="wps-gridwrapper5-padded wpshop-gridwrapper-quick-link">
-						<div><div class="wps_quick_link_icon"><a href="<?php echo admin_url( 'post-new.php?post_type=wpshop_product' ); ?>"><span class="dashicons dashicons-archive"></span></a></div><center><a href="<?php echo admin_url( 'post-new.php?post_type=wpshop_product' ); ?>"><?php _e( 'Create a new product', 'wpshop'); ?></a></center></div>
-						<div><div class="wps_quick_link_icon"><a href="<?php echo admin_url( 'post-new.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER ); ?>"><span class="dashicons dashicons-cart"></span></a></div><center><a href="<?php echo admin_url( 'post-new.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER ); ?>"><?php _e( 'Create order', 'wpshop'); ?></a></center></div>
-						<div><div class="wps_quick_link_icon"><a href="<?php echo admin_url( 'post-new.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS ); ?>"><span class="dashicons dashicons-businessman"></span></a></div><center><a href="<?php echo admin_url( 'post-new.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS ); ?>"><?php _e( 'Create a customer', 'wpshop'); ?></a></center></div>
-						<div><div class="wps_quick_link_icon"><a href="<?php echo admin_url( 'admin.php?page=wpshop_statistics' ); ?>"><span class="dashicons dashicons-chart-line"></span></a></div><center><a href="<?php echo admin_url( 'admin.php?page=wpshop_statistics' ); ?>"><?php _e( 'Statistics', 'wpshop'); ?></a></center></div>
-						<div><div class="wps_quick_link_icon"><a href="<?php echo admin_url( 'options-general.php?page=wpshop_option#wpshop_display_option' ); ?>"><span class="dashicons dashicons-admin-appearance"></span></a></div><center><a href="<?php echo admin_url( 'options-general.php?page=wpshop_option' ); ?>"><?php _e( 'Customize your shop', 'wpshop'); ?></a></center></div>
+						<div><div class="wps_quick_link_icon"><a href="<?php echo admin_url('post-new.php?post_type=wpshop_product'); ?>"><span class="dashicons dashicons-archive"></span></a></div><center><a href="<?php echo admin_url('post-new.php?post_type=wpshop_product'); ?>"><?php _e('Create a new product', 'wpshop'); ?></a></center></div>
+						<div><div class="wps_quick_link_icon"><a href="<?php echo admin_url('post-new.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER); ?>"><span class="dashicons dashicons-cart"></span></a></div><center><a href="<?php echo admin_url('post-new.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER); ?>"><?php _e('Create order', 'wpshop'); ?></a></center></div>
+						<div><div class="wps_quick_link_icon"><a href="<?php echo admin_url('post-new.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS); ?>"><span class="dashicons dashicons-businessman"></span></a></div><center><a href="<?php echo admin_url('post-new.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS); ?>"><?php _e('Create a customer', 'wpshop'); ?></a></center></div>
+						<div><div class="wps_quick_link_icon"><a href="<?php echo admin_url('admin.php?page=wpshop_statistics'); ?>"><span class="dashicons dashicons-chart-line"></span></a></div><center><a href="<?php echo admin_url('admin.php?page=wpshop_statistics'); ?>"><?php _e('Statistics', 'wpshop'); ?></a></center></div>
+						<div><div class="wps_quick_link_icon"><a href="<?php echo admin_url('options-general.php?page=wpshop_option#wpshop_display_option'); ?>"><span class="dashicons dashicons-admin-appearance"></span></a></div><center><a href="<?php echo admin_url('options-general.php?page=wpshop_option'); ?>"><?php _e('Customize your shop', 'wpshop'); ?></a></center></div>
 					</div>
 				</div>
 			</div><!-- postbox end -->
@@ -155,36 +155,36 @@ 
 						<div class="wps-table-header wps-table-row">
 							<div class="wps-table-cell"><?php _e('Number of users', 'wpshop'); ?></div>
 							<div class="wps-table-cell"><?php $result = count(get_users()); echo $result; ?></div>
-							<div class="wps-table-cell"><?php echo ( !empty($result) ) ? '<a href="' . admin_url(). 'admin.php?page=wpshop_dashboard&download_users=users_all" role="button" id="download_all_users_contacts" class="wps-bton-first-rounded">' .__( 'Download the list', 'wpshop' ). '</a>' : ''; ?></div>
+							<div class="wps-table-cell"><?php echo (!empty($result)) ? '<a href="' . admin_url() . 'admin.php?page=wpshop_dashboard&download_users=users_all" role="button" id="download_all_users_contacts" class="wps-bton-first-rounded">' . __('Download the list', 'wpshop') . '</a>' : ''; ?></div>
 						</div>
 
 
 
 						<div class="wps-table-header wps-table-row">
 							<?php
-							$query = $wpdb->prepare( "SELECT COUNT( DISTINCT user_id ) FROM {$wpdb->usermeta} JOIN {$wpdb->posts} ON post_author = user_id AND post_type = %s WHERE meta_key = %s AND ( meta_value LIKE ('%%%s%%') || meta_value LIKE ('%%%s%%') )", WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'user_preferences', 's:16:"newsletters_site";i:1;', 's:16:"newsletters_site";b:1;' );
+							$query = $wpdb->prepare("SELECT COUNT( DISTINCT user_id ) FROM {$wpdb->usermeta} JOIN {$wpdb->posts} ON post_author = user_id AND post_type = %s WHERE meta_key = %s AND ( meta_value LIKE ('%%%s%%') || meta_value LIKE ('%%%s%%') )", WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'user_preferences', 's:16:"newsletters_site";i:1;', 's:16:"newsletters_site";b:1;');
 							$nbcustomers_site = $wpdb->get_var($query);
 							?>
 							<div class="wps-table-cell"><?php _e('Number of customers who wants to receive shop newsletters', 'wpshop'); ?></div>
 							<div class="wps-table-cell"><?php echo $nbcustomers_site; ?></div>
-							<div class="wps-table-cell"><?php echo ( !empty($nbcustomers_site) ) ? '<a href="' . admin_url(). 'admin.php?page=wpshop_dashboard&download_users=newsletters_site" role="button" id="download_newsletter_contacts" class="wps-bton-first-rounded">' .__( 'Download the list', 'wpshop' ). '</a>' : ''; ?></div>
+							<div class="wps-table-cell"><?php echo (!empty($nbcustomers_site)) ? '<a href="' . admin_url() . 'admin.php?page=wpshop_dashboard&download_users=newsletters_site" role="button" id="download_newsletter_contacts" class="wps-bton-first-rounded">' . __('Download the list', 'wpshop') . '</a>' : ''; ?></div>
 						</div>
 
 						<div class="wps-table-header wps-table-row">
 							<?php
-							$query = $wpdb->prepare( "SELECT COUNT( DISTINCT user_id ) FROM {$wpdb->usermeta} JOIN {$wpdb->posts} ON post_author = user_id AND post_type = %s WHERE meta_key = %s AND ( meta_value LIKE ('%%%s%%') || meta_value LIKE ('%%%s%%') )", WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'user_preferences', 's:25:"newsletters_site_partners";i:1;', 's:25:"newsletters_site_partners";b:1;' );
+							$query = $wpdb->prepare("SELECT COUNT( DISTINCT user_id ) FROM {$wpdb->usermeta} JOIN {$wpdb->posts} ON post_author = user_id AND post_type = %s WHERE meta_key = %s AND ( meta_value LIKE ('%%%s%%') || meta_value LIKE ('%%%s%%') )", WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'user_preferences', 's:25:"newsletters_site_partners";i:1;', 's:25:"newsletters_site_partners";b:1;');
 							$nbcustomers_site_partners = $wpdb->get_var($query);
 							?>
 							<div class="wps-table-cell"><?php _e('Number of customers who wants to receive partners newsletters', 'wpshop'); ?></div>
 							<div class="wps-table-cell"><?php echo $nbcustomers_site_partners; ?></div>
-							<div class="wps-table-cell"><?php echo ( !empty($nbcustomers_site_partners) ) ? '<a href="' . admin_url(). 'admin.php?page=wpshop_dashboard&download_users=newsletters_site_partners" role="button" id="download_newsletter_partners_contacts" class="wps-bton-first-rounded">' .__( 'Download the list', 'wpshop' ). '</a>' : ''; ?></div>
+							<div class="wps-table-cell"><?php echo (!empty($nbcustomers_site_partners)) ? '<a href="' . admin_url() . 'admin.php?page=wpshop_dashboard&download_users=newsletters_site_partners" role="button" id="download_newsletter_partners_contacts" class="wps-bton-first-rounded">' . __('Download the list', 'wpshop') . '</a>' : ''; ?></div>
 						</div>
 					</div>
 				</div>
 			</div><!-- postbox end -->
 
 			<?php
-				if( class_exists('wps_export_ctr') ) {
+				if (class_exists('wps_export_ctr')) {
 					$wps_export = new wps_export_ctr();
 					$wps_export->wps_export_tpl();
 				}
@@ -206,15 +206,15 @@ 
 			<?php
 				global $current_month_offset;
 
-				$current_month_offset = (int) date('m');
-				$current_month_offset = isset( $_GET['month'] ) ? (int) $_GET['month'] : $current_month_offset;
+				$current_month_offset = (int)date('m');
+				$current_month_offset = isset($_GET['month']) ? (int)$_GET['month'] : $current_month_offset;
 			?>
 			<div class="postbox stats" id="wpshop-stats">
 				<h3 class="hndle"><span class="dashicons dashicons-chart-area"></span>
-					<?php if ($current_month_offset!=date('m')) : ?>
-						<a href="admin.php?page=wpshop_dashboard&amp;month=<?php echo $current_month_offset+1; ?>" class="next"><?php echo __('Next Month','wpshop'); ?> &rarr;</a>
+					<?php if ($current_month_offset != date('m')) : ?>
+						<a href="admin.php?page=wpshop_dashboard&amp;month=<?php echo $current_month_offset + 1; ?>" class="next"><?php echo __('Next Month', 'wpshop'); ?> &rarr;</a>
 					<?php endif; ?>
-					<a href="admin.php?page=wpshop_dashboard&amp;month=<?php echo $current_month_offset-1; ?>" class="previous">&larr; <?php echo __('Previous Month','wpshop'); ?></a>
+					<a href="admin.php?page=wpshop_dashboard&amp;month=<?php echo $current_month_offset - 1; ?>" class="previous">&larr; <?php echo __('Previous Month', 'wpshop'); ?></a>
 					<span><?php _e('Monthly Sales', 'wpshop') ?></span></h3>
 				<div class="inside">
 					<div id="placeholder" style="width:100%; height:300px; position:relative;"></div>
@@ -244,11 +244,11 @@ 
 
 							<?php
 
-								function orders_this_month( $where = '' ) {
+								function orders_this_month($where = '') {
 									global $current_month_offset;
 
 									$month = $current_month_offset;
-									$year = (int) date('Y');
+									$year = (int)date('Y');
 
 									$first_day = strtotime("{$year}-{$month}-01");
 									$last_day = strtotime('-1 second', strtotime('+1 month', $first_day));
@@ -261,29 +261,29 @@ 
 
 									return $where;
 								}
-								add_filter( 'posts_where', 'orders_this_month' );
+								add_filter('posts_where', 'orders_this_month');
 
 								$args = array(
 									'numberposts'      => -1,
 									'orderby'          => 'post_date',
 									'order'            => 'DESC',
 									'post_type'        => WPSHOP_NEWTYPE_IDENTIFIER_ORDER,
-									'post_status'      => 'publish' ,
+									'post_status'      => 'publish',
 									'suppress_filters' => false
 								);
-								$orders = get_posts( $args );
+								$orders = get_posts($args);
 
 								$order_counts = array();
 								$order_amounts = array();
 
 								// Blank date ranges to begin
 								$month = $current_month_offset;
-								$year = (int) date('Y');
+								$year = (int)date('Y');
 
 								$first_day = strtotime("{$year}-{$month}-01");
 								$last_day = strtotime('-1 second', strtotime('+1 month', $first_day));
 
-								if ((date('m') - $current_month_offset)==0) :
+								if ((date('m') - $current_month_offset) == 0) :
 									$up_to = date('d', strtotime('NOW'));
 								else :
 									$up_to = date('d', $last_day);
@@ -292,7 +292,7 @@ 
 
 								while ($count < $up_to) :
 
-									$time = strtotime(date('Ymd', strtotime('+ '.$count.' DAY', $first_day))).'000';
+									$time = strtotime(date('Ymd', strtotime('+ ' . $count . ' DAY', $first_day))) . '000';
 
 									$order_counts[$time] = 0;
 									$order_amounts[$time] = 0;
@@ -305,9 +305,9 @@ 
 
 										$order_data = get_post_meta($order->ID, '_order_postmeta', true);
 
-										if ($order_data['order_status']=='denied' || $order_data['order_status']=='awaiting_payment') continue;
+										if ($order_data['order_status'] == 'denied' || $order_data['order_status'] == 'awaiting_payment') continue;
 
-										$time = strtotime(date('Ymd', strtotime($order_data['order_date']))).'000';
+										$time = strtotime(date('Ymd', strtotime($order_data['order_date']))) . '000';
 
 										$order_grand_total = !empty($order_data['order_grand_total']) ? $order_data['order_grand_total'] : 0;
 
@@ -315,12 +315,12 @@ 
 										else : $order_counts[$time] = 1; endif;
 
 										if (isset($order_amounts[$time])) $order_amounts[$time] = $order_amounts[$time] + $order_grand_total;
-										else $order_amounts[$time] = (float) $order_grand_total;
+										else $order_amounts[$time] = (float)$order_grand_total;
 
 									endforeach;
 								endif;
 
-								remove_filter( 'posts_where', 'orders_this_month' );
+								remove_filter('posts_where', 'orders_this_month');
 							?>
 
 							var d = [
@@ -343,7 +343,7 @@ 
 
 							for (var i = 0; i < d2.length; ++i) d2[i][0] += 60 * 60 * 1000;
 
-							var plot = jQuery.plot(jQuery("#placeholder"), [ { label: "<?php echo __('Number of sales','wpshop'); ?>", data: d }, { label: "<?php echo __('Sales amount','wpshop'); ?>", data: d2, yaxis: 2 } ], {
+							var plot = jQuery.plot(jQuery("#placeholder"), [ { label: "<?php echo __('Number of sales', 'wpshop'); ?>", data: d }, { label: "<?php echo __('Sales amount', 'wpshop'); ?>", data: d2, yaxis: 2 } ], {
 								series: {
 									lines: { show: true },
 									points: { show: true }
@@ -390,10 +390,10 @@ 
 
 										jQuery("#tooltip").remove();
 
-										if (item.series.label=="<?php echo __('Number of sales','wpshop'); ?>") {
+										if (item.series.label=="<?php echo __('Number of sales', 'wpshop'); ?>") {
 
 											var y = item.datapoint[1];
-											showTooltip(item.pageX, item.pageY, y+" <?php echo __('sales','wpshop'); ?>");
+											showTooltip(item.pageX, item.pageY, y+" <?php echo __('sales', 'wpshop'); ?>");
 
 										} else {
 
@@ -424,15 +424,15 @@ 
 				<div class="inside">
 
 					<div class="wps-boxed">
-						<span class="wps-h5"><?php _e( 'WPShop is also...', 'wpshop'); ?></span>
+						<span class="wps-h5"><?php _e('WPShop is also...', 'wpshop'); ?></span>
 						<div class="wps-gridwrapper4-padded">
-							<div><a href="https://shop.eoxia.com/ecommerce/assistance-personnalisee-wordpress/" target="_blank" title="<?php _e( 'Assistance', 'wpshop'); ?>"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>assistance_wpshop.jpg" alt="WPSHOP Assistance" /></a><div class="wps-h5"><center><?php _e( 'Assistance', 'wpshop'); ?></center></div><center><?php _e('To assist you in your WPShop Experience', 'wpshop'); ?></center></div>
-							<div><a href="https://shop.eoxia.com/themes/" target="_blank" title="<?php _e( 'WPSHOP Themes', 'wpshop'); ?>"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>themes_wpshop.jpg" alt="WPSHOP Themes" /></a><div class="wps-h5"><center><?php _e( 'WPSHOP Themes', 'wpshop'); ?></center></div><center><?php _e('To offer to your customer all WPShop\'s powerful experience', 'wpshop'); ?></center></div>
-							<div><a href="https://shop.eoxia.com/boutique/wpshop/" target="_blank" title="<?php _e( 'WPSHOP\'s add-ons', 'wpshop'); ?>"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>modules_wpshop.jpg" alt="WPSHOP Assistance" /></a><div class="wps-h5"><center><?php _e( 'WPSHOP\'s add-ons', 'wpshop'); ?></center></div><center><?php _e('To boost your shop with new functions', 'wpshop'); ?></center></div>
-							<div><a href="http://forums.eoxia.com" target="_blank" title="<?php _e( 'WPSHOP\'s Forum', 'wpshop'); ?>"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>forum_wpshop.jpg" alt="Forum Assistance" /></a><div class="wps-h5"><center><?php _e( 'WPSHOP\'s Forum', 'wpshop'); ?></center></div><center><?php _e('To respond at your questions', 'wpshop'); ?></center></div>
+							<div><a href="https://shop.eoxia.com/ecommerce/assistance-personnalisee-wordpress/" target="_blank" title="<?php _e('Assistance', 'wpshop'); ?>"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>assistance_wpshop.jpg" alt="WPSHOP Assistance" /></a><div class="wps-h5"><center><?php _e('Assistance', 'wpshop'); ?></center></div><center><?php _e('To assist you in your WPShop Experience', 'wpshop'); ?></center></div>
+							<div><a href="https://shop.eoxia.com/themes/" target="_blank" title="<?php _e('WPSHOP Themes', 'wpshop'); ?>"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>themes_wpshop.jpg" alt="WPSHOP Themes" /></a><div class="wps-h5"><center><?php _e('WPSHOP Themes', 'wpshop'); ?></center></div><center><?php _e('To offer to your customer all WPShop\'s powerful experience', 'wpshop'); ?></center></div>
+							<div><a href="https://shop.eoxia.com/boutique/wpshop/" target="_blank" title="<?php _e('WPSHOP\'s add-ons', 'wpshop'); ?>"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>modules_wpshop.jpg" alt="WPSHOP Assistance" /></a><div class="wps-h5"><center><?php _e('WPSHOP\'s add-ons', 'wpshop'); ?></center></div><center><?php _e('To boost your shop with new functions', 'wpshop'); ?></center></div>
+							<div><a href="http://forums.eoxia.com" target="_blank" title="<?php _e('WPSHOP\'s Forum', 'wpshop'); ?>"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>forum_wpshop.jpg" alt="Forum Assistance" /></a><div class="wps-h5"><center><?php _e('WPSHOP\'s Forum', 'wpshop'); ?></center></div><center><?php _e('To respond at your questions', 'wpshop'); ?></center></div>
 						</div>
 						<br/><br/>
-						<span class="wps-h6"><?php _e( 'Be connected', 'wpshop'); ?></span>
+						<span class="wps-h6"><?php _e('Be connected', 'wpshop'); ?></span>
 						<div class="wps-gridwrapper2-padded">
 							<div>
 								<div class="fb-like" data-href="https://fr-fr.facebook.com/wpshopplugin" data-layout="standard" data-action="like" data-show-faces="true" data-share="true"></div>
@@ -445,7 +445,7 @@ 
 					</div>
 
 					<div class="wps-boxed">
-						<span class="wps-h5"><?php _e( 'WPShop\'s Video Tutorials', 'wpshop')?></span>
+						<span class="wps-h5"><?php _e('WPShop\'s Video Tutorials', 'wpshop')?></span>
 						<div><?php $this->wpshop_rss_tutorial_videos(); ?></div>
 					</div>
 

includes/librairies/dashboard.class.php

Spacing +95 added lines, -95 removed lines

@@ -1,8 +1,8 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 class wpshop_dashboard {
@@ -29,7 +29,7 @@ 
 
 										<td class="first b"><a href="edit.php?post_type=<?php echo WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT; ?>"><?php
 											$num_posts = wp_count_posts(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
-											$number_of_products = number_format_i18n( $num_posts->publish );
+											$number_of_products = number_format_i18n($num_posts->publish);
 											echo $number_of_products;
 										?></a></td>
 										<td class="t"><a href="edit.php?post_type=<?php echo WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT; ?>"><?php _e('Products', 'wpshop'); ?></a></td>
@@ -67,8 +67,8 @@ 
 									if ($orders) {
 										foreach ($orders as $o) {
 											$order = get_post_meta($o->ID, '_order_postmeta', true);
-											if(!empty($order['order_status'])){
-												switch($order['order_status']) {
+											if (!empty($order['order_status'])) {
+												switch ($order['order_status']) {
 													case 'completed': $order_completed++; break;
 													case 'shipped': $order_shipped++; break;
 													case 'awaiting_payment': $order_awaiting_payment++; break;
@@ -128,7 +128,7 @@ 
 
 						<?php
 						// New customers
-						$query = $wpdb->prepare('SELECT COUNT(*) FROM '.$wpdb->users.' WHERE user_registered > (NOW()-INTERVAL 7 DAY)', '');
+						$query = $wpdb->prepare('SELECT COUNT(*) FROM ' . $wpdb->users . ' WHERE user_registered > (NOW()-INTERVAL 7 DAY)', '');
 						$result = $wpdb->get_var($query);
 						?>
 						<span class="alignright"><?php echo $result; ?></span>
@@ -136,7 +136,7 @@ 
 
 						<?php
 						// Number of customers who ordered
-						$query = $wpdb->prepare('SELECT COUNT(DISTINCT post_author) FROM '.$wpdb->posts.' WHERE post_type="'.WPSHOP_NEWTYPE_IDENTIFIER_ORDER.'"', '');
+						$query = $wpdb->prepare('SELECT COUNT(DISTINCT post_author) FROM ' . $wpdb->posts . ' WHERE post_type="' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER . '"', '');
 						$result = $wpdb->get_var($query);
 						?>
 						<span class="alignright"><?php echo $result; ?></span>
@@ -147,13 +147,13 @@ 
 							$query = $wpdb->prepare("SELECT user_id, meta_value FROM " . $wpdb->usermeta . " WHERE meta_key = %s", 'user_preferences');
 							$user_preferences = $wpdb->get_results($query);
 							$nb_of_customer_for_newsletter = $nb_of_customer_for_newsletter_partners = 0;
-							foreach ( $user_preferences as $meta_values ) {
-								$user_prefs = unserialize( $meta_values->meta_value );
+							foreach ($user_preferences as $meta_values) {
+								$user_prefs = unserialize($meta_values->meta_value);
 
-								if ( !empty($user_prefs['newsletters_site']) && $user_prefs['newsletters_site'] ) {
+								if (!empty($user_prefs['newsletters_site']) && $user_prefs['newsletters_site']) {
 									$nb_of_customer_for_newsletter++;
 								}
-								else if ( !empty($user_prefs['newsletters_site_partners']) && $user_prefs['newsletters_site_partners'] ) {
+								else if (!empty($user_prefs['newsletters_site_partners']) && $user_prefs['newsletters_site_partners']) {
 									$nb_of_customer_for_newsletter_partners++;
 								}
 							}
@@ -171,10 +171,10 @@ 
 					<h3 class="hndle"><span><?php _e('Quick Links', 'wpshop') ?></span></h3>
 					<div class="inside">
 						<ul id="wps_dashboard_quick_links">
-							<li><a href="<?php echo admin_url( 'post-new.php?post_type=wpshop_product' ); ?>"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>icon_create_product.jpg" alt="<?php _e( 'Create a new product', 'wpshop'); ?>" /><br/><?php _e('Create a product', 'wpshop'); ?></a></li>
-							<li><a href="<?php echo admin_url( 'post-new.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER ); ?>"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>icon_create_order.jpg" alt="<?php _e( 'Create order', 'wpshop'); ?>" /><br/><?php _e('Create an order', 'wpshop'); ?></a></li>
-							<li><a href="<?php echo admin_url( 'post-new.php?post_type=wpshop_shop_coupon' ); ?>"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>icon_create_coupon.jpg" alt="<?php _e( 'Create a coupon', 'wpshop'); ?>" /><br/><?php _e('Create a coupon', 'wpshop'); ?></a></li>
-							<li><a href="<?php echo admin_url( 'admin.php?page=wpshop_statistics' ); ?>"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>icon_statistics.jpg" alt="<?php _e( 'Statistics', 'wpshop'); ?>" /><br/><?php _e('Statistics', 'wpshop'); ?></a></li>
+							<li><a href="<?php echo admin_url('post-new.php?post_type=wpshop_product'); ?>"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>icon_create_product.jpg" alt="<?php _e('Create a new product', 'wpshop'); ?>" /><br/><?php _e('Create a product', 'wpshop'); ?></a></li>
+							<li><a href="<?php echo admin_url('post-new.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER); ?>"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>icon_create_order.jpg" alt="<?php _e('Create order', 'wpshop'); ?>" /><br/><?php _e('Create an order', 'wpshop'); ?></a></li>
+							<li><a href="<?php echo admin_url('post-new.php?post_type=wpshop_shop_coupon'); ?>"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>icon_create_coupon.jpg" alt="<?php _e('Create a coupon', 'wpshop'); ?>" /><br/><?php _e('Create a coupon', 'wpshop'); ?></a></li>
+							<li><a href="<?php echo admin_url('admin.php?page=wpshop_statistics'); ?>"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>icon_statistics.jpg" alt="<?php _e('Statistics', 'wpshop'); ?>" /><br/><?php _e('Statistics', 'wpshop'); ?></a></li>
 						</ul>
 						<?php
 						// Number of products on sale
@@ -257,15 +257,15 @@ 
 				<?php
 					global $current_month_offset;
 
-					$current_month_offset = (isset($_GET['month'])) ? (int) $_GET['month'] : (int) date('m');
+					$current_month_offset = (isset($_GET['month'])) ? (int)$_GET['month'] : (int)date('m');
 
 									?>
 				<div class="postbox stats" id="wpshop-stats">
 					<h3 class="hndle">
-						<?php if ($current_month_offset!=date('m')) : ?>
-							<a href="admin.php?page=wpshop_dashboard&amp;month=<?php echo $current_month_offset+1; ?>" class="next"><?php echo __('Next Month','wpshop'); ?> &rarr;</a>
+						<?php if ($current_month_offset != date('m')) : ?>
+							<a href="admin.php?page=wpshop_dashboard&amp;month=<?php echo $current_month_offset + 1; ?>" class="next"><?php echo __('Next Month', 'wpshop'); ?> &rarr;</a>
 						<?php endif; ?>
-						<a href="admin.php?page=wpshop_dashboard&amp;month=<?php echo $current_month_offset-1; ?>" class="previous">&larr; <?php echo __('Previous Month','wpshop'); ?></a>
+						<a href="admin.php?page=wpshop_dashboard&amp;month=<?php echo $current_month_offset - 1; ?>" class="previous">&larr; <?php echo __('Previous Month', 'wpshop'); ?></a>
 						<span><?php _e('Monthly Sales', 'wpshop') ?></span></h3>
 					<div class="inside">
 						<div id="placeholder" style="width:100%; height:300px; position:relative;"></div>
@@ -295,11 +295,11 @@ 
 
 								<?php
 
-									function orders_this_month( $where = '' ) {
+									function orders_this_month($where = '') {
 										global $current_month_offset;
 
 										$month = $current_month_offset;
-										$year = (int) date('Y');
+										$year = (int)date('Y');
 
 										$first_day = strtotime("{$year}-{$month}-01");
 										$last_day = strtotime('-1 second', strtotime('+1 month', $first_day));
@@ -312,29 +312,29 @@ 
 
 										return $where;
 									}
-									add_filter( 'posts_where', 'orders_this_month' );
+									add_filter('posts_where', 'orders_this_month');
 
 									$args = array(
 										'numberposts'      => -1,
 										'orderby'          => 'post_date',
 										'order'            => 'DESC',
 										'post_type'        => WPSHOP_NEWTYPE_IDENTIFIER_ORDER,
-										'post_status'      => 'publish' ,
+										'post_status'      => 'publish',
 										'suppress_filters' => false
 									);
-									$orders = get_posts( $args );
+									$orders = get_posts($args);
 
 									$order_counts = array();
 									$order_amounts = array();
 
 									// Blank date ranges to begin
 									$month = $current_month_offset;
-									$year = (int) date('Y');
+									$year = (int)date('Y');
 
 									$first_day = strtotime("{$year}-{$month}-01");
 									$last_day = strtotime('-1 second', strtotime('+1 month', $first_day));
 
-									if ((date('m') - $current_month_offset)==0) :
+									if ((date('m') - $current_month_offset) == 0) :
 										$up_to = date('d', strtotime('NOW'));
 									else :
 										$up_to = date('d', $last_day);
@@ -343,7 +343,7 @@ 
 
 									while ($count < $up_to) :
 
-										$time = strtotime(date('Ymd', strtotime('+ '.$count.' DAY', $first_day))).'000';
+										$time = strtotime(date('Ymd', strtotime('+ ' . $count . ' DAY', $first_day))) . '000';
 
 										$order_counts[$time] = 0;
 										$order_amounts[$time] = 0;
@@ -356,9 +356,9 @@ 
 
 											$order_data = get_post_meta($order->ID, '_order_postmeta', true);
 
-											if ($order_data['order_status']=='denied' || $order_data['order_status']=='awaiting_payment') continue;
+											if ($order_data['order_status'] == 'denied' || $order_data['order_status'] == 'awaiting_payment') continue;
 
-											$time = strtotime(date('Ymd', strtotime($order_data['order_date']))).'000';
+											$time = strtotime(date('Ymd', strtotime($order_data['order_date']))) . '000';
 
 											$order_grand_total = !empty($order_data['order_grand_total']) ? $order_data['order_grand_total'] : 0;
 
@@ -366,12 +366,12 @@ 
 											else : $order_counts[$time] = 1; endif;
 
 											if (isset($order_amounts[$time])) $order_amounts[$time] = $order_amounts[$time] + $order_grand_total;
-											else $order_amounts[$time] = (float) $order_grand_total;
+											else $order_amounts[$time] = (float)$order_grand_total;
 
 										endforeach;
 									endif;
 
-									remove_filter( 'posts_where', 'orders_this_month' );
+									remove_filter('posts_where', 'orders_this_month');
 								?>
 
 								var d = [
@@ -394,7 +394,7 @@ 
 
 								for (var i = 0; i < d2.length; ++i) d2[i][0] += 60 * 60 * 1000;
 
-								var plot = jQuery.plot(jQuery("#placeholder"), [ { label: "<?php echo __('Number of sales','wpshop'); ?>", data: d }, { label: "<?php echo __('Sales amount','wpshop'); ?>", data: d2, yaxis: 2 } ], {
+								var plot = jQuery.plot(jQuery("#placeholder"), [ { label: "<?php echo __('Number of sales', 'wpshop'); ?>", data: d }, { label: "<?php echo __('Sales amount', 'wpshop'); ?>", data: d2, yaxis: 2 } ], {
 									series: {
 										lines: { show: true },
 										points: { show: true }
@@ -441,10 +441,10 @@ 
 
 											jQuery("#tooltip").remove();
 
-											if (item.series.label=="<?php echo __('Number of sales','wpshop'); ?>") {
+											if (item.series.label=="<?php echo __('Number of sales', 'wpshop'); ?>") {
 
 												var y = item.datapoint[1];
-												showTooltip(item.pageX, item.pageY, y+" <?php echo __('sales','wpshop'); ?>");
+												showTooltip(item.pageX, item.pageY, y+" <?php echo __('sales', 'wpshop'); ?>");
 
 											} else {
 
@@ -490,13 +490,13 @@ 
 						<label><?php _e('Number of active order', 'wpshop'); ?></label><br />
 
 						<?php
-						$result=0;
+						$result = 0;
 						// Number of orders the last 7 days
-						$query = $wpdb->prepare('SELECT ID FROM '.$wpdb->posts.' WHERE post_type="'.WPSHOP_NEWTYPE_IDENTIFIER_ORDER.'" AND post_date > (NOW()-INTERVAL 7 DAY)', '');
+						$query = $wpdb->prepare('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_type="' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER . '" AND post_date > (NOW()-INTERVAL 7 DAY)', '');
 						$data = $wpdb->get_results($query, ARRAY_A);
-						foreach($data as $d) {
+						foreach ($data as $d) {
 							$postmeta = get_post_meta($d['ID'], '_order_postmeta', true);
-							if(!empty($postmeta) && !empty($postmeta['order_key']) && substr($postmeta['order_key'],0,2)=='OR')
+							if (!empty($postmeta) && !empty($postmeta['order_key']) && substr($postmeta['order_key'], 0, 2) == 'OR')
 								$result++;
 						}
 						?>
@@ -504,17 +504,17 @@ 
 						<label><?php _e('Number of orders the last 7 days', 'wpshop'); ?></label><br />
 
 						<?php
-						$result=0;
+						$result = 0;
 						// Number of orders the last 7 days
-						$query = $wpdb->prepare('SELECT ID FROM '.$wpdb->posts.' WHERE post_type="'.WPSHOP_NEWTYPE_IDENTIFIER_ORDER.'" AND post_date > (NOW()-INTERVAL 7 DAY)', '');
+						$query = $wpdb->prepare('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_type="' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER . '" AND post_date > (NOW()-INTERVAL 7 DAY)', '');
 						$data = $wpdb->get_results($query, ARRAY_A);
-						foreach($data as $d) {
+						foreach ($data as $d) {
 							$postmeta = get_post_meta($d['ID'], '_order_postmeta', true);
-							if(!empty($postmeta) && !empty($postmeta['order_grand_total']))
-								$result+=$postmeta['order_grand_total'];
+							if (!empty($postmeta) && !empty($postmeta['order_grand_total']))
+								$result += $postmeta['order_grand_total'];
 						}
-						if(count($data)>0)
-							$result = round($result/count($data),2);
+						if (count($data) > 0)
+							$result = round($result / count($data), 2);
 						?>
 						<span class="alignright"><?php echo wpshop_tools::wpshop_get_currency(); ?> <?php echo $result; ?></span>
 						<label><?php _e('Cart price average', 'wpshop'); ?></label>
@@ -529,9 +529,9 @@ 
 						<table width="100%">
 							<tr>
 								<td><?php self::wpshop_rss_tutorial_videos(); ?></td>
-								<td valign="top" cellpadding="20" ><h2 class="wps_dashboard"><?php _e('Need help with WPShop', 'wpshop' ); ?> ?</h2>
-									<p><?php _e( 'You need help with WPShop ? You some questions ?', 'wpshop' ); ?></p>
-									<p><h3 class="wps_dashboard"><?php _e( 'Two solutions', 'wpshop'); ?></h3></p>
+								<td valign="top" cellpadding="20" ><h2 class="wps_dashboard"><?php _e('Need help with WPShop', 'wpshop'); ?> ?</h2>
+									<p><?php _e('You need help with WPShop ? You some questions ?', 'wpshop'); ?></p>
+									<p><h3 class="wps_dashboard"><?php _e('Two solutions', 'wpshop'); ?></h3></p>
 									<p><center><br/><a href="https://shop.eoxia.com/ecommerce/assistance-personnalisee-wordpress/" title="<?php _e('WPShop Assistance', 'wpshop'); ?>" target="_blank"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>assistance_wpshop.jpg" alt="<?php _e('WPShop Assistance', 'wpshop'); ?>" /></a><br/>
 									<a href="http://forums.eoxia.com/" title="<?php _e('WPShop Forum', 'wpshop'); ?>" target="_blank"><img src="<?php echo WPSHOP_MEDIAS_IMAGES_URL; ?>forum_wpshop.jpg" alt="<?php _e('WPShop Forum', 'wpshop'); ?>" /></a></center></p>
 								</td>
@@ -575,44 +575,44 @@ 
 
 	function wpshop_dashboard_orders() {
 		$output = '';
-		$orders = get_posts( array( 'posts_per_page' => 10, 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'post_status' => 'publish', 'orderby' => 'post_date', 'order' => 'DESC') );
-		if ( !empty($orders) ) {
-			$payment_status = unserialize( WPSHOP_ORDER_STATUS );
+		$orders = get_posts(array('posts_per_page' => 10, 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'post_status' => 'publish', 'orderby' => 'post_date', 'order' => 'DESC'));
+		if (!empty($orders)) {
+			$payment_status = unserialize(WPSHOP_ORDER_STATUS);
 
 			$output .= '<table id="wps_dashboard_orders_summary">';
-			$output .= '<tr><th class="wps_dashboard_order_date">' .__('Date', 'wpshop'). '</th><th class="wps_dashboard_order_customer_name">' .__('Customer', 'wpshop'). '</th><th class="wps_dashboard_order_amount">' .__('Amount', 'wpshop'). '</th><th class="wps_dashboard_order_status">' .__('Status', 'wpshop'). '</th><th class="wps_dashboard_order_actions"></th></tr>';
+			$output .= '<tr><th class="wps_dashboard_order_date">' . __('Date', 'wpshop') . '</th><th class="wps_dashboard_order_customer_name">' . __('Customer', 'wpshop') . '</th><th class="wps_dashboard_order_amount">' . __('Amount', 'wpshop') . '</th><th class="wps_dashboard_order_status">' . __('Status', 'wpshop') . '</th><th class="wps_dashboard_order_actions"></th></tr>';
 			$stried = false;
-			foreach( $orders as $order ) {
-				$stried = ( $stried == false ) ? true : false;
+			foreach ($orders as $order) {
+				$stried = ($stried == false) ? true : false;
 				$additionnal_class = ($stried) ? 'wps_stried_line' : '';
-				$output .= '<tr class="' .$additionnal_class. '">';
-				$order_meta = get_post_meta( $order->ID, '_order_postmeta', true );
-				$order_info = get_post_meta( $order->ID, '_order_info', true );
+				$output .= '<tr class="' . $additionnal_class . '">';
+				$order_meta = get_post_meta($order->ID, '_order_postmeta', true);
+				$order_info = get_post_meta($order->ID, '_order_info', true);
 
-				if ( !empty($order_meta) ) {
-					$output .= '<td>' .( (!empty($order_meta) && !empty($order_meta['order_date']) ) ? date( 'd-m-Y', strtotime($order_meta['order_date']) ): '' ). '</td>';
-					$output .= '<td>' .( (!empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']) && !empty($order_info['billing']['address']['address_last_name']) && !empty($order_info['billing']['address']['address_first_name']) ) ? strtoupper($order_info['billing']['address']['address_last_name']).' '.$order_info['billing']['address']['address_first_name']: '' ). '</td>';
+				if (!empty($order_meta)) {
+					$output .= '<td>' . ((!empty($order_meta) && !empty($order_meta['order_date'])) ? date('d-m-Y', strtotime($order_meta['order_date'])) : '') . '</td>';
+					$output .= '<td>' . ((!empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']) && !empty($order_info['billing']['address']['address_last_name']) && !empty($order_info['billing']['address']['address_first_name'])) ? strtoupper($order_info['billing']['address']['address_last_name']) . ' ' . $order_info['billing']['address']['address_first_name'] : '') . '</td>';
 
-					$output .= '<td>' .( (!empty($order_meta['order_grand_total']) ) ? number_format( $order_meta['order_grand_total'], 2, '.', '' ).' '.wpshop_tools::wpshop_get_currency( false ) : '-' ). '</td>';
-					$output .= '<td><span class="wps_dashboard_' .$order_meta['order_status']. '">' .__($payment_status[ $order_meta['order_status'] ], 'wpshop' ). '</span></td>';
+					$output .= '<td>' . ((!empty($order_meta['order_grand_total'])) ? number_format($order_meta['order_grand_total'], 2, '.', '') . ' ' . wpshop_tools::wpshop_get_currency(false) : '-') . '</td>';
+					$output .= '<td><span class="wps_dashboard_' . $order_meta['order_status'] . '">' . __($payment_status[$order_meta['order_status']], 'wpshop') . '</span></td>';
 					$output .= '<td>';
-					$output .= '<a href="' .admin_url('/post.php?post=' .$order->ID. '&action=edit'). '"><img src="' .WPSHOP_MEDIAS_ICON_URL. 'icon_loupe.png" alt="' .__('See', 'wpshop'). '" /></a>';
+					$output .= '<a href="' . admin_url('/post.php?post=' . $order->ID . '&action=edit') . '"><img src="' . WPSHOP_MEDIAS_ICON_URL . 'icon_loupe.png" alt="' . __('See', 'wpshop') . '" /></a>';
 
 					$invoice_ref = '';
-					if ( !empty($order_meta['order_invoice_ref']) ) {
+					if (!empty($order_meta['order_invoice_ref'])) {
 						$invoice_ref = $order_meta['order_invoice_ref'];
 					}
-					if ( !empty($invoice_ref) ) {
-						if( !empty($order_meta) && !empty($order_meta['order_payment']) && !empty($order_meta['order_payment']['received']) ) {
-							$invoice_ref = $order_meta['order_payment']['received'][ count($order_meta['order_payment']['received']) - 1 ]['invoice_ref'];
+					if (!empty($invoice_ref)) {
+						if (!empty($order_meta) && !empty($order_meta['order_payment']) && !empty($order_meta['order_payment']['received'])) {
+							$invoice_ref = $order_meta['order_payment']['received'][count($order_meta['order_payment']['received']) - 1]['invoice_ref'];
 						}
 					}
 
-					if ( ( $order_meta['order_status'] == 'partially_paid' || $order_meta['order_status'] == 'completed' || $order_meta['order_status'] == 'shipped' ) && !empty($invoice_ref) ) {
-						$output .= ' <a href="' .admin_url( 'admin-post.php?action=wps_invoice&order_id=' .$order->ID. '&invoice_ref&=' .$invoice_ref. '&mode=pdf' ). '"><img src="' .WPSHOP_MEDIAS_ICON_URL. 'icon_invoice.png" alt="' .__('Invoice', 'wpshop'). '" /></a>';
+					if (($order_meta['order_status'] == 'partially_paid' || $order_meta['order_status'] == 'completed' || $order_meta['order_status'] == 'shipped') && !empty($invoice_ref)) {
+						$output .= ' <a href="' . admin_url('admin-post.php?action=wps_invoice&order_id=' . $order->ID . '&invoice_ref&=' . $invoice_ref . '&mode=pdf') . '"><img src="' . WPSHOP_MEDIAS_ICON_URL . 'icon_invoice.png" alt="' . __('Invoice', 'wpshop') . '" /></a>';
 					}
-					if ( $order_meta['order_status'] == 'shipped' ) {
-						$output .= ' <a href="'.admin_url( 'admin-post.php?action=wps_invoice&order_id=' .$order->ID. '&bon_colisage=ok&mode=pdf' ) . '"><img src="' .WPSHOP_MEDIAS_ICON_URL. 'bon_colisage_icon.png" alt="' .__('Shipping Slip', 'wpshop'). '" /></a>';
+					if ($order_meta['order_status'] == 'shipped') {
+						$output .= ' <a href="' . admin_url('admin-post.php?action=wps_invoice&order_id=' . $order->ID . '&bon_colisage=ok&mode=pdf') . '"><img src="' . WPSHOP_MEDIAS_ICON_URL . 'bon_colisage_icon.png" alt="' . __('Shipping Slip', 'wpshop') . '" /></a>';
 					}
 					$output .= '</td>';
 				}
@@ -626,24 +626,24 @@ 
 
 	function wpshop_rss_feed() {
 		$output = '';
-		include_once( ABSPATH . WPINC . '/feed.php' );
+		include_once(ABSPATH . WPINC . '/feed.php');
 
-		$rss = fetch_feed( 'http://www.wpshop.fr/feed/' );
-		if( ! is_wp_error( $rss ) ){
-			$maxitems = $rss->get_item_quantity( 4 );
-			$rss_items = $rss->get_items( 0, $maxitems );
+		$rss = fetch_feed('http://www.wpshop.fr/feed/');
+		if (!is_wp_error($rss)) {
+			$maxitems = $rss->get_item_quantity(4);
+			$rss_items = $rss->get_items(0, $maxitems);
 		}
 		else {
 			$output .= '<p>' . __('WPShop News cannot be loaded', 'wpshop') . '</p>';
 		}
 
-		if ( $maxitems == 0 ) {
+		if ($maxitems == 0) {
 			$output .= '<p>' . __('No WPShop new has been found', 'wpshop') . '</p>';
 		}
 		else {
 			$output .= '<ul class="recent-orders">';
-			foreach ( $rss_items as $item ) {
-				$output .= '<li><a href="' .$item->get_permalink() . '" title="' .$item->get_title(). '" target="_blank">' .$item->get_title(). '</a><br/>';
+			foreach ($rss_items as $item) {
+				$output .= '<li><a href="' . $item->get_permalink() . '" title="' . $item->get_title() . '" target="_blank">' . $item->get_title() . '</a><br/>';
 				$output .= $item->get_content();
 				$output .= '</li>';
 			}
@@ -654,39 +654,39 @@ 
 
 
 	function wpshop_rss_tutorial_videos() {
-		$ini_get_checking = ini_get( 'allow_url_fopen' );
-		if ( $ini_get_checking != 0 ) {
+		$ini_get_checking = ini_get('allow_url_fopen');
+		if ($ini_get_checking != 0) {
 			$content = file_get_contents('http://www.wpshop.fr/rss_video.xml');
 			$videos_rss = new SimpleXmlElement($content);
-			if ( !empty($videos_rss) && !empty($videos_rss->channel) ) {
+			if (!empty($videos_rss) && !empty($videos_rss->channel)) {
 				$videos_items = array();
-				foreach( $videos_rss->channel->item as $i => $item ) {
+				foreach ($videos_rss->channel->item as $i => $item) {
 					$videos_items[] = $item;
 				}
-				$rand_element = array_rand( $videos_items );
+				$rand_element = array_rand($videos_items);
 				$output  = '<div class="wps_dashboard_video_container">';
-				$output .= '<div class="wps_dashboard_video_title">' .$videos_items[ $rand_element ]->title. '</div>';
-				$output .= '<div class="wps_dashboard_video"><iframe width="400" height="290" src="' .$videos_items[ $rand_element ]->embed_link. '" frameborder="0" allowfullscreen></iframe></div>';
-				$output .= '<div class="wps_dashboard_video_description">' .$videos_items[ $rand_element ]->description. '</div>';
+				$output .= '<div class="wps_dashboard_video_title">' . $videos_items[$rand_element]->title . '</div>';
+				$output .= '<div class="wps_dashboard_video"><iframe width="400" height="290" src="' . $videos_items[$rand_element]->embed_link . '" frameborder="0" allowfullscreen></iframe></div>';
+				$output .= '<div class="wps_dashboard_video_description">' . $videos_items[$rand_element]->description . '</div>';
 				$output .= '</div>';
 
 			}
 			else {
-				$output =__('No tutorial videos can be loaded', 'wpshop' );
+				$output = __('No tutorial videos can be loaded', 'wpshop');
 			}
 		}
 		else {
-			$output = __( 'Your servor doesn\'t allow to open external files', 'wpshop');
+			$output = __('Your servor doesn\'t allow to open external files', 'wpshop');
 		}
 		echo $output;
 	}
 
 	function wpshop_dashboard_get_changelog() {
-		$readme_file = fopen( WPSHOP_DIR.'/readme.txt', 'r' );
-		if ( $readme_file ) {
-			$txt = file_get_contents( WPSHOP_DIR.'/readme.txt' );
-			$pre_change_log = explode( '== Changelog ==', $txt );
-			$versions = explode( '= Version', $pre_change_log[1] );
+		$readme_file = fopen(WPSHOP_DIR . '/readme.txt', 'r');
+		if ($readme_file) {
+			$txt = file_get_contents(WPSHOP_DIR . '/readme.txt');
+			$pre_change_log = explode('== Changelog ==', $txt);
+			$versions = explode('= Version', $pre_change_log[1]);
 
 			echo $versions[1];
 		}

includes/config.php

Spacing +43 added lines, -43 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
 * Plugin configuration file.
 *
@@ -10,8 +10,8 @@ 
 */
 
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 /*	Declare wordpress database class reference var	*/
@@ -91,7 +91,7 @@ 
 	DEFINE('WPSHOP_PRODUCT_VIEW_NB', '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_view_nb');
 	DEFINE('WPSHOP_PRODUCT_FRONT_DISPLAY_CONF', '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_attributes_frontend_display');
 
-	DEFINE('WPSHOP_DEFAULT_CUSTOM_TYPES', serialize( array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS) ));
+	DEFINE('WPSHOP_DEFAULT_CUSTOM_TYPES', serialize(array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS)));
 
 
 	DEFINE('WPSHOP_IDENTIFIER_CUSTOMER', 'U');
@@ -104,7 +104,7 @@ 
 	DEFINE('WPSHOP_COUNTRY_LIST', serialize($wpshop_tab_countries));
 
 
-	DEFINE('WPSHOP_COMMON_ATTRIBUTES_PARENT_VARIATION_PRODUCT', serialize(array('tx_tva')) );
+	DEFINE('WPSHOP_COMMON_ATTRIBUTES_PARENT_VARIATION_PRODUCT', serialize(array('tx_tva')));
 
 /*	Define database table names	*/
 	DEFINE('WPSHOP_DBT_ENTITIES', $wpdb->prefix . 'wpshop__entity');
@@ -163,17 +163,17 @@ 
 	DEFINE('WPSHOP_DISPLAY_LIST_TYPE', $wpshop_display_option['wpshop_display_list_type']);
 
 	/*	ADMIN DISPLAY	*/
-	$attribute_page_layout_types=array('tab' => __('Tabs', 'wpshop'), 'separated_bloc' => __('Separated bloc', 'wpshop'));
+	$attribute_page_layout_types = array('tab' => __('Tabs', 'wpshop'), 'separated_bloc' => __('Separated bloc', 'wpshop'));
 	$wpshop_admin_display_option = get_option('wpshop_admin_display_option', array());
-	DEFINE('WPSHOP_ATTRIBUTE_SET_EDITION_PAGE_LAYOUT', (!empty($wpshop_admin_display_option['wpshop_admin_attr_set_layout'])?$wpshop_admin_display_option['wpshop_admin_attr_set_layout']:'separated_bloc'));
-	DEFINE('WPSHOP_ATTRIBUTE_EDITION_PAGE_LAYOUT', (!empty($wpshop_admin_display_option['wpshop_admin_attr_layout'])?$wpshop_admin_display_option['wpshop_admin_attr_layout']:'tab'));
-	$product_page_layout_types=array('movable-tab' => __('Separated box in product page', 'wpshop'), 'fixed-tab' => __('A tab in product data box "Product data"', 'wpshop'), 'each-box' => __('In each attribute group section "Product data"', 'wpshop'));
-	DEFINE('WPSHOP_PRODUCT_SHORTCODE_DISPLAY_TYPE', (!empty($wpshop_admin_display_option['wpshop_admin_product_shortcode_display'])?$wpshop_admin_display_option['wpshop_admin_product_shortcode_display']:'each-box'));
+	DEFINE('WPSHOP_ATTRIBUTE_SET_EDITION_PAGE_LAYOUT', (!empty($wpshop_admin_display_option['wpshop_admin_attr_set_layout']) ? $wpshop_admin_display_option['wpshop_admin_attr_set_layout'] : 'separated_bloc'));
+	DEFINE('WPSHOP_ATTRIBUTE_EDITION_PAGE_LAYOUT', (!empty($wpshop_admin_display_option['wpshop_admin_attr_layout']) ? $wpshop_admin_display_option['wpshop_admin_attr_layout'] : 'tab'));
+	$product_page_layout_types = array('movable-tab' => __('Separated box in product page', 'wpshop'), 'fixed-tab' => __('A tab in product data box "Product data"', 'wpshop'), 'each-box' => __('In each attribute group section "Product data"', 'wpshop'));
+	DEFINE('WPSHOP_PRODUCT_SHORTCODE_DISPLAY_TYPE', (!empty($wpshop_admin_display_option['wpshop_admin_product_shortcode_display']) ? $wpshop_admin_display_option['wpshop_admin_product_shortcode_display'] : 'each-box'));
 
 
 /*	Define the default email messages	*/
-	DEFINE('WPSHOP_SIGNUP_MESSAGE_OBJECT', __('Account creation confirmation','wpshop'));
-	DEFINE('WPSHOP_SIGNUP_MESSAGE', __('Hello [customer_first_name] [customer_last_name], this email confirms that your account has just been created. Thank you for your loyalty. Have a good day.','wpshop'));
+	DEFINE('WPSHOP_SIGNUP_MESSAGE_OBJECT', __('Account creation confirmation', 'wpshop'));
+	DEFINE('WPSHOP_SIGNUP_MESSAGE', __('Hello [customer_first_name] [customer_last_name], this email confirms that your account has just been created. Thank you for your loyalty. Have a good day.', 'wpshop'));
 
 	DEFINE('WPSHOP_ORDER_CONFIRMATION_MESSAGE_OBJECT', __('Your order has been recorded', 'wpshop'));
 	DEFINE('WPSHOP_ORDER_CONFIRMATION_MESSAGE', __('Hello [customer_first_name] [customer_last_name], this email confirms that your order has been recorded (order date : [order_date]). Thank you for your loyalty. Have a good day.', 'wpshop'));
@@ -208,14 +208,14 @@ 
 	DEFINE('WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE_OBJECT', __('Your downloadable product is available', 'wpshop'));
 	DEFINE('WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE', __('Hello [customer_first_name] [customer_last_name], <br />this email confirms that your downloadable product is available : [download_product_link].<br /><br /> Thank you for your loyalty. Have a good day.', 'wpshop'));
 
-	DEFINE('WPSHOP_ORDER_IS_CANCELED_OBJECT', __('Your order has been canceled', 'wpshop') );
+	DEFINE('WPSHOP_ORDER_IS_CANCELED_OBJECT', __('Your order has been canceled', 'wpshop'));
 	DEFINE('WPSHOP_ORDER_IS_CANCELED', __('Hello [customer_first_name] [customer_last_name], <br />this email confirms your order ( Order key : [order_key] - Date : [order_date] ) has been canceled.<br /><br /> Thank you for your loyalty. Have a good day.', 'wpshop'));
 
-	DEFINE('WPSHOP_FORGOT_PASSWORD_MESSAGE_OBJECT', __('Renewal of password', 'wpshop') );
-	DEFINE('WPSHOP_FORGOT_PASSWORD_MESSAGE', __('Hello [customer_first_name] [customer_last_name], <br />Somebody has asked a renewal of password for your account.<br/><br/>To renew your password, click on this link : [forgot_password_link].<br/>If you are not at the origin of this request, please ignore this message.', 'wpshop') );
+	DEFINE('WPSHOP_FORGOT_PASSWORD_MESSAGE_OBJECT', __('Renewal of password', 'wpshop'));
+	DEFINE('WPSHOP_FORGOT_PASSWORD_MESSAGE', __('Hello [customer_first_name] [customer_last_name], <br />Somebody has asked a renewal of password for your account.<br/><br/>To renew your password, click on this link : [forgot_password_link].<br/>If you are not at the origin of this request, please ignore this message.', 'wpshop'));
 
-	DEFINE('WPSHOP_DIRECT_PAYMENT_LINK_MESSAGE_OBJECT', __('Pay and finalize your order', 'wpshop') );
-	DEFINE('WPSHOP_DIRECT_PAYMENT_LINK_MESSAGE', __('Hello [customer_first_name] [customer_last_name], <br />An order is available for you on our website.<br/>You can click on this link to pay and finalize this order : [direct_payment_link]<br/><br/>[order_content]<br /><br />Thank you for your loyalty. Have a good day.', 'wpshop') );
+	DEFINE('WPSHOP_DIRECT_PAYMENT_LINK_MESSAGE_OBJECT', __('Pay and finalize your order', 'wpshop'));
+	DEFINE('WPSHOP_DIRECT_PAYMENT_LINK_MESSAGE', __('Hello [customer_first_name] [customer_last_name], <br />An order is available for you on our website.<br/>You can click on this link to pay and finalize this order : [direct_payment_link]<br/><br/>[order_content]<br /><br />Thank you for your loyalty. Have a good day.', 'wpshop'));
 
 
 /*	Define debug vars	*/
@@ -225,39 +225,39 @@ 
 
 	/*	ALLOWED IPS	*/
 	$default_ip = array('127.0.0.1', '0.0.0.0');
-	DEFINE('WPSHOP_DEBUG_MODE_ALLOWED_IP', (!empty($extra_options['WPSHOP_DEBUG_MODE_ALLOWED_IP'])?serialize(array_merge($default_ip, array($extra_options['WPSHOP_DEBUG_MODE_ALLOWED_IP']))):serialize($default_ip)));
+	DEFINE('WPSHOP_DEBUG_MODE_ALLOWED_IP', (!empty($extra_options['WPSHOP_DEBUG_MODE_ALLOWED_IP']) ? serialize(array_merge($default_ip, array($extra_options['WPSHOP_DEBUG_MODE_ALLOWED_IP']))) : serialize($default_ip)));
 	/*	DEBUG MODE	*/
 	$debug_mode = false;
-	if ( !empty($extra_options['WPSHOP_DEBUG_MODE']) && ($extra_options['WPSHOP_DEBUG_MODE'] == 'true') )
+	if (!empty($extra_options['WPSHOP_DEBUG_MODE']) && ($extra_options['WPSHOP_DEBUG_MODE'] == 'true'))
 		$debug_mode = true;
 	DEFINE('WPSHOP_DEBUG_MODE', $debug_mode);
 	/*	DATA DELETE	*/
 	$delete_data = false;
-	if ( !empty($extra_options['WPSHOP_DEBUG_MODE_ALLOW_DATA_DELETION']) && ($extra_options['WPSHOP_DEBUG_MODE_ALLOW_DATA_DELETION'] == 'true') )
+	if (!empty($extra_options['WPSHOP_DEBUG_MODE_ALLOW_DATA_DELETION']) && ($extra_options['WPSHOP_DEBUG_MODE_ALLOW_DATA_DELETION'] == 'true'))
 		$delete_data = true;
 	DEFINE('WPSHOP_DEBUG_MODE_ALLOW_DATA_DELETION', $delete_data);
 
 	/*	TOOLS MENU	*/
 	$tools_menu_display = false;
-	if ( !empty($extra_options['WPSHOP_DISPLAY_TOOLS_MENU']) && ($extra_options['WPSHOP_DISPLAY_TOOLS_MENU'] == 'true') )
+	if (!empty($extra_options['WPSHOP_DISPLAY_TOOLS_MENU']) && ($extra_options['WPSHOP_DISPLAY_TOOLS_MENU'] == 'true'))
 		$tools_menu_display = true;
 	DEFINE('WPSHOP_DISPLAY_TOOLS_MENU', $tools_menu_display);
 
 	/*	ATT VALUE PER USER	*/
 	$attr_value_per_user = false;
-	if ( !empty($extra_options['WPSHOP_ATTRIBUTE_VALUE_PER_USER']) && ($extra_options['WPSHOP_ATTRIBUTE_VALUE_PER_USER'] == 'true') )
+	if (!empty($extra_options['WPSHOP_ATTRIBUTE_VALUE_PER_USER']) && ($extra_options['WPSHOP_ATTRIBUTE_VALUE_PER_USER'] == 'true'))
 		$attr_value_per_user = true;
 	DEFINE('WPSHOP_ATTRIBUTE_VALUE_PER_USER', $attr_value_per_user);
 
 	/*	DISPLAY AVAILABLE KEYS FOR TEMPLATE	*/
 	$display_available_keys_for_template = false;
-	if ( !empty($extra_options['WPSHOP_DISPLAY_AVAILABLE_KEYS_FOR_TEMPLATE']) && ($extra_options['WPSHOP_DISPLAY_AVAILABLE_KEYS_FOR_TEMPLATE'] == 'true') )
+	if (!empty($extra_options['WPSHOP_DISPLAY_AVAILABLE_KEYS_FOR_TEMPLATE']) && ($extra_options['WPSHOP_DISPLAY_AVAILABLE_KEYS_FOR_TEMPLATE'] == 'true'))
 		$display_available_keys_for_template = true;
 	DEFINE('WPSHOP_DISPLAY_AVAILABLE_KEYS_FOR_TEMPLATE', $display_available_keys_for_template);
 
 	/*	MULTIPLE VALUE PER USER	*/
 	$display_value_attribute_type_select = false;
-	if ( !empty($extra_options['WPSHOP_DISPLAY_VALUE_FOR_ATTRIBUTE_SELECT']) && ($extra_options['WPSHOP_DISPLAY_VALUE_FOR_ATTRIBUTE_SELECT'] == 'true') )
+	if (!empty($extra_options['WPSHOP_DISPLAY_VALUE_FOR_ATTRIBUTE_SELECT']) && ($extra_options['WPSHOP_DISPLAY_VALUE_FOR_ATTRIBUTE_SELECT'] == 'true'))
 		$display_value_attribute_type_select = true;
 	DEFINE('WPSHOP_DISPLAY_VALUE_FOR_ATTRIBUTE_SELECT', $display_value_attribute_type_select);
 
@@ -285,7 +285,7 @@ 
 
 /*	Define the different vars used for price calculation	*/
 	$wpshop_shop_price_piloting = get_option('wpshop_shop_price_piloting');
-	DEFINE('WPSHOP_PRODUCT_PRICE_PILOT', ( !empty($wpshop_shop_price_piloting) ? $wpshop_shop_price_piloting : 'TTC'));
+	DEFINE('WPSHOP_PRODUCT_PRICE_PILOT', (!empty($wpshop_shop_price_piloting) ? $wpshop_shop_price_piloting : 'TTC'));
 
 	DEFINE('WPSHOP_COST_OF_POSTAGE', 'cost_of_postage');
 	DEFINE('WPSHOP_PRODUCT_PRICE_HT', 'price_ht');
@@ -297,7 +297,7 @@ 
 	DEFINE('WPSHOP_PRODUCT_SPECIAL_PRICE_DATE_FROM', 'special_from');
 	DEFINE('WPSHOP_PRODUCT_SPECIAL_PRICE_DATE_TO', 'special_to');
 	DEFINE('WPSHOP_PRODUCT_DISCOUNT_AMOUNT', 'discount_amount');
-	DEFINE('WPSHOP_VAT_ON_SHIPPING_COST', apply_filters( 'wps_change_shipping_vat', 20 ) );
+	DEFINE('WPSHOP_VAT_ON_SHIPPING_COST', apply_filters('wps_change_shipping_vat', 20));
 
 	DEFINE('WPSHOP_ATTRIBUTE_PRICES', serialize(array(WPSHOP_PRODUCT_PRICE_HT, WPSHOP_PRODUCT_PRICE_TAX, WPSHOP_PRODUCT_PRICE_TTC, WPSHOP_PRODUCT_PRICE_TAX_AMOUNT)));
 	DEFINE('WPSHOP_ATTRIBUTE_WEIGHT', serialize(array(WPSHOP_PRODUCT_WEIGHT)));
@@ -306,7 +306,7 @@ 
 	DEFINE('WPSHOP_ATTRIBUTE_UNDELETABLE', serialize(array_merge(array(), unserialize(WPSHOP_ATTRIBUTE_PRICES))));
 
 /*	Define the attribute list to hide or variation creation	*/
-	DEFINE('WPSHOP_VARIATION_ATTRIBUTE_TO_HIDE', serialize( array_merge(unserialize(WPSHOP_ATTRIBUTE_PRICES), array('product_attribute_set_id', 'product_reference')) ) );
+	DEFINE('WPSHOP_VARIATION_ATTRIBUTE_TO_HIDE', serialize(array_merge(unserialize(WPSHOP_ATTRIBUTE_PRICES), array('product_attribute_set_id', 'product_reference'))));
 
 /*	Define the default currency	*/
 	DEFINE('WPSHOP_SHOP_DEFAULT_CURRENCY', 'EUR');
@@ -317,7 +317,7 @@ 
 
 /*	Define the shipping default rules	*/
 	DEFINE('WPSHOP_SHOP_SHIPPING_RULES', serialize(array(
-		'min_max' => array('min'=>0,'max'=>30),
+		'min_max' => array('min'=>0, 'max'=>30),
 		'free_from' => 4500
 	)));
 	$shipping_fees_array = array(
@@ -339,20 +339,20 @@ 
 
 /*	Define addons modules */
 	DEFINE('WPSHOP_ADDONS_KEY_IS', '48');
-	DEFINE('WPSHOP_ADDONS_STATES_CLASS', serialize( array(true => 'wpshop_addons_state wpshop_addons_state_activated', false => 'wpshop_addons_state wpshop_addons_state_deactivated')));
-	DEFINE('WPSHOP_ADDONS_LIST', serialize(array('WPSHOP_ADDONS_QUOTATION' => array(__('Quotation','wpshop'), '48', 'per_site', 'quotation_allowed', 'WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE'), 'WPSHOP_ADDONS_PAYMENT_GATEWAY_CB_CIC' => array(__('Payment gateway CIC','wpshop'), '32', 'per_site', '')/* , 'WPSHOP_ADDONS_PRICE_PER_GROUP' => array(__('Price per user group','wpshop'), '13', 'free') */)));
-	DEFINE('WPSHOP_ADDONS_QUOTATION', (!empty($wpshop_addons_state['WPSHOP_ADDONS_QUOTATION']['activate'])?$wpshop_addons_state['WPSHOP_ADDONS_QUOTATION']['activate']:false));
-	DEFINE('WPSHOP_ADDONS_PRICE_PER_GROUP', (!empty($wpshop_addons_state['WPSHOP_ADDONS_PRICE_PER_GROUP']['activate'])?$wpshop_addons_state['WPSHOP_ADDONS_PRICE_PER_GROUP']['activate']:false));
-	DEFINE('WPSHOP_PAYMENT_METHOD_CIC', (!empty($wpshop_addons_state['WPSHOP_ADDONS_PAYMENT_GATEWAY_CB_CIC']['activate'])?$wpshop_addons_state['WPSHOP_ADDONS_PAYMENT_GATEWAY_CB_CIC']['activate']:false));
+	DEFINE('WPSHOP_ADDONS_STATES_CLASS', serialize(array(true => 'wpshop_addons_state wpshop_addons_state_activated', false => 'wpshop_addons_state wpshop_addons_state_deactivated')));
+	DEFINE('WPSHOP_ADDONS_LIST', serialize(array('WPSHOP_ADDONS_QUOTATION' => array(__('Quotation', 'wpshop'), '48', 'per_site', 'quotation_allowed', 'WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE'), 'WPSHOP_ADDONS_PAYMENT_GATEWAY_CB_CIC' => array(__('Payment gateway CIC', 'wpshop'), '32', 'per_site', '')/* , 'WPSHOP_ADDONS_PRICE_PER_GROUP' => array(__('Price per user group','wpshop'), '13', 'free') */)));
+	DEFINE('WPSHOP_ADDONS_QUOTATION', (!empty($wpshop_addons_state['WPSHOP_ADDONS_QUOTATION']['activate']) ? $wpshop_addons_state['WPSHOP_ADDONS_QUOTATION']['activate'] : false));
+	DEFINE('WPSHOP_ADDONS_PRICE_PER_GROUP', (!empty($wpshop_addons_state['WPSHOP_ADDONS_PRICE_PER_GROUP']['activate']) ? $wpshop_addons_state['WPSHOP_ADDONS_PRICE_PER_GROUP']['activate'] : false));
+	DEFINE('WPSHOP_PAYMENT_METHOD_CIC', (!empty($wpshop_addons_state['WPSHOP_ADDONS_PAYMENT_GATEWAY_CB_CIC']['activate']) ? $wpshop_addons_state['WPSHOP_ADDONS_PAYMENT_GATEWAY_CB_CIC']['activate'] : false));
 	DEFINE('WPSHOP_ADDONS_QUOTATION_CODE', 'nfdJK-AsBCO-%AZDZA');
 	DEFINE('WPSHOP_ADDONS_PRICE_PER_GROUP_CODE', '7GnnQ-5FeqZ-BiKz3');
 	DEFINE('WPSHOP_ADDONS_PAYMENT_GATEWAY_CB_CIC', 'nZYsM-vQ8qC-VfVfA');
 
 /*	Define payment method params	*/
 	$wpshop_paymentMethod = get_option('wps_payment_mode');
-	if(WPSHOP_PAYMENT_METHOD_CIC || !empty($wpshop_paymentMethod['mode']) && !empty($wpshop_paymentMethod['mode']['cic']) ) {
+	if (WPSHOP_PAYMENT_METHOD_CIC || !empty($wpshop_paymentMethod['mode']) && !empty($wpshop_paymentMethod['mode']['cic'])) {
 		$cmcic_params = get_option('wpshop_cmcic_params', array());
-		if(!empty($cmcic_params)){
+		if (!empty($cmcic_params)) {
 			DEFINE("CMCIC_CLE", $cmcic_params['cle']);
 			DEFINE("CMCIC_TPE", $cmcic_params['tpe']);
 			DEFINE("CMCIC_VERSION", $cmcic_params['version']);
@@ -364,7 +364,7 @@ 
 	}
 
 /** Civility	*/
-$civility = array(1=>__('Mr.','wpshop'),__('Mrs.','wpshop'),__('Miss','wpshop'));
+$civility = array(1=>__('Mr.', 'wpshop'), __('Mrs.', 'wpshop'), __('Miss', 'wpshop'));
 /** Status	*/
 $order_status = array(
 	'' 					=> __('Awaiting treatment', 'wpshop'),
@@ -392,14 +392,14 @@ 
 	'show_ui' 				=> 'boolean',
 	'show_in_nav_menus' 	=> 'boolean',
 	'show_in_menu' 			=> 'boolean|text',
-	'capabilities'			=> array( 'publish_posts', 'edit_posts', 'edit_others_posts', 'delete_posts', 'delete_others_posts', 'read_private_posts', 'edit_post', 'delete_post', 'read_post' ),
+	'capabilities'			=> array('publish_posts', 'edit_posts', 'edit_others_posts', 'delete_posts', 'delete_others_posts', 'read_private_posts', 'edit_post', 'delete_post', 'read_post'),
 	'hierarchical' 			=> false,
 	'rewrite' 				=> false,
 	'query_var'				=> true,
 	'supports' 				=> unserialize(WPSHOP_REGISTER_POST_TYPE_SUPPORT)
 );
 DEFINE('WPSHOP_REGISTER_POST_TYPE_ARGS', serialize($register_post_type_args));
-DEFINE('WPSHOP_REGISTER_POST_TYPE_MANDATORY_SUPPORTS', serialize( array('title', 'editor', 'thumbnail', 'excerpt') ));
+DEFINE('WPSHOP_REGISTER_POST_TYPE_MANDATORY_SUPPORTS', serialize(array('title', 'editor', 'thumbnail', 'excerpt')));
 DEFINE('WPSHOP_PRODUCT_HIDDEN_METABOX', serialize(array('formatdiv', 'pageparentdiv', 'postexcerpt', 'trackbacksdiv', 'postcustom', 'commentstatusdiv', 'commentsdiv', 'slugdiv', 'authordiv', 'revisionsdiv')));
 
 /* Shop type	*/
@@ -410,8 +410,8 @@ 
 DEFINE('WPSHOP_ATTR_SELECT_TYPE_TOGGLED', serialize(array('custom' => 'internal_data', 'internal' => 'custom_data')));
 
 /*	Define the types existing into the current wordpress installation	*/
-$default_to_exclude = array('attachment','revision','nav_menu_item', WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE);
-DEFINE('WPSHOP_INTERNAL_TYPES_TO_EXCLUDE', (!empty($extra_options['WPSHOP_INTERNAL_TYPES_TO_EXCLUDE'])?serialize(array_merge(array($extra_options['WPSHOP_INTERNAL_TYPES_TO_EXCLUDE']),$default_to_exclude)):serialize($default_to_exclude)));
+$default_to_exclude = array('attachment', 'revision', 'nav_menu_item', WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE);
+DEFINE('WPSHOP_INTERNAL_TYPES_TO_EXCLUDE', (!empty($extra_options['WPSHOP_INTERNAL_TYPES_TO_EXCLUDE']) ? serialize(array_merge(array($extra_options['WPSHOP_INTERNAL_TYPES_TO_EXCLUDE']), $default_to_exclude)) : serialize($default_to_exclude)));
 
 /*	Start form field display config	*/
 /*	Get the list of possible posts status	*/
@@ -421,9 +421,9 @@ 
 	$comboxOptionToHide = array('deleted');
 
 /*	Attributes form	*/
-	$attribute_displayed_field = array('id', 'status', 'entity_id', 'is_required', 'is_unique', 'is_visible_in_front', 'is_visible_in_front_listing', 'frontend_input', 'backend_input', 'frontend_label', 'default_value', 'is_requiring_unit', '_unit_group_id', '_default_unit', 'is_historisable','is_intrinsic', 'is_filterable', 'code', 'is_used_for_sort_by', 'is_visible_in_advanced_search', 'is_used_in_admin_listing_column', 'is_used_in_quick_add_form', 'frontend_verification', 'is_user_defined', 'is_used_in_variation', 'is_used_for_variation', '_need_verification', '_display_informations_about_value', 'frontend_css_class', 'backend_css_class', 'frontend_help_message', 'is_searchable');
-	$attribute_options_group = array(__('Attribute unit', 'wpshop') => array('is_requiring_unit','_unit_group_id','_default_unit'), __('Frontend option', 'wpshop') => array('is_visible_in_front','is_visible_in_front_listing','is_used_for_sort_by','is_visible_in_advanced_search', 'is_searchable', '_display_informations_about_value'), __('Variations', 'wpshop') => array('is_user_defined', 'is_used_in_variation', 'is_used_for_variation', 'frontend_input'));
-	DEFINE('WPSHOP_ATTRIBUTE_DEF_COLUMN_INTO_OPTIONS', serialize( array('_need_verification', 'frontend_verification', 'frontend_css_class', 'backend_css_class', 'frontend_help_message', 'frontend_help_message') ));
+	$attribute_displayed_field = array('id', 'status', 'entity_id', 'is_required', 'is_unique', 'is_visible_in_front', 'is_visible_in_front_listing', 'frontend_input', 'backend_input', 'frontend_label', 'default_value', 'is_requiring_unit', '_unit_group_id', '_default_unit', 'is_historisable', 'is_intrinsic', 'is_filterable', 'code', 'is_used_for_sort_by', 'is_visible_in_advanced_search', 'is_used_in_admin_listing_column', 'is_used_in_quick_add_form', 'frontend_verification', 'is_user_defined', 'is_used_in_variation', 'is_used_for_variation', '_need_verification', '_display_informations_about_value', 'frontend_css_class', 'backend_css_class', 'frontend_help_message', 'is_searchable');
+	$attribute_options_group = array(__('Attribute unit', 'wpshop') => array('is_requiring_unit', '_unit_group_id', '_default_unit'), __('Frontend option', 'wpshop') => array('is_visible_in_front', 'is_visible_in_front_listing', 'is_used_for_sort_by', 'is_visible_in_advanced_search', 'is_searchable', '_display_informations_about_value'), __('Variations', 'wpshop') => array('is_user_defined', 'is_used_in_variation', 'is_used_for_variation', 'frontend_input'));
+	DEFINE('WPSHOP_ATTRIBUTE_DEF_COLUMN_INTO_OPTIONS', serialize(array('_need_verification', 'frontend_verification', 'frontend_css_class', 'backend_css_class', 'frontend_help_message', 'frontend_help_message')));
 
 /*	General form	*/
 	$attribute_hidden_field = array('position');