Skip to content

Commit

Permalink
Merge pull request #42 from WordImpress/release/1.7
Browse files Browse the repository at this point in the history 
Merge updates
  • Loading branch information
@ramiy
ramiy authored Oct 13, 2016
2 parents 186222f + 458e83b commit 8988228
Show file tree
Hide file tree
Showing 9 changed files with 915 additions and 920 deletions.
1,778 changes: 884 additions & 894 deletions assets/js/admin/admin-scripts.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/admin/admin-scripts.min.js
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions includes/admin/class-admin-notices.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,16 +86,16 @@ public function show_notices() {
if ( current_user_can( 'view_give_reports' ) ) {
switch ( $_GET['give-message'] ) {
case 'donation_deleted' :
$notices['updated']['give-payment-deleted'] = esc_attr__( 'The donation has been deleted.', 'give' );
$notices['updated']['give-donation-deleted'] = esc_attr__( 'The donation has been deleted.', 'give' );
break;
case 'email_sent' :
$notices['updated']['give-payment-sent'] = esc_attr__( 'The donation receipt has been resent.', 'give' );
break;
case 'refreshed-reports' :
$notices['updated']['give-refreshed-reports'] = esc_attr__( 'The reports cache has been cleared.', 'give' );
break;
case 'payment-note-deleted' :
$notices['updated']['give-payment-note-deleted'] = esc_attr__( 'The donation note has been deleted.', 'give' );
case 'donation-note-deleted' :
$notices['updated']['give-donation-note-deleted'] = esc_attr__( 'The donation note has been deleted.', 'give' );
break;
}
}
Expand Down
10 changes: 5 additions & 5 deletions includes/admin/payments/actions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ function give_ajax_store_payment_note() {
add_action( 'wp_ajax_give_insert_payment_note', 'give_ajax_store_payment_note' );

/**
* Triggers a payment note deletion without ajax
* Triggers a donation note deletion without ajax
*
* @since 1.0
*
Expand All @@ -359,22 +359,22 @@ function give_ajax_store_payment_note() {
*/
function give_trigger_payment_note_deletion( $data ) {

if ( ! wp_verify_nonce( $data['_wpnonce'], 'give_delete_payment_note_' . $data['note_id'] ) ) {
if ( ! wp_verify_nonce( $data['_wpnonce'], 'give_delete_donation_note_' . $data['note_id'] ) ) {
return;
}

if ( ! current_user_can( 'edit_give_payments', $data['payment_id'] ) ) {
wp_die( esc_html__( 'You do not have permission to edit payments.', 'give' ), esc_html__( 'Error', 'give' ), array( 'response' => 403 ) );
}

$edit_order_url = admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&view=view-order-details&give-message=payment-note-deleted&id=' . absint( $data['payment_id'] ) );
$edit_order_url = admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&view=view-order-details&give-message=donation-note-deleted&id=' . absint( $data['payment_id'] ) );

give_delete_payment_note( $data['note_id'], $data['payment_id'] );

wp_redirect( $edit_order_url );
}

add_action( 'give_delete_payment_note', 'give_trigger_payment_note_deletion' );
add_action( 'give_delete_donation_note', 'give_trigger_payment_note_deletion' );

/**
* Delete a payment note deletion with ajax
Expand All @@ -397,4 +397,4 @@ function give_ajax_delete_payment_note() {

}

add_action( 'wp_ajax_give_delete_payment_note', 'give_ajax_delete_payment_note' );
add_action( 'wp_ajax_give_delete_donation_note', 'give_ajax_delete_payment_note' );
3 changes: 3 additions & 0 deletions includes/deprecated/deprecated-actions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ function give_deprecated_actions() {
'give_donation_mode_after_gateways' => 'give_payment_mode_after_gateways',
'give_donation_mode_after_gateways_wrap' => 'give_payment_mode_after_gateways_wrap',
'give_donation_mode_bottom' => 'give_payment_mode_bottom',
'give_delete_donation_note' => 'give_delete_payment_note',
'give_post_delete_donation_note' => 'give_post_delete_payment_note',
'give_pre_delete_donation_note' => 'give_pre_delete_payment_note',
'give_update_donation_status' => 'give_update_payment_status',
'give_update_donation_details' => 'give_update_payment_details',
'give_ajax_donation_errors' => 'give_ajax_checkout_errors',
Expand Down
8 changes: 4 additions & 4 deletions includes/payments/class-payment-stats.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,10 @@ public function get_sales( $form_id = 0, $start_date = false, $end_date = false,
* @since 1.0
* @access public
*
* @param $form_id int The donation form to retrieve stats for. If false, gets stats for all forms
* @param $start_date string|bool The starting date for which we'd like to filter our donation earnings stats. If false, we'll use the default start date of `this_month`
* @param $end_date string|bool The end date for which we'd like to filter our sale stats. If false, we'll use the default end date of `this_month`
* @param $gateway_id string|bool The gateway to get earnings for such as 'paypal' or 'stripe'
* @param $form_id int The donation form to retrieve stats for. If false, gets stats for all forms.
* @param $start_date string|bool The starting date for which we'd like to filter our donation earnings stats. If false, method will use the default start date of `this_month`.
* @param $end_date string|bool The end date for which we'd like to filter the donations stats. If false, method will use the default end date of `this_month`.
* @param $gateway_id string|bool The gateway to get earnings for such as 'paypal' or 'stripe'.
*
* @return float|int Total amount of donations based on the passed arguments.
*/
Expand Down
18 changes: 10 additions & 8 deletions includes/payments/functions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1527,26 +1527,26 @@ function give_delete_payment_note( $comment_id = 0, $payment_id = 0 ) {
}

/**
* Fires before deleting payment note.
* Fires before deleting donation note.
*
* @since 1.0
*
* @param int $comment_id Note ID.
* @param int $payment_id Payment ID.
*/
do_action( 'give_pre_delete_payment_note', $comment_id, $payment_id );
do_action( 'give_pre_delete_donation_note', $comment_id, $payment_id );

$ret = wp_delete_comment( $comment_id, true );

/**
* Fires after payment note deleted.
* Fires after donation note deleted.
*
* @since 1.0
*
* @param int $comment_id Note ID.
* @param int $payment_id Payment ID.
*/
do_action( 'give_post_delete_payment_note', $comment_id, $payment_id );
do_action( 'give_post_delete_donation_note', $comment_id, $payment_id );

return $ret;
}
Expand Down Expand Up @@ -1577,10 +1577,12 @@ function give_get_payment_note_html( $note, $payment_id = 0 ) {
$date_format = give_date_format() . ', ' . get_option( 'time_format' );

$delete_note_url = wp_nonce_url( add_query_arg( array(
'give-action' => 'delete_payment_note',
'note_id' => $note->comment_ID,
'payment_id' => $payment_id,
) ), 'give_delete_payment_note_' . $note->comment_ID );
'give-action' => 'delete_donation_note',
'note_id' => $note->comment_ID,
'payment_id' => $payment_id,
) ),
'give_delete_donation_note_' . $note->comment_ID
);

$note_html = '<div class="give-payment-note" id="give-payment-note-' . $note->comment_ID . '">';
$note_html .= '<p>';
Expand Down
2 changes: 1 addition & 1 deletion includes/scripts.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ function give_load_admin_scripts( $hook ) {
'decimal_separator' => $decimal_separator,
'quick_edit_warning' => esc_html__( 'Not available for variable priced forms.', 'give' ),
'delete_donation' => esc_html__( 'Are you sure you wish to delete this payment?', 'give' ),
'delete_payment_note' => esc_html__( 'Are you sure you wish to delete this note?', 'give' ),
'delete_donation_note' => esc_html__( 'Are you sure you wish to delete this note?', 'give' ),
'revoke_api_key' => esc_html__( 'Are you sure you wish to revoke this API key?', 'give' ),
'regenerate_api_key' => esc_html__( 'Are you sure you wish to regenerate this API key?', 'give' ),
'resend_receipt' => esc_html__( 'Are you sure you wish to resend the donation receipt?', 'give' ),
Expand Down
8 changes: 4 additions & 4 deletions templates/shortcode-profile-editor.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,22 +119,22 @@

<div id="give_profile_billing_address_wrap">

<p id="give-card-address-wrap" class="form-row form-row-two-thirds">
<p id="give-card-address-wrap" class="form-row form-row-first">
<label for="give_address_line1"><?php esc_html_e( 'Address 1', 'give' ); ?></label>
<input name="give_address_line1" id="give_address_line1" class="text give-input" type="text" value="<?php echo esc_attr( $address['line1'] ); ?>" />
</p>

<p id="give-card-address-2-wrap" class="form-row form-row-one-third">
<p id="give-card-address-2-wrap" class="form-row form-row-last">
<label for="give_address_line2"><?php esc_html_e( 'Address 2', 'give' ); ?></label>
<input name="give_address_line2" id="give_address_line2" class="text give-input" type="text" value="<?php echo esc_attr( $address['line2'] ); ?>" />
</p>

<p id="give-card-city-wrap" class="form-row form-row-two-thirds">
<p id="give-card-city-wrap" class="form-row form-row-first">
<label for="give_address_city"><?php esc_html_e( 'City', 'give' ); ?></label>
<input name="give_address_city" id="give_address_city" class="text give-input" type="text" value="<?php echo esc_attr( $address['city'] ); ?>" />
</p>

<p id="give-card-zip-wrap" class="form-row form-row-one-third">
<p id="give-card-zip-wrap" class="form-row form-row-last">
<label for="give_address_zip"><?php esc_html_e( 'Zip / Postal Code', 'give' ); ?></label>
<input name="give_address_zip" id="give_address_zip" class="text give-input" type="text" value="<?php echo esc_attr( $address['zip'] ); ?>" />
</p>
Expand Down

0 comments on commit 8988228

Please sign in to comment.