Eoxia / wpshop

includes/modules/wps_orders/templates/frontend/order_row_in_account.php

Indentation +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php if (!defined('ABSPATH')) {
-    exit;
+	exit;
 }
 
 ?>
@@ -18,7 +18,7 @@ 
 			<?php /** Check if http:// it's found in the link */
 $url = $order_meta['order_trackingLink'];
 if ('http://' != substr($url, 0, 7)) {
-    $url = 'http://' . $url;
+	$url = 'http://' . $url;
 }
 
 ?>

Spacing +18 added lines, -18 removed lines

@@ -4,14 +4,14 @@ 
 
 ?>
 <div class="wps-table-content wps-table-row">
-	<?php $order_status = unserialize(WPSHOP_ORDER_STATUS);?>
-	<?php $color_label = array('awaiting_payment' => 'jaune', 'canceled' => 'rouge', 'partially_paid' => 'orange', 'incorrect_amount' => 'orange', 'denied' => 'rouge', 'shipped' => 'bleu', 'payment_refused' => 'rouge', 'completed' => 'vert', 'refunded' => 'rouge', 'pos' => 'bleu');?>
-	<?php $currency = wpshop_tools::wpshop_get_currency(false);?>
+	<?php $order_status = unserialize(WPSHOP_ORDER_STATUS); ?>
+	<?php $color_label = array('awaiting_payment' => 'jaune', 'canceled' => 'rouge', 'partially_paid' => 'orange', 'incorrect_amount' => 'orange', 'denied' => 'rouge', 'shipped' => 'bleu', 'payment_refused' => 'rouge', 'completed' => 'vert', 'refunded' => 'rouge', 'pos' => 'bleu'); ?>
+	<?php $currency = wpshop_tools::wpshop_get_currency(false); ?>
 	<div class="wps-table-cell"><?php echo !empty($order_meta['order_date']) ? mysql2date(get_option('date_format'), $order_meta['order_date'], true) . '<br>' . mysql2date(get_option('time_format'), $order_meta['order_date'], true) : ''; ?></div>
 	<div class="wps-table-cell"><?php echo !empty($order_meta['order_key']) ? $order_meta['order_key'] : (!empty($order_meta['order_temporary_key']) ? $order_meta['order_temporary_key'] : ''); ?></div>
 	<div class="wps-table-cell"><?php echo !empty($order_meta['order_grand_total']) ? wpshop_tools::formate_number($order_meta['order_grand_total']) . ' ' . $currency : ''; ?></div>
 	<div class="wps-table-cell">
-		<span class="wps-label-<?php echo $color_label[$order_meta['order_status']]; ?>"><?php _e($order_status[$order_meta['order_status']], 'wpshop');?></span>
+		<span class="wps-label-<?php echo $color_label[$order_meta['order_status']]; ?>"><?php _e($order_status[$order_meta['order_status']], 'wpshop'); ?></span>
 	</div>
 	<div class="wps-table-cell">
 		<?php if (!empty($order_meta['order_trackingLink'])): ?>
@@ -24,32 +24,32 @@ 
 ?>
 			<a href="<?php echo $url; ?>" target="_blank"><?php echo !empty($order_meta['order_trackingNumber']) ? $order_meta['order_trackingNumber'] : ""; ?></a>
 		<?php else: ?>
-			<?php _e('No tracking links', 'wpshop');?>
-		<?php endif;?>
+			<?php _e('No tracking links', 'wpshop'); ?>
+		<?php endif; ?>
 	</div>
 	<?php if (!is_admin()): ?>
 		<div class="wps-table-cell wps-customer-order-list-actions">
-			<button data-nonce="<?php echo wp_create_nonce('wps_orders_load_details'); ?>" class="wps-bton-third wps-orders-details-opener" id="wps-order-details-opener-<?php echo $order_id; ?>"><?php _e('Order details', 'wpshop');?></button>
+			<button data-nonce="<?php echo wp_create_nonce('wps_orders_load_details'); ?>" class="wps-bton-third wps-orders-details-opener" id="wps-order-details-opener-<?php echo $order_id; ?>"><?php _e('Order details', 'wpshop'); ?></button>
 
-			<?php if (!empty($order_meta) && $order_meta['order_status'] && $order_meta['order_status'] != 'canceled' && (float) $order_meta['order_amount_to_pay_now'] != (float) 0): ?>
+			<?php if (!empty($order_meta) && $order_meta['order_status'] && $order_meta['order_status'] != 'canceled' && (float)$order_meta['order_amount_to_pay_now'] != (float)0): ?>
 				<?php if (isset($order_meta['pay_quotation']) && (!empty($order_meta['cart_type']) && $order_meta['cart_type'] == 'quotation') || !empty($order_meta['order_temporary_key'])): ?>
-				<a href="<?php echo wpshop_checkout::wps_direct_payment_link_url($order_id); ?>" target="_blank" class="wps-bton-third" role="button"><?php _e('Pay quotation', 'wpshop');?></a>
+				<a href="<?php echo wpshop_checkout::wps_direct_payment_link_url($order_id); ?>" target="_blank" class="wps-bton-third" role="button"><?php _e('Pay quotation', 'wpshop'); ?></a>
 				<?php else: ?>
-				<a href="<?php echo wpshop_checkout::wps_direct_payment_link_url($order_id); ?>" target="_blank" class="wps-bton-third" role="button"><?php _e('Pay order', 'wpshop');?></a>
-				<?php endif;?>
-			<?php endif;?>
+				<a href="<?php echo wpshop_checkout::wps_direct_payment_link_url($order_id); ?>" target="_blank" class="wps-bton-third" role="button"><?php _e('Pay order', 'wpshop'); ?></a>
+				<?php endif; ?>
+			<?php endif; ?>
 
 			<?php if (!empty($order_meta) && !empty($order_meta['order_invoice_ref'])): ?>
-			<br/><a href="<?php echo admin_url('admin-post.php?action=wps_invoice&order_id=' . $order_id . '&invoice_ref=' . $order_meta['order_invoice_ref'] . '&mode=pdf'); ?>" target="_blank" class="wps-bton-third" role="button"><?php _e('Download invoice', 'wpshop');?></a>
-			<?php endif;?>
+			<br/><a href="<?php echo admin_url('admin-post.php?action=wps_invoice&order_id=' . $order_id . '&invoice_ref=' . $order_meta['order_invoice_ref'] . '&mode=pdf'); ?>" target="_blank" class="wps-bton-third" role="button"><?php _e('Download invoice', 'wpshop'); ?></a>
+			<?php endif; ?>
 
 			<!-- Display delete order -->
-			<?php $wpshop_display_delete_order_option = get_option('wpshop_display_option');?>
+			<?php $wpshop_display_delete_order_option = get_option('wpshop_display_option'); ?>
 			<?php if (!empty($wpshop_display_delete_order_option) && !empty($wpshop_display_delete_order_option['wpshop_display_delete_order']) && $wpshop_display_delete_order_option['wpshop_display_delete_order'] && !empty($order_meta) && $order_meta['order_status'] == 'awaiting_payment'): ?>
-			<br/><button data-nonce="<?php echo wp_create_nonce('wps_delete_order'); ?>" class="wps-bton-first-mini-rounded wps-orders-delete button-secondary" data-id="<?php echo $order_id; ?>"><?php _e('Delete order', 'wpshop');?></button>
-			<?php endif;?>
+			<br/><button data-nonce="<?php echo wp_create_nonce('wps_delete_order'); ?>" class="wps-bton-first-mini-rounded wps-orders-delete button-secondary" data-id="<?php echo $order_id; ?>"><?php _e('Delete order', 'wpshop'); ?></button>
+			<?php endif; ?>
 		</div>
 	<?php else: ?>
-		<div class="wps-table-cell"><a href="<?php echo admin_url('post.php?post=' . $order_id . '&action=edit'); ?>" target="_blank" role="button" class="wps-bton-first-mini-rounded" ><?php _e('Order details', 'wpshop');?></a></div>
+		<div class="wps-table-cell"><a href="<?php echo admin_url('post.php?post=' . $order_id . '&action=edit'); ?>" target="_blank" role="button" class="wps-bton-first-mini-rounded" ><?php _e('Order details', 'wpshop'); ?></a></div>
 	<?php endif?>
 </div>

Braces +15 added lines, -6 removed lines

@@ -23,8 +23,11 @@ 
 
 ?>
 			<a href="<?php echo $url; ?>" target="_blank"><?php echo !empty($order_meta['order_trackingNumber']) ? $order_meta['order_trackingNumber'] : ""; ?></a>
-		<?php else: ?>
-			<?php _e('No tracking links', 'wpshop');?>
+		<?php else {
+	: ?>
+			<?php _e('No tracking links', 'wpshop');
+}
+?>
 		<?php endif;?>
 	</div>
 	<?php if (!is_admin()): ?>
@@ -34,8 +37,11 @@ 
 			<?php if (!empty($order_meta) && $order_meta['order_status'] && $order_meta['order_status'] != 'canceled' && (float) $order_meta['order_amount_to_pay_now'] != (float) 0): ?>
 				<?php if (isset($order_meta['pay_quotation']) && (!empty($order_meta['cart_type']) && $order_meta['cart_type'] == 'quotation') || !empty($order_meta['order_temporary_key'])): ?>
 				<a href="<?php echo wpshop_checkout::wps_direct_payment_link_url($order_id); ?>" target="_blank" class="wps-bton-third" role="button"><?php _e('Pay quotation', 'wpshop');?></a>
-				<?php else: ?>
-				<a href="<?php echo wpshop_checkout::wps_direct_payment_link_url($order_id); ?>" target="_blank" class="wps-bton-third" role="button"><?php _e('Pay order', 'wpshop');?></a>
+				<?php else {
+	: ?>
+				<a href="<?php echo wpshop_checkout::wps_direct_payment_link_url($order_id);
+}
+?>" target="_blank" class="wps-bton-third" role="button"><?php _e('Pay order', 'wpshop');?></a>
 				<?php endif;?>
 			<?php endif;?>
 
@@ -49,7 +55,10 @@ 
 			<br/><button data-nonce="<?php echo wp_create_nonce('wps_delete_order'); ?>" class="wps-bton-first-mini-rounded wps-orders-delete button-secondary" data-id="<?php echo $order_id; ?>"><?php _e('Delete order', 'wpshop');?></button>
 			<?php endif;?>
 		</div>
-	<?php else: ?>
-		<div class="wps-table-cell"><a href="<?php echo admin_url('post.php?post=' . $order_id . '&action=edit'); ?>" target="_blank" role="button" class="wps-bton-first-mini-rounded" ><?php _e('Order details', 'wpshop');?></a></div>
+	<?php else {
+	: ?>
+		<div class="wps-table-cell"><a href="<?php echo admin_url('post.php?post=' . $order_id . '&action=edit');
+}
+?>" target="_blank" role="button" class="wps-bton-first-mini-rounded" ><?php _e('Order details', 'wpshop');?></a></div>
 	<?php endif?>
 </div>

wpshop.php

Indentation +23 added lines, -23 removed lines

@@ -21,7 +21,7 @@ 
 
 /**    Check if file is include. No direct access possible with file url    */
 if (!defined('ABSPATH')) {
-    die('Access is not allowed by this way');
+	die('Access is not allowed by this way');
 }
 
 /**    Allows to refresh css and js file in final user browser    */
@@ -40,9 +40,9 @@ 
 $locale = get_locale();
 global $wpdb;
 if (defined("ICL_LANGUAGE_CODE")) {
-    $query = $wpdb->prepare("SELECT locale FROM " . $wpdb->prefix . "icl_locale_map WHERE code = %s", ICL_LANGUAGE_CODE);
-    $local = $wpdb->get_var($query);
-    $locale = !empty($local) ? $local : $locale;
+	$query = $wpdb->prepare("SELECT locale FROM " . $wpdb->prefix . "icl_locale_map WHERE code = %s", ICL_LANGUAGE_CODE);
+	$local = $wpdb->get_var($query);
+	$locale = !empty($local) ? $local : $locale;
 }
 DEFINE('WPSHOP_CURRENT_LOCALE', $locale);
 /**    Load plugin translation    */
@@ -53,8 +53,8 @@ 
 
 /** Allow to get errors back when debug mode is set to true    */
 if (WPSHOP_DEBUG_MODE && (in_array(long2ip(ip2long($_SERVER['REMOTE_ADDR'])), unserialize(WPSHOP_DEBUG_MODE_ALLOWED_IP)))) {
-    ini_set('display_errors', true);
-    error_reporting(E_ALL);
+	ini_set('display_errors', true);
+	error_reporting(E_ALL);
 }
 
 include_once WPSHOP_LIBRAIRIES_DIR . 'init.class.php';
@@ -100,9 +100,9 @@ 
 /**    Add the database content    */
 add_action('admin_init', array('wpshop_install', 'update_wpshop'));
 if ((defined('WPSINSTALLER_STEPS_COUNT') && (WPSINSTALLER_STEPS_COUNT <= $current_installation_step)) || (!empty($current_db_version) && !empty($current_db_version['db_version']) && (51 < $current_db_version['db_version'])) || (!empty($current_db_version) && !empty($current_db_version['installation_state']) && ("ignore" == $current_db_version['installation_state']))) {
-    if (in_array(long2ip(ip2long($_SERVER['REMOTE_ADDR'])), unserialize(WPSHOP_DEBUG_MODE_ALLOWED_IP))) {
-        add_action('admin_init', array('wpshop_install', 'update_wpshop_dev'));
-    }
+	if (in_array(long2ip(ip2long($_SERVER['REMOTE_ADDR'])), unserialize(WPSHOP_DEBUG_MODE_ALLOWED_IP))) {
+		add_action('admin_init', array('wpshop_install', 'update_wpshop_dev'));
+	}
 }
 // Start session
 @session_start();
@@ -110,9 +110,9 @@ 
 // WP-Shop class instanciation
 function classes_init()
 {
-    global $wpshop_cart, $wpshop, $wpshop_account, $wpshop_payment;
-    $wpshop = new wpshop_form_management();
-    $wpshop_payment = new wpshop_payment();
+	global $wpshop_cart, $wpshop, $wpshop_account, $wpshop_payment;
+	$wpshop = new wpshop_form_management();
+	$wpshop_payment = new wpshop_payment();
 }
 add_action('init', 'classes_init');
 
@@ -145,18 +145,18 @@ 
 add_action($hook, 'wps_update_message', 10, 2); // 10:priority, 2:arguments #
 function wps_update_message($currentPluginMetadata, $newPluginMetadata)
 {
-    $message = '';
+	$message = '';
 
-    if ('1.4.1.6' == $currentPluginMetadata['Version']) {
-        $message = sprintf(__('For security reason %splease read this post%s', 'wpshop'), '<a href="" >', '</a>');
-    }
+	if ('1.4.1.6' == $currentPluginMetadata['Version']) {
+		$message = sprintf(__('For security reason %splease read this post%s', 'wpshop'), '<a href="" >', '</a>');
+	}
 
-    // check "upgrade_notice"
-    if (isset($newPluginMetadata->upgrade_notice) && strlen(trim($newPluginMetadata->upgrade_notice)) > 0) {
-        $message = esc_html($newPluginMetadata->upgrade_notice);
-    }
+	// check "upgrade_notice"
+	if (isset($newPluginMetadata->upgrade_notice) && strlen(trim($newPluginMetadata->upgrade_notice)) > 0) {
+		$message = esc_html($newPluginMetadata->upgrade_notice);
+	}
 
-    if (!empty($message)) {
-        echo '<p style="background-color: #d54e21; padding: 10px; color: #f9f9f9; margin-top: 10px"><strong>' . __('Important upgrade notice', 'wpshop') . ': </strong>' . $message . '</p>';
-    }
+	if (!empty($message)) {
+		echo '<p style="background-color: #d54e21; padding: 10px; color: #f9f9f9; margin-top: 10px"><strong>' . __('Important upgrade notice', 'wpshop') . ': </strong>' . $message . '</p>';
+	}
 }