Skip to content

W
woocommerce-quick-donation
Commit 66e602ec authored by Varun Sridharan's avatar Varun Sridharan
Browse files
Options

changes by varun 

* Added Plugin Template versioning #26
* Fixed Template Load Issue
* Renamed WC_TEMPLATE To WC_CORE_TEMPLATE
* Added New WC_QD_THEME_TEMPLATE
parent 4355de06
Hide whitespace changes
Inline Side-by-side
Showing with 209 additions and 131 deletions
includes/admin/class-admin-functions.php
View file @ 66e602ec
......@@ -18,11 +18,53 @@ if ( ! defined( 'WPINC' ) ) { die; }
class WooCommerce_Quick_Donation_Admin_Function {
public function __construct(){
$this->check_template_files();
add_action( 'post_row_actions', array($this,'protect_donation_product'),99,2);
add_action( 'parse_query', array( $this, 'hide_donation_order_woocommerce_order' ) );
add_filter( 'wc_order_types',array($this,'add_wc_order_types'),99,2);
}
public function check_template_files(){
$template_files = WC_Admin_Status::scan_template_files( WC_QD_TEMPLATE );
$outdated = false;
if(is_array($template_files)){
foreach($template_files as $file){
$theme_file = false;
if ( file_exists( get_stylesheet_directory() . '/' . $file ) ) {
$theme_file = get_stylesheet_directory() . '/' . $file;
} elseif ( file_exists( get_stylesheet_directory() . WC_QD_THEME_TEMPLATE . $file ) ) {
$theme_file = get_stylesheet_directory() . WC_QD_THEME_TEMPLATE . $file;
} elseif ( file_exists( get_template_directory() . '/' . $file ) ) {
$theme_file = get_template_directory() . '/' . $file;
} elseif( file_exists( get_template_directory() . WC_QD_THEME_TEMPLATE . $file ) ) {
$theme_file = get_template_directory() . WC_QD_THEME_TEMPLATE . $file;
}
if ( $theme_file !== false ) {
$core_version = WC_Admin_Status::get_file_version(WC_QD_TEMPLATE.$file);
$theme_version = WC_Admin_Status::get_file_version( $theme_file );
if ( $core_version && $theme_version && version_compare( $theme_version, $core_version, '<' ) ) {
$outdated = true;
break;
}
}
}
if ( $outdated ) {
$theme = wp_get_theme();
$message = sprintf( __( '<strong>Your theme (%s) contains outdated copies of some WooCommerce Quick Donation template files.</strong> These files may need updating to ensure they are compatible with the current version of WooCommerce Quick Donation. You can see which files are affected from the %ssystem status page%s. If in doubt, check with the author of the theme.', 'woocommerce' ), esc_html( $theme['Name'] ), '<a href="' . esc_url( admin_url( 'admin.php?page=wc-status' ) ) . '">', '</a>' );
wc_qd_notice($message,'error');
}
}
}
public function hide_donation_order_woocommerce_order($query) {
global $pagenow,$post_type;
$query = $query;
......
includes/admin/settings/validate-general.php
View file @ 66e602ec
......@@ -3,5 +3,4 @@ global $send_fields;
if (empty($send_fields[WC_QD_DB.'payment_gateway'])) {
add_settings_error(WC_QD_DB.'payment_gateway','', __( 'Error: Please Select Atlest 1 Payment Gateway.', WC_QD_TXT ),'error');
}
?>
\ No newline at end of file
?>
\ No newline at end of file
includes/class-quick-donation-functions.php
View file @ 66e602ec
......@@ -150,9 +150,14 @@ class WooCommerce_Quick_Donation_Functions {
foreach($custom_attributes as $attr_key => $attr_val) {
$attributes .= $attr_key.'="'.$attr_val.'" ';
}
$this->load_template('field-'.$type.'.php', WC_QD_TEMPLATE.'fields/' );
$field_output = $this->load_template('field-'.$type.'.php', WC_QD_TEMPLATE.'fields/' , array('id' => $id,
'name' => $name,
'class' => $class,
'field_output' => $field_output,
'is_grouped' => $is_grouped,
'project_list' => $project_list,
'attributes' => $attributes));
return $field_output;
}
......@@ -165,27 +170,37 @@ class WooCommerce_Quick_Donation_Functions {
$class = apply_filters('wcqd_project_price_text_class',array(),'text');
$custom_attributes = apply_filters('wcqd_project_price_text_attribute',array(),'text');
$value = '';
$class = implode(' ',$class);
$attributes = '';
foreach($custom_attributes as $attr_key => $attr_val) {
$attributes .= $attr_key.'="'.$attr_val.'" ';
}
$this->load_template('field-text.php',WC_QD_TEMPLATE . 'fields/' );
$field_output = $this->load_template('field-text.php',WC_QD_TEMPLATE . 'fields/' ,array('id' => $id,
'name' => $name,
'class' => $class,
'field_output' => $field_output,
'attributes' => $attributes,
'value' => $value));
return $field_output;
}
public function load_template($file,$path){
public function load_template($file,$path,$args = array()){
$field_output = '';
$wc_get_template = function_exists('wc_get_template') ? 'wc_get_template' : 'woocommerce_get_template';
$wc_get_template( $file,array(), '', $path);
ob_start();
$wc_get_template( $file,$args, '', $path);
$field_output = ob_get_clean();
ob_flush();
return $field_output;
}
public function locate_template($template){
$default_path = WC_QD_TEMPLATE;
$template_path = WC_TEMPLATE.'donation/';
$template_path = WC_CORE_TEMPLATE.'donation/';
$template = $template;
$locate = wc_locate_template($template,$template_path, $default_path);
return $locate;
......
includes/class-shortcode-handler.php
View file @ 66e602ec
......@@ -41,12 +41,14 @@ class WooCommerce_Quick_Donation_Shortcode {
$messages .= ob_get_clean();
ob_flush();
}
ob_start();
// ob_start();
do_action('wc_quick_donation_before_doantion_form',$return_value , $settings['type'],$settings['grouped']);
WC_QD()->f()->load_template('donation-form.php',WC_QD_TEMPLATE);
$messages .= WC_QD()->f()->load_template('donation-form.php',WC_QD_TEMPLATE,array('donation_box' => $donation_box,
'donation_price' => $donation_price,
'currency' => $currency));
do_action('wc_quick_donation_after_doantion_form',$return_value , $settings['type'],$settings['grouped']);
$messages .= ob_get_clean();
//$messages .= ob_get_clean();
return $messages;
}
......
template/cart/donation-cart-item-data.php
View file @ 66e602ec
<?php
/**
* Cart item data (when outputting non-flat)
*
* @author WooThemes
* @package WooCommerce/Templates
* @version 2.4.0
*
* @author Varun Sridharan
* @package WooCommerce Quick Donation/Templates/cart
* @version 0.1
*/
if ( ! defined( 'ABSPATH' ) ) {
exit;
......
template/cart/donation-cart-shipping.php
View file @ 66e602ec
<?php
/**
* Shipping Methods Display
* Shipping Methods Display
*
* In 2.1 we show methods per package. This allows for multiple methods per order if so desired.
*
* @author WooThemes
* @package WooCommerce/Templates
* @version 2.3.0
* @author Varun Sridharan
* @package WooCommerce Quick Donation/Templates/cart
* @version 0.1
*/
if ( ! defined( 'ABSPATH' ) ) {
......
template/cart/donation-cart-totals.php
View file @ 66e602ec
......@@ -2,9 +2,9 @@
/**
* Cart totals
*
* @author WooThemes
* @package WooCommerce/Templates
* @version 2.3.6
* @author Varun Sridharan
* @package WooCommerce Quick Donation/Templates/cart
* @version 0.1
*/
if ( ! defined( 'ABSPATH' ) ) {
......
template/cart/donation-cart.php
View file @ 66e602ec
<?php
/**
* Cart Page
* Donation Cart Template
*
* @author WooThemes
* @package WooCommerce/Templates
* @version 2.3.8
* @author Varun Sridharan
* @package WooCommerce Quick Donation/Templates/cart
* @version 0.1
*/
if ( ! defined( 'ABSPATH' ) ) {
......
template/cart/donation-proceed-to-checkout-button.php
View file @ 66e602ec
......@@ -4,9 +4,9 @@
*
* Contains the markup for the proceed to checkout button on the cart
*
* @author WooThemes
* @package WooCommerce/Templates
* @version 2.4.0
* @author Varun Sridharan
* @package WooCommerce Quick Donation/Templates/cart
* @version 0.1
*/
if ( ! defined( 'ABSPATH' ) ) {
......
template/checkout/donation-cart-errors.php
View file @ 66e602ec
......@@ -2,9 +2,9 @@
/**
* Cart errors page
*
* @author WooThemes
* @package WooCommerce/Templates
* @version 2.4.0
* @author Varun Sridharan
* @package WooCommerce Quick Donation/Templates/checkout
* @version 0.1
*/
if ( ! defined( 'ABSPATH' ) ) {
......
template/checkout/donation-form-billing.php
View file @ 66e602ec
......@@ -2,9 +2,9 @@
/**
* Checkout billing information form
*
* @author WooThemes
* @package WooCommerce/Templates
* @version 2.1.2
* @author Varun Sridharan
* @package WooCommerce Quick Donation/Templates/checkout
* @version 0.1
*/
if ( ! defined( 'ABSPATH' ) ) {
......
template/checkout/donation-form-checkout.php
View file @ 66e602ec
......@@ -2,9 +2,9 @@
/**
* Checkout Form
*
* @author WooThemes
* @package WooCommerce/Templates
* @version 2.3.0
* @author Varun Sridharan
* @package WooCommerce Quick Donation/Templates/checkout
* @version 0.1
*/
if ( ! defined( 'ABSPATH' ) ) {
......
template/checkout/donation-form-coupon.php
View file @ 66e602ec
......@@ -2,9 +2,9 @@
/**
* Checkout coupon form
*
* @author WooThemes
* @package WooCommerce/Templates
* @version 2.2
* @author Varun Sridharan
* @package WooCommerce Quick Donation/Templates/checkout
* @version 0.1
*/
if ( ! defined( 'ABSPATH' ) ) {
......
template/checkout/donation-form-login.php
View file @ 66e602ec
......@@ -2,9 +2,9 @@
/**
* Checkout login form
*
* @author WooThemes
* @package WooCommerce/Templates
* @version 2.0.0
* @author Varun Sridharan
* @package WooCommerce Quick Donation/Templates/checkout
* @version 0.1
*/
if ( ! defined( 'ABSPATH' ) ) {
......
template/checkout/donation-form-pay.php
View file @ 66e602ec
......@@ -2,9 +2,9 @@
/**
* Pay for order form
*
* @author WooThemes
* @package WooCommerce/Templates
* @version 1.6.4
* @author Varun Sridharan
* @package WooCommerce Quick Donation/Templates/checkout
* @version 0.1
*/
if ( ! defined( 'ABSPATH' ) ) {
......
template/checkout/donation-form-shipping.php
View file @ 66e602ec
......@@ -2,9 +2,9 @@
/**
* Checkout shipping information form
*
* @author WooThemes
* @package WooCommerce/Templates
* @version 2.2.0
* @author Varun Sridharan
* @package WooCommerce Quick Donation/Templates/checkout
* @version 0.1
*/
if ( ! defined( 'ABSPATH' ) ) {
......
template/checkout/donation-payment-method.php
View file @ 66e602ec
......@@ -2,9 +2,9 @@
/**
* Output a single payment method
*
* @author WooThemes
* @package WooCommerce/Templates
* @version 2.3.0
* @author Varun Sridharan
* @package WooCommerce Quick Donation/Templates/checkout
* @version 0.1
*/
if ( ! defined( 'ABSPATH' ) ) {
......
template/checkout/donation-payment.php
View file @ 66e602ec
......@@ -2,9 +2,9 @@
/**
* Checkout Payment Section
*
* @author WooThemes
* @package WooCommerce/Templates
* @version 2.3.0
* @author Varun Sridharan
* @package WooCommerce Quick Donation/Templates/checkout
* @version 0.1
*/
if ( ! defined( 'ABSPATH' ) ) {
......
template/checkout/donation-review-order.php
View file @ 66e602ec
......@@ -2,9 +2,9 @@
/**
* Review order table
*
* @author WooThemes
* @package WooCommerce/Templates
* @version 2.3.0
* @author Varun Sridharan
* @package WooCommerce Quick Donation/Templates/checkout
* @version 0.1
*/
if ( ! defined( 'ABSPATH' ) ) {
......
template/checkout/donation-thankyou.php
View file @ 66e602ec
......@@ -2,11 +2,10 @@
/**
* Thankyou page
*
* @author WooThemes
* @package WooCommerce/Templates
* @version 2.2.0
* @author Varun Sridharan
* @package WooCommerce Quick Donation/Templates/checkout
* @version 0.1
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
......
template/emails/donation-customer-invoice.php
View file @ 66e602ec
......@@ -2,9 +2,9 @@
/**
* Customer invoice email
*
* @author WooThemes
* @package WooCommerce/Templates/Emails
* @version 2.4.0
* @author Varun Sridharan
* @package WooCommerce Quick Donation/Templates/emails
* @version 0.1
*/
if ( ! defined( 'ABSPATH' ) ) {
......
template/emails/plain/donation-customer-invoice.php
View file @ 66e602ec
......@@ -2,9 +2,9 @@
/**
* Customer invoice email (plain text)
*
* @author WooThemes
* @package WooCommerce/Templates/Emails/Plain
* @version 2.2.0
* @author Varun Sridharan
* @package WooCommerce Quick Donation/Templates/emails/plain
* @version 0.1
*/
if ( ! defined( 'ABSPATH' ) ) {
......
template/fields/field-radio.php
View file @ 66e602ec
<?php
global $id, $name, $class, $field_output, $is_grouped, $project_list,$attributes;
/**
* HTML Radio Field Template
*
* @author Varun Sridharan
* @package WooCommerce Quick Donation/Templates/fields
* @version 0.1
*/
foreach($project_list as $id => $val){
......@@ -14,3 +20,5 @@ foreach($project_list as $id => $val){
}
}
echo $field_output;
?>
\ No newline at end of file
template/fields/field-select.php
View file @ 66e602ec
<?php
global $id, $name, $class, $field_output, $is_grouped, $project_list,$attributes;
$field_output = '<select id="'.$id.'" name="'.$name.'" class="'.$class.'" '.$attributes.'>';
/**
* HTML Select Field Template
*
* @author Varun Sridharan
* @package WooCommerce Quick Donation/Templates/fields
* @version 0.1
*/
?>
<select id="<?php echo $id; ?>" name="<?php echo $name; ?>" class="<?php echo $class.' '.$attributes;?>">
<?php
foreach($project_list as $id => $val){
if(is_array($val)){
......@@ -16,4 +23,6 @@ foreach($project_list as $id => $val){
}
}
$field_output .= '</select>';
\ No newline at end of file
echo $field_output;
?>
</select>
\ No newline at end of file
template/fields/field-text.php
View file @ 66e602ec
<?php
global $id, $name, $class, $field_output,$attributes,$value;
$field_output = '<input type="text" id="'.$id.'" name="'.$name.'" class="'.$class.'" '.$attributes.' value="'.$value.'" />';
?>
\ No newline at end of file
/**
* HTML Text Field Template
*
* @author Varun Sridharan
* @package WooCommerce Quick Donation/Templates/fields
* @version 0.1
*/
?>
<input
type="text"
id="<?php echo $id; ?>"
name="<?php echo $name; ?>"
class="<?php echo $class.' '.$attributes; ?>"
value="<?php echo $value; ?>" />
\ No newline at end of file
template/myaccount/my-donations.php
View file @ 66e602ec
<?php
/**
* My Orders
* My Donaions
*
* Shows recent orders on the account page
* Shows recent donaions on the account page
*
* @author WooThemes
* @package WooCommerce/Templates
* @version 2.3.10
* @author Varun Sridharan
* @package WooCommerce Quick Donation/Templates/myaccount
* @version 0.1
*/
if ( ! defined( 'ABSPATH' ) ) {
......
template/myaccount/view-donation.php
View file @ 66e602ec
<?php
/**
* View Order
* View Donation
*
* Shows the details of a particular order on the account page
*
* @author WooThemes
* @package WooCommerce/Templates
* @version 2.2.0
* @author Varun Sridharan
* @package WooCommerce Quick Donation/Templates/myaccount
* @version 0.1
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
}
......
template/order/donation-order-details.php
View file @ 66e602ec
<?php
/**
* Order details
*
* @author WooThemes
* @package WooCommerce/Templates
* @version 2.4.0
* Donation Details
*
* @author Varun Sridharan
* @package WooCommerce Quick Donation/Templates/order
* @version 0.1
*/
if ( ! defined( 'ABSPATH' ) ) {
......@@ -51,4 +51,4 @@ $order = wc_get_order( $order_id );
<?php do_action( 'woocommerce_order_details_after_order_table', $order ); ?>
<?php wc_get_template( 'order/order-details-customer.php', array( 'order' => $order ) ); ?>
<?php wc_get_template( 'order/order-details-customer.php', array( 'order' => $order ) ); ?>
\ No newline at end of file
template/order/form-tracking.php
View file @ 66e602ec
<?php
/**
* Order tracking form
*
* @author WooThemes
* @package WooCommerce/Templates
* @version 1.6.4
* Donation Tracking
*
* @author Varun Sridharan
* @package WooCommerce Quick Donation/Templates/order
* @version 0.1
*/
if ( ! defined( 'ABSPATH' ) ) {
......@@ -26,4 +26,4 @@ global $post;
<p class="form-row"><input type="submit" class="button" name="track" value="<?php esc_attr_e( 'Track', 'woocommerce' ); ?>" /></p>
<?php wp_nonce_field( 'woocommerce-order_tracking' ); ?>
</form>
</form>
\ No newline at end of file
template/order/order-again.php
View file @ 66e602ec
<?php
/**
* Order again button
*
* @author WooThemes
* @package WooCommerce/Templates
* @version 2.3.0
* Donate Again
*
* @author Varun Sridharan
* @package WooCommerce Quick Donation/Templates/order
* @version 0.1
*/
if ( ! defined( 'ABSPATH' ) ) {
......
template/order/order-details-customer.php
View file @ 66e602ec
<?php
/**
* Order Customer Details
*
* @author WooThemes
* @package WooCommerce/Templates
* @version 2.4.0
* Donor Details
*
* @author Varun Sridharan
* @package WooCommerce Quick Donation/Templates/order
* @version 0.1
*/
if ( ! defined( 'ABSPATH' ) ) {
......
template/order/order-details-item.php
View file @ 66e602ec
<?php
/**
* Order Item Details
*
* @author WooThemes
* @package WooCommerce/Templates
* @version 2.4.0
* Donation Item Details
*
* @author Varun Sridharan
* @package WooCommerce Quick Donation/Templates/order
* @version 0.1
*/
if ( ! defined( 'ABSPATH' ) ) {
......@@ -18,8 +18,6 @@ if ( ! defined( 'ABSPATH' ) ) {
$is_visible = $product && $product->is_visible();
$project_id = WC_QD()->db()->get_project_id($order->id);
echo sprintf( '<a href="%s">%s</a>', get_permalink( $project_id ), get_the_title($project_id ));
?>
</td>
<td class="product-total">
......
template/order/tracking.php
View file @ 66e602ec
<?php
/**
* Order tracking
*
* @author WooThemes
* @package WooCommerce/Templates
* @version 2.2.0
* Donation tracking
*
* @author Varun Sridharan
* @package WooCommerce Quick Donation/Templates/order
* @version 0.1
*/
if ( ! defined( 'ABSPATH' ) ) {
......
woocommerce-quick-donation.php
View file @ 66e602ec
......@@ -226,7 +226,8 @@ class WooCommerce_Quick_Donation {
$this->define('WC_QD_CSS',WC_QD_URL.'/includes/css/');
$this->define('WC_QD_TEMPLATE',WC_QD_PATH.'template/'); # Plugin Template DIR
$this->define('WC_TEMPLATE','woocommerce/');
$this->define('WC_CORE_TEMPLATE','woocommerce/');
$this->define('WC_QD_THEME_TEMPLATE','/'.WC_CORE_TEMPLATE.'donation/');
$this->define('WC_QD_LANG',WC_QD_PATH.'languages');
$this->define('WC_QD_TXT','woocommerce-quick-donation'); #plugin lang Domain
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment