| @@ -16,29 +16,29 @@ | ||
| 16 | 16 | |
| 17 | 17 | namespace wpshop; | 
| 18 | 18 | |
| 19 | -defined( 'ABSPATH' ) || exit; | |
| 19 | +defined('ABSPATH') || exit; | |
| 20 | 20 | |
| 21 | -do_action( 'wps_email_header' ); ?> | |
| 21 | +do_action('wps_email_header'); ?> | |
| 22 | 22 | |
| 23 | 23 | <p> | 
| 24 | 24 | <?php | 
| 25 | 25 | /* translators: %s: Customer first name */ | 
| 26 | - printf( esc_html__( 'Hi %s,', 'wpshop' ), esc_html( $data['third_party']['title'] ) ); | |
| 26 | +	printf(esc_html__('Hi %s,', 'wpshop'), esc_html($data['third_party']['title'])); | |
| 27 | 27 | ?> | 
| 28 | 28 | </p> | 
| 29 | 29 | <p> | 
| 30 | 30 | <?php | 
| 31 | 31 | /* translators: %s: Order number */ | 
| 32 | - printf( esc_html__( 'Just to let you know — we\'ve received your order #%s, and it is now being processed:', 'wpshop' ), esc_html( $data['order']->ref ) ); | |
| 32 | +	printf(esc_html__('Just to let you know — we\'ve received your order #%s, and it is now being processed:', 'wpshop'), esc_html($data['order']->ref)); | |
| 33 | 33 | ?> | 
| 34 | 34 | </p> | 
| 35 | 35 | |
| 36 | 36 | <?php | 
| 37 | 37 | |
| 38 | -do_action( 'wps_email_order_details', $data['order'] ); | |
| 38 | +do_action('wps_email_order_details', $data['order']); | |
| 39 | 39 | |
| 40 | -do_action( 'wps_email_order_meta' ); | |
| 40 | +do_action('wps_email_order_meta'); | |
| 41 | 41 | |
| 42 | -do_action( 'wps_email_customer_details' ); | |
| 42 | +do_action('wps_email_customer_details'); | |
| 43 | 43 | |
| 44 | -do_action( 'wps_email_footer' ); | |
| 44 | +do_action('wps_email_footer'); | |
| @@ -16,17 +16,17 @@ | ||
| 16 | 16 | |
| 17 | 17 | namespace wpshop; | 
| 18 | 18 | |
| 19 | -defined( 'ABSPATH' ) || exit; | |
| 19 | +defined('ABSPATH') || exit; | |
| 20 | 20 | |
| 21 | -do_action( 'wps_email_header' ); ?> | |
| 21 | +do_action('wps_email_header'); ?> | |
| 22 | 22 | |
| 23 | 23 | <p>Reset password</p> | 
| 24 | 24 | |
| 25 | 25 | <?php | 
| 26 | -do_action( 'wps_email_order_details' ); | |
| 26 | +do_action('wps_email_order_details'); | |
| 27 | 27 | |
| 28 | -do_action( 'wps_email_order_meta' ); | |
| 28 | +do_action('wps_email_order_meta'); | |
| 29 | 29 | |
| 30 | -do_action( 'wps_email_customer_details' ); | |
| 30 | +do_action('wps_email_customer_details'); | |
| 31 | 31 | |
| 32 | -do_action( 'wps_email_footer' ); | |
| 32 | +do_action('wps_email_footer'); | |
| @@ -14,7 +14,7 @@ discard block | ||
| 14 | 14 | |
| 15 | 15 | namespace wpshop; | 
| 16 | 16 | |
| 17 | -defined( 'ABSPATH' ) || exit; | |
| 17 | +defined('ABSPATH') || exit; | |
| 18 | 18 | |
| 19 | 19 | /** | 
| 20 | 20 | * Doli Proposals Class. | 
| @@ -37,17 +37,17 @@ discard block | ||
| 37 | 37 | * | 
| 38 | 38 | * @param Proposal_Model $wp_proposal Les données de WP. | 
| 39 | 39 | */ | 
| 40 | -	public function doli_to_wp( $doli_proposal, $wp_proposal ) { | |
| 41 | - $wp_proposal->data['external_id'] = (int) $doli_proposal->id; | |
| 40 | +	public function doli_to_wp($doli_proposal, $wp_proposal) { | |
| 41 | + $wp_proposal->data['external_id'] = (int)$doli_proposal->id; | |
| 42 | 42 | $wp_proposal->data['title'] = $doli_proposal->ref; | 
| 43 | 43 | $wp_proposal->data['total_ht'] = $doli_proposal->total_ht; | 
| 44 | 44 | $wp_proposal->data['total_ttc'] = $doli_proposal->total_ttc; | 
| 45 | 45 | $wp_proposal->data['lines'] = $doli_proposal->lines; | 
| 46 | - $wp_proposal->data['datec'] = date( 'Y-m-d h:i:s', $doli_proposal->datec ); | |
| 47 | - $wp_proposal->data['parent_id'] = Doli_Third_Parties::g()->get_wp_id_by_doli_id( $doli_proposal->socid ); | |
| 46 | +		$wp_proposal->data['datec']       = date('Y-m-d h:i:s', $doli_proposal->datec); | |
| 47 | + $wp_proposal->data['parent_id'] = Doli_Third_Parties::g()->get_wp_id_by_doli_id($doli_proposal->socid); | |
| 48 | 48 | $wp_proposal->data['status'] = 'publish'; | 
| 49 | 49 | |
| 50 | - Proposals::g()->update( $wp_proposal->data ); | |
| 50 | + Proposals::g()->update($wp_proposal->data); | |
| 51 | 51 | } | 
| 52 | 52 | |
| 53 | 53 | /** | 
| @@ -59,23 +59,23 @@ discard block | ||
| 59 | 59 | * | 
| 60 | 60 | * @return integer L'ID du devis venant de Dolibarr. | 
| 61 | 61 | */ | 
| 62 | -	public function wp_to_doli( $wp_proposal ) { | |
| 63 | - $third_party_doli_id = get_post_meta( $wp_proposal->data['parent_id'], '_external_id', true ); | |
| 62 | +	public function wp_to_doli($wp_proposal) { | |
| 63 | + $third_party_doli_id = get_post_meta($wp_proposal->data['parent_id'], '_external_id', true); | |
| 64 | 64 | $doli_proposal_id = 0; | 
| 65 | 65 | |
| 66 | -		if ( ! empty( $wp_proposal->data['external_id'] ) ) { | |
| 66 | +		if (!empty($wp_proposal->data['external_id'])) { | |
| 67 | 67 | $doli_proposal_id = $wp_proposal->data['external_id']; | 
| 68 | 68 |  		} else { | 
| 69 | 69 | |
| 70 | - $doli_proposal_id = Request_Util::post( 'proposals', array( | |
| 70 | +			$doli_proposal_id = Request_Util::post('proposals', array( | |
| 71 | 71 | 'socid' => $third_party_doli_id, | 
| 72 | - 'date' => current_time( 'timestamp' ), | |
| 73 | - 'mode_reglement_id' => ! empty( $wp_proposal->data['payment_method'] ) ? Doli_Payment::g()->convert_to_doli_id( $wp_proposal->data['payment_method'] ) : '', | |
| 74 | - ) ); | |
| 72 | +				'date'              => current_time('timestamp'), | |
| 73 | + 'mode_reglement_id' => !empty($wp_proposal->data['payment_method']) ? Doli_Payment::g()->convert_to_doli_id($wp_proposal->data['payment_method']) : '', | |
| 74 | + )); | |
| 75 | 75 | |
| 76 | -			if ( ! empty( $wp_proposal->data['lines'] ) ) { | |
| 77 | -				foreach ( $wp_proposal->data['lines'] as $content ) { | |
| 78 | - $proposal = Request_Util::post( 'proposals/' . $doli_proposal_id . '/lines', array( | |
| 76 | +			if (!empty($wp_proposal->data['lines'])) { | |
| 77 | +				foreach ($wp_proposal->data['lines'] as $content) { | |
| 78 | +					$proposal = Request_Util::post('proposals/' . $doli_proposal_id . '/lines', array( | |
| 79 | 79 | 'desc' => $content['content'], | 
| 80 | 80 | 'fk_product' => $content['external_id'], | 
| 81 | 81 | 'product_type' => 1, | 
| @@ -93,7 +93,7 @@ discard block | ||
| 93 | 93 | 'multicurrency_total_ht' => $content['price'], | 
| 94 | 94 | 'multicurrency_total_tva' => 0, | 
| 95 | 95 | 'multicurrency_total_ttc' => $content['price_ttc'], | 
| 96 | - ) ); | |
| 96 | + )); | |
| 97 | 97 | } | 
| 98 | 98 | } | 
| 99 | 99 | } | 
| @@ -12,14 +12,14 @@ | ||
| 12 | 12 | * @since 2.0.0 | 
| 13 | 13 | */ | 
| 14 | 14 | |
| 15 | -if ( ! empty( $invoice->data['payments'] ) ) : | |
| 16 | - foreach ( $invoice->data['payments'] as $payment ) : | |
| 15 | +if (!empty($invoice->data['payments'])) : | |
| 16 | + foreach ($invoice->data['payments'] as $payment) : | |
| 17 | 17 | ?> | 
| 18 | 18 | <ul> | 
| 19 | - <li><?php esc_html_e( 'Payment method', 'wpshop' ); ?> : <?php echo esc_html( $payment->data['payment_type'] ); ?></li> | |
| 20 | - <li><?php esc_html_e( 'Payment date', 'wpshop' ); ?> : <?php echo esc_html( $payment->data['date']['rendered']['date_human_readable'] ); ?></li> | |
| 21 | - <li><?php esc_html_e( 'Payment reference', 'wpshop' ); ?> : <?php echo esc_html( $payment->data['title'] ); ?></li> | |
| 22 | - <li><?php esc_html_e( 'Amount', 'wpshop' ); ?> : <?php echo esc_html( $payment->data['amount'] ); ?>€</li> | |
| 19 | +			<li><?php esc_html_e('Payment method', 'wpshop'); ?> : <?php echo esc_html($payment->data['payment_type']); ?></li> | |
| 20 | +			<li><?php esc_html_e('Payment date', 'wpshop'); ?> : <?php echo esc_html($payment->data['date']['rendered']['date_human_readable']); ?></li> | |
| 21 | +			<li><?php esc_html_e('Payment reference', 'wpshop'); ?> : <?php echo esc_html($payment->data['title']); ?></li> | |
| 22 | +			<li><?php esc_html_e('Amount', 'wpshop'); ?> : <?php echo esc_html($payment->data['amount']); ?>€</li> | |
| 23 | 23 | </ul> | 
| 24 | 24 | |
| 25 | 25 | <?php | 
| @@ -14,26 +14,26 @@ | ||
| 14 | 14 | |
| 15 | 15 | namespace wpshop; | 
| 16 | 16 | |
| 17 | -defined( 'ABSPATH' ) || exit; ?> | |
| 17 | +defined('ABSPATH') || exit; ?> | |
| 18 | 18 | |
| 19 | 19 | <table class="wpeo-table"> | 
| 20 | 20 | <thead> | 
| 21 | 21 | <tr> | 
| 22 | 22 | <th><input type="checkbox" /></th> | 
| 23 | - <th><?php esc_html_e( 'WP ID', 'wpshop' ); ?></th> | |
| 24 | - <th><?php esc_html_e( 'Ref', 'wpshop' ); ?></th> | |
| 25 | - <th><?php esc_html_e( 'Price', 'wpshop' ); ?></th> | |
| 26 | - <?php echo apply_filters( 'wps_order_table_th', '' ); ?> | |
| 23 | +			<th><?php esc_html_e('WP ID', 'wpshop'); ?></th> | |
| 24 | +			<th><?php esc_html_e('Ref', 'wpshop'); ?></th> | |
| 25 | +			<th><?php esc_html_e('Price', 'wpshop'); ?></th> | |
| 26 | +			<?php echo apply_filters('wps_order_table_th', ''); ?> | |
| 27 | 27 | <th></th> | 
| 28 | 28 | </tr> | 
| 29 | 29 | </thead> | 
| 30 | 30 | <tbody> | 
| 31 | 31 | <?php | 
| 32 | - if ( ! empty( $proposals ) ) : | |
| 33 | - foreach ( $proposals as $proposal ) : | |
| 34 | - \eoxia\View_Util::exec( 'wpshop', 'doli-proposals', 'item', array( | |
| 32 | + if (!empty($proposals)) : | |
| 33 | + foreach ($proposals as $proposal) : | |
| 34 | +				\eoxia\View_Util::exec('wpshop', 'doli-proposals', 'item', array( | |
| 35 | 35 | 'proposal' => $proposal, | 
| 36 | - ) ); | |
| 36 | + )); | |
| 37 | 37 | endforeach; | 
| 38 | 38 | endif; | 
| 39 | 39 | ?> | 
| @@ -14,15 +14,15 @@ | ||
| 14 | 14 | |
| 15 | 15 | namespace wpshop; | 
| 16 | 16 | |
| 17 | -defined( 'ABSPATH' ) || exit; ?> | |
| 17 | +defined('ABSPATH') || exit; ?> | |
| 18 | 18 | |
| 19 | 19 | <tr> | 
| 20 | 20 | <td><input type="checkbox" /></td> | 
| 21 | - <td><?php echo esc_html( $proposal->data['id'] ); ?></td> | |
| 22 | - <td><?php echo esc_html( $proposal->data['title'] ); ?></td> | |
| 23 | - <td><?php echo esc_html( $proposal->data['total_ttc'] ); ?>€</td> | |
| 24 | - <?php apply_filters( 'wps_order_table_tr', $proposal ); ?> | |
| 21 | + <td><?php echo esc_html($proposal->data['id']); ?></td> | |
| 22 | + <td><?php echo esc_html($proposal->data['title']); ?></td> | |
| 23 | + <td><?php echo esc_html($proposal->data['total_ttc']); ?>€</td> | |
| 24 | +	<?php apply_filters('wps_order_table_tr', $proposal); ?> | |
| 25 | 25 | <td> | 
| 26 | - <a href="<?php echo esc_attr( admin_url( 'post.php?post=' . $proposal->data['id'] . '&action=edit' ) ); ?>" class="wpeo-button button-square-30 button-rounded"><i class="button-icon fas fa-pencil"></i></a> | |
| 26 | +		<a href="<?php echo esc_attr(admin_url('post.php?post=' . $proposal->data['id'] . '&action=edit')); ?>" class="wpeo-button button-square-30 button-rounded"><i class="button-icon fas fa-pencil"></i></a> | |
| 27 | 27 | </td> | 
| 28 | 28 | </tr> | 
| @@ -14,14 +14,14 @@ | ||
| 14 | 14 | |
| 15 | 15 | namespace wpshop; | 
| 16 | 16 | |
| 17 | -defined( 'ABSPATH' ) || exit; ?> | |
| 17 | +defined('ABSPATH') || exit; ?> | |
| 18 | 18 | |
| 19 | 19 | <div class="wrap"> | 
| 20 | - <h2><?php esc_html_e( 'Orders', 'wpshop' ); ?></h2> | |
| 20 | +	<h2><?php esc_html_e('Orders', 'wpshop'); ?></h2> | |
| 21 | 21 | |
| 22 | 22 | <div class="action-attribute wpeo-button button-main" | 
| 23 | 23 | data-action="synchro_proposals"> | 
| 24 | - <span><?php esc_html_e( 'Sync', 'wpshop' ); ?></span> | |
| 24 | +		<span><?php esc_html_e('Sync', 'wpshop'); ?></span> | |
| 25 | 25 | </div> | 
| 26 | 26 | |
| 27 | 27 | <?php Proposals::g()->display(); ?> | 
| @@ -14,7 +14,7 @@ discard block | ||
| 14 | 14 | |
| 15 | 15 | namespace wpshop; | 
| 16 | 16 | |
| 17 | -defined( 'ABSPATH' ) || exit; | |
| 17 | +defined('ABSPATH') || exit; | |
| 18 | 18 | |
| 19 | 19 | /** | 
| 20 | 20 | * Doli Contact Class. | 
| @@ -36,44 +36,44 @@ discard block | ||
| 36 | 36 | * @param stdClass $doli_contact Les données provenant de Dolibarr. | 
| 37 | 37 | * @param Contact_Model $wp_contact Les données de WP. | 
| 38 | 38 | */ | 
| 39 | -	public function doli_to_wp( $doli_contact, $wp_contact ) { | |
| 39 | +	public function doli_to_wp($doli_contact, $wp_contact) { | |
| 40 | 40 | $wp_third_party = null; | 
| 41 | 41 | |
| 42 | -		if ( ! empty( $doli_contact->socid ) ) { | |
| 43 | - $wp_third_party = Third_Party::g()->get( array( | |
| 42 | +		if (!empty($doli_contact->socid)) { | |
| 43 | + $wp_third_party = Third_Party::g()->get(array( | |
| 44 | 44 | 'meta_key' => '_external_id', | 
| 45 | - 'meta_value' => (int) $doli_contact->socid, | |
| 46 | - ), true ); | |
| 45 | + 'meta_value' => (int)$doli_contact->socid, | |
| 46 | + ), true); | |
| 47 | 47 | } | 
| 48 | 48 | |
| 49 | - $wp_contact->data['external_id'] = (int) $doli_contact->id; | |
| 50 | - $wp_contact->data['login'] = sanitize_title( $doli_contact->email ); | |
| 49 | + $wp_contact->data['external_id'] = (int)$doli_contact->id; | |
| 50 | + $wp_contact->data['login'] = sanitize_title($doli_contact->email); | |
| 51 | 51 | $wp_contact->data['firstname'] = $doli_contact->firstname; | 
| 52 | 52 | $wp_contact->data['lastname'] = $doli_contact->lastname; | 
| 53 | 53 | $wp_contact->data['phone'] = $doli_contact->phone_pro; | 
| 54 | 54 | $wp_contact->data['email'] = $doli_contact->email; | 
| 55 | 55 | |
| 56 | -		if ( false !== email_exists( $wp_contact->data['email'] ) ) { | |
| 56 | +		if (false !== email_exists($wp_contact->data['email'])) { | |
| 57 | 57 | return false; | 
| 58 | 58 | } | 
| 59 | 59 | |
| 60 | -		if ( null !== $wp_third_party ) { | |
| 60 | +		if (null !== $wp_third_party) { | |
| 61 | 61 | $wp_contact->data['third_party_id'] = $wp_third_party->data['id']; | 
| 62 | 62 | } | 
| 63 | 63 | |
| 64 | -		if ( empty( $wp_contact->data['id'] ) ) { | |
| 64 | +		if (empty($wp_contact->data['id'])) { | |
| 65 | 65 | $wp_contact->data['password'] = wp_generate_password(); | 
| 66 | 66 | } | 
| 67 | 67 | |
| 68 | - $contact_saved = Contact::g()->update( $wp_contact->data ); | |
| 68 | + $contact_saved = Contact::g()->update($wp_contact->data); | |
| 69 | 69 | |
| 70 | -		if ( is_wp_error( $contact_saved ) ) { | |
| 70 | +		if (is_wp_error($contact_saved)) { | |
| 71 | 71 | return false; | 
| 72 | 72 | } | 
| 73 | 73 | |
| 74 | -		if ( null !== $wp_third_party ) { | |
| 74 | +		if (null !== $wp_third_party) { | |
| 75 | 75 | $wp_third_party->data['contact_ids'][] = $contact_saved->data['id']; | 
| 76 | - Third_Party::g()->update( $wp_third_party->data ); | |
| 76 | + Third_Party::g()->update($wp_third_party->data); | |
| 77 | 77 | } | 
| 78 | 78 | } | 
| 79 | 79 | |
| @@ -87,18 +87,18 @@ discard block | ||
| 87 | 87 | * | 
| 88 | 88 | * @return integer L'ID de dolibarr. | 
| 89 | 89 | */ | 
| 90 | -	public function wp_to_doli( $wp_contact, $doli_contact ) { | |
| 91 | - $third_party = Third_Party::g()->get( array( | |
| 90 | +	public function wp_to_doli($wp_contact, $doli_contact) { | |
| 91 | + $third_party = Third_Party::g()->get(array( | |
| 92 | 92 | 'id' => $wp_contact->data['third_party_id'], | 
| 93 | - ), true ); | |
| 93 | + ), true); | |
| 94 | 94 | |
| 95 | - $contact_id = Request_Util::post( 'contacts', array( | |
| 95 | +		$contact_id = Request_Util::post('contacts', array( | |
| 96 | 96 | 'lastname' => $wp_contact->data['lastname'], | 
| 97 | 97 | 'firstname' => $wp_contact->data['firstname'], | 
| 98 | 98 | 'email' => $wp_contact->data['email'], | 
| 99 | 99 | 'phone_pro' => $wp_contact->data['phone'], | 
| 100 | 100 | 'socid' => $third_party->data['external_id'], | 
| 101 | - ) ); | |
| 101 | + )); | |
| 102 | 102 | |
| 103 | 103 | return $contact_id; | 
| 104 | 104 | } | 
| @@ -14,7 +14,7 @@ discard block | ||
| 14 | 14 | |
| 15 | 15 | namespace wpshop; | 
| 16 | 16 | |
| 17 | -defined( 'ABSPATH' ) || exit; | |
| 17 | +defined('ABSPATH') || exit; | |
| 18 | 18 | |
| 19 | 19 | /** | 
| 20 | 20 | * Doli Contact Action Class. | 
| @@ -27,9 +27,9 @@ discard block | ||
| 27 | 27 | * @since 2.0.0 | 
| 28 | 28 | */ | 
| 29 | 29 |  	public function __construct() { | 
| 30 | - add_action( 'wps_checkout_create_contact', array( $this, 'checkout_create_contact' ) ); | |
| 30 | +		add_action('wps_checkout_create_contact', array($this, 'checkout_create_contact')); | |
| 31 | 31 | |
| 32 | - add_action( 'wps_deleted_contact', array( $this, 'delete_contact' ), 10, 2 ); | |
| 32 | +		add_action('wps_deleted_contact', array($this, 'delete_contact'), 10, 2); | |
| 33 | 33 | } | 
| 34 | 34 | |
| 35 | 35 | /** | 
| @@ -39,8 +39,8 @@ discard block | ||
| 39 | 39 | * | 
| 40 | 40 | * @param Contact_Model $wp_contact Les données du contact. | 
| 41 | 41 | */ | 
| 42 | -	public function checkout_create_contact( $wp_contact ) { | |
| 43 | - Doli_Contact::g()->wp_to_doli( $wp_contact, null ); | |
| 42 | +	public function checkout_create_contact($wp_contact) { | |
| 43 | + Doli_Contact::g()->wp_to_doli($wp_contact, null); | |
| 44 | 44 | } | 
| 45 | 45 | |
| 46 | 46 | /** | 
| @@ -51,12 +51,12 @@ discard block | ||
| 51 | 51 | * @param Third_Party_Model $third_party Les données du tier. | 
| 52 | 52 | * @param Contact_Model $contact Les données du contact. | 
| 53 | 53 | */ | 
| 54 | -	public function delete_contact( $third_party, $contact ) { | |
| 54 | +	public function delete_contact($third_party, $contact) { | |
| 55 | 55 | $data = array( | 
| 56 | 56 | 'socid' => -1, | 
| 57 | 57 | ); | 
| 58 | 58 | |
| 59 | - Request_Util::put( 'contacts/' . $contact->data['external_id'], $data ); | |
| 59 | +		Request_Util::put('contacts/' . $contact->data['external_id'], $data); | |
| 60 | 60 | } | 
| 61 | 61 | } | 
| 62 | 62 | |