Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch the payment token meta to use WP's metadata functions.

This commit is contained in:
Justin Shreve 2016-02-04 12:11:38 -08:00
parent 2e896ae24a
commit da9368e8be
2 changed files with 31 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
includes/class-wc-install.php
View File

@ -487,21 +487,24 @@ CREATE TABLE {$wpdb->prefix}woocommerce_shipping_zone_methods (
method_order bigint(20) NOT NULL,
PRIMARY KEY (instance_id)
) $collate;
CREATE TABLE IF NOT EXISTS {$wpdb->prefix}woocommerce_payment_tokens (
`token_id` bigint(20) NOT NULL auto_increment,
`gateway_id` varchar(255) NOT NULL,
`token` text NOT NULL,
`customer_id` bigint(20) NOT NULL,
`type` varchar(255) NOT NULL,
`is_default` tinyint(1) NOT NULL,
PRIMARY KEY (token_id)
CREATE TABLE {$wpdb->prefix}woocommerce_payment_tokens (
token_id bigint(20) NOT NULL auto_increment,
gateway_id varchar(255) NOT NULL,
token text NOT NULL,
customer_id bigint(20) NOT NULL DEFAULT '0',
type varchar(255) NOT NULL,
is_default tinyint(1) NOT NULL DEFAULT '0',
PRIMARY KEY (token_id),
KEY customer_id (customer_id)
) $collate;
CREATE TABLE IF NOT EXISTS {$wpdb->prefix}woocommerce_payment_token_meta (
`meta_id` bigint(20) NOT NULL auto_increment,
`token_id` bigint(20) NOT NULL,
`meta_key` varchar(255) NOT NULL,
`meta_value` text NOT NULL,
PRIMARY KEY (meta_id)
CREATE TABLE {$wpdb->prefix}woocommerce_payment_tokenmeta (
meta_id bigint(20) NOT NULL auto_increment,
payment_token_id bigint(20) NOT NULL,
meta_key varchar(255) NULL,
meta_value longtext NULL,
PRIMARY KEY (meta_id),
KEY payment_token_id (payment_token_id),
KEY meta_key (meta_key)
) $collate;
";
}

48
includes/class-wc-payment-tokens.php
View File

@ -68,14 +68,8 @@ class WC_Payment_Tokens {
// Store the main token in the database
$wpdb->insert( $wpdb->prefix . 'woocommerce_payment_tokens', $core_fields_to_create );
$token_id = $wpdb->insert_id;
// Insert any other meta and associate it with the new token
foreach ( $args as $meta_key => $meta_value ) {
$wpdb->insert( $wpdb->prefix . 'woocommerce_payment_token_meta', array(
'meta_key' => $meta_key,
'meta_value' => $meta_value,
'token_id' => $token_id
) );
add_metadata( 'payment_token', $token_id, $meta_key, $meta_value, true );
}
do_action( 'woocommerce_payment_token_created', $token_id );
@ -89,6 +83,10 @@ class WC_Payment_Tokens {
* @return WC_Payment_Token Updated token
*/
public static function update( $token_id, $token ) {
if ( ! ( $token instanceof WC_Payment_Token ) ) {
return; // @todo throw an error
}
$args = $token->__data_format();
unset( $args['token_id'] );
if ( ! self::validate( $args ) ) {
@ -107,25 +105,10 @@ class WC_Payment_Tokens {
global $wpdb;
// Update our core fields
// Update our fields
$wpdb->update( $wpdb->prefix . 'woocommerce_payment_tokens', $core_fields_to_update, array( 'token_id' => $token_id ) );
// Grab a list of our existing meta, and update if we have a matching value in $args, otherise, create a new meta row
$existing_meta = $wpdb->get_col( $wpdb->prepare(
"SELECT meta_key FROM {$wpdb->prefix}woocommerce_payment_token_meta WHERE token_id = %d", $token_id
) );
foreach ( $args as $meta_key => $meta_value ) {
if ( in_array( $meta_key, $existing_meta ) ) {
$wpdb->update( $wpdb->prefix . 'woocommerce_payment_token_meta', array(
'meta_value' => $meta_value
), array( 'token_id' => $token_id, 'meta_key' => $meta_key ) );
} else {
$wpdb->insert( $wpdb->prefix . 'woocommerce_payment_token_meta', array(
'meta_key' => $meta_key,
'meta_value' => $meta_value,
'token_id' => $token_id
) );
}
update_metadata( 'payment_token', $token_id, $meta_key, $meta_value );
}
do_action( 'woocommerce_payment_token_updated', $token_id );
@ -139,7 +122,7 @@ class WC_Payment_Tokens {
public static function delete( $token_id ) {
global $wpdb;
$wpdb->delete( $wpdb->prefix . 'woocommerce_payment_tokens', array( 'token_id' => $token_id ), array( '%d' ) );
$wpdb->delete( $wpdb->prefix . 'woocommerce_payment_token_meta', array( 'token_id' => $token_id ), array( '%d' ) );
$wpdb->delete( $wpdb->prefix . 'woocommerce_payment_tokenmeta', array( 'payment_token_id' => $token_id ), array( '%d' ) );
do_action( 'woocommerce_payment_token_deleted', $token_id );
}
@ -232,17 +215,14 @@ class WC_Payment_Tokens {
global $wpdb;
$token_class = 'WC_Payment_Token_' . $token_result['type'];
if ( class_exists( $token_class ) ) {
$meta = array();
$meta_rows = $wpdb->get_results( $wpdb->prepare(
"SELECT meta_key,meta_value FROM {$wpdb->prefix}woocommerce_payment_token_meta WHERE token_id = %d",
$token_id
) );
if ( ! empty( $meta_rows ) ) {
foreach( $meta_rows as $meta_row ) {
$meta[ $meta_row->meta_key ] = $meta_row->meta_value;
$meta = get_metadata( 'payment_token', $token_id );
$passed_meta = array();
if ( ! empty( $meta ) ) {
foreach( $meta as $meta_key => $meta_value ) {
$passed_meta[ $meta_key ] = $meta_value[0];
}
}
return new $token_class( $token_id, $token_result, $meta );
return new $token_class( $token_id, $token_result, $passed_meta );
}
}