Merge pull request #172

manual checkout dl link does not show in ty page

Author: Arsenal21

wp-express-checkout/admin/includes/class-orders-meta-boxes.php

@@ -10,6 +10,7 @@
 use WP_Express_Checkout\Products;
 use WP_Express_Checkout\Utils;
 use WP_Express_Checkout\Variations;
+use WP_Express_Checkout\Debug\Logger;
 use WP_Post;
 
 /**
@@ -36,6 +37,7 @@ public function __construct() {
 		add_action( 'wp_ajax_wpec_add_order_note', array( $this, 'wpec_add_order_note_callback' ) );
 		add_action( 'wp_ajax_wpec_delete_order_note', array( $this, 'wpec_delete_order_note_callback' ) );
 		add_action( 'wp_ajax_wpec_get_order_product_by_id', array( $this, 'wpec_get_order_product_by_id_callback' ) );
+		add_action( 'wp_ajax_wpec_order_action_set_paid_and_send_email', array( $this, 'set_paid_and_send_email_callback' ) );
 	}
 
 	public function add_meta_boxes() {
@@ -354,7 +356,7 @@ public function display_actions_meta_box( $post ){
 
 		try {
 			$order = Orders::retrieve( $post->ID );
-			$is_manual_payment = strpos($order->get_capture_id(), 'manual');
+			$is_manual_payment = strtolower($order->get_payment_gateway()) == 'manual_checkout' || stripos($order->get_capture_id(), 'manual') !== false;
 			$is_admin_checkout = strpos($order->get_capture_id(), 'admin');
 		} catch ( Exception $exc ) {
 			return;
@@ -377,7 +379,7 @@ public function display_actions_meta_box( $post ){
 					</span>
 				</a>
 			</li>
-            <?php if ($is_manual_payment === false && $is_admin_checkout === false) { // Don't show refund action button for manual payment or admin checkout?>
+            <?php if ( empty($is_manual_payment) && $is_admin_checkout === false) { // Don't show refund action button for manual payment or admin checkout?>
 			<li>
 				<?php if( $order->get_status()=="refunded" ){ ?>
 					<div class="wpec-grey-box">
@@ -395,6 +397,17 @@ public function display_actions_meta_box( $post ){
 				<?php } ?>
 			</li>
             <?php } ?>
+			
+			<?php if ( !empty($is_manual_payment) && strtolower($order->get_status()) == 'pending' ) { ?>
+			<li>
+				<a class="button wpec-order-action" data-action="set_paid_and_send_email" data-order="<?php echo $order->get_id() ?>" data-nonce="<?php echo wp_create_nonce( 'set_paid_and_send_email' ); ?>" href="#">
+					<span class="dashicons dashicons-yes-alt" style="line-height:1.8;font-size:16px;"></span>
+					<span class="wpec-order-action-label">
+						<?php esc_html_e( 'Set Order Paid & Send Email', 'wp-express-checkout' ); ?>
+					</span>
+				</a>
+			</li>
+			<?php } ?>
 		</ul>
 		<?php
 
@@ -651,6 +664,29 @@ public function payment_refund_callback()
 		wp_send_json_success( __( 'Order refunded successfully!', 'wp-express-checkout' ) );
 	}
 
+	public function set_paid_and_send_email_callback(){
+
+		check_ajax_referer( 'set_paid_and_send_email', 'nonce' );
+
+		try {
+			$order = Orders::retrieve( $_POST['order'] );
+
+		} catch ( Exception $exc ) {
+			wp_send_json_error( $exc->getMessage() );
+		}
+		
+		Logger::log( "Setting order status to 'paid'." );
+		$order->set_status('paid');
+
+		$response = Emails::send_buyer_email( $order );
+
+		if ( ! $response ) {
+			wp_send_json_error( __( 'Something went wrong, email is not sent!', 'wp-express-checkout' ) );
+		}
+
+		wp_send_json_success( __( 'Order has set to paid and buyer notification email sent successfully!', 'wp-express-checkout' ) );
+	}
+
 	public function wpec_add_order_note_callback()
 	{
 		check_ajax_referer( 'wpec_add_order_note_ajax_nonce', 'nonce' );

wp-express-checkout/assets/js/admin.js

@@ -136,6 +136,9 @@
 					if( button_action == 'payment_refund'){
 						console.log('Refund successful. Reloading the page.');
 						window.location.reload();
+					} else if (button_action == 'set_paid_and_send_email'){
+						console.log('Order has set to paid and sale notification email sent. Reloading the page.');
+						window.location.reload();
 					}
 				} )
 				.fail( function() {

wp-express-checkout/public/views/templates/content-thank-you.php

@@ -20,6 +20,9 @@
 $shipping_amount  = ! empty( $order->get_item( 'shipping' ) ) ? $order->get_item( 'shipping' )['price'] : 0;
 $downloads = View_Downloads::get_order_downloads_list( $order->get_id() );
 
+$order_status = $order->get_status();
+$payment_gateway = $order->get_payment_gateway();
+
 $trial_payment_discount = $order->get_item( 'trial_discount' );
 $trial_payment = $order->get_item( 'trial' );
 ?>
@@ -125,7 +128,14 @@
         </tbody>
     </table>
 
-	<?php if ( is_array( $downloads ) && ! empty( $downloads ) ) { ?>
+	<?php 
+    $is_manual_checkout = strtolower($payment_gateway) == 'manual_checkout' || stripos($order->get_capture_id(), 'manual') !== false;
+    $is_pending_manual_checkout = $is_manual_checkout && strtolower($order_status) == 'pending'; // Don't show digital download if its a manual checkout pending order. 
+
+    $show_downloads = apply_filters('wpec_show_downloads_on_thank_you_page', !$is_pending_manual_checkout, $order);
+
+    if ( !empty($show_downloads) && is_array( $downloads ) && ! empty( $downloads ) ) { 
+    ?>
         <h4><?php _e( "Downloads", "wp-express-checkout" ); ?></h4>
         <table class="wpec-order-downloads-table">
             <thead>

wp-express-checkout/readme.txt

@@ -175,6 +175,9 @@ https://wp-express-checkout.com/
 None
 
 == Changelog ==
+= WIP =
+* Digital download links now doesn't show in the thank you page for manual checkout pending order.
+* A new order action button added to set order status to paid and send sale notification email for manual checkout.
 
 = 2.4.6 =
 * Use of template shortcode param removed for 'wpec_show_all_products' and 'wpec_show_products_from_category' shortcode.