WordPress.org
Get WordPress

Plugin Directory

Changeset 2471891


Ignore:
Timestamp:
02/09/2021 08:08:09 PM (5 years ago)
Author:
jank404
Message:

revert last update

Location:
apollo/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • apollo/trunk/apollo.php

    r2470479 r2471891  
    44 * Plugin URI:        https://wordpress.org/plugins/apollo
    55 * Description:       Manually or automatically generate invoices and send PDFs as attachments for WooCommerce orders.
    6  * Version:           1.1.17
     6 * Version:           1.1.18
    77 * Author:            Studio404
    88 * Text Domain:       apollo
    … …  
    1414defined( 'ABSPATH' ) or exit;
    1515
    16 define( 'APOLLO_VERSION', '1.1.17' );
     16define( 'APOLLO_VERSION', '1.1.18' );
    1717
    1818function apollo_load_plugin() {
    … …  
    146146    update_post_meta( $order->get_id(), 'apollo_invoice_sent', true );
    147147
    148   } else if (!$invoice_id && ($order->get_payment_method() === 'paypal' || $order->get_payment_method() === 'stripe') && !$auto_invoice) {
    149     // if not auto sending still create the invoice in case paypal or stripe
    150     $invoice = Apollo_invoice::create($order->get_id(), 'invoice');
     148  // } else if (!$invoice_id && ($order->get_payment_method() === 'paypal' || $order->get_payment_method() === 'stripe') && !$auto_invoice) {
     149  //   // if not auto sending still create the invoice in case paypal or stripe
     150  //   $invoice = Apollo_invoice::create($order->get_id(), 'invoice');
    151151  }
    152152
    … …  
    185185  $auto_create_cod = (bool) get_option('apollo_general_settings')['apollo_cod-invoice'];
    186186
    187   $payment_method = $order->get_payment_method();
     187  // $payment_method = $order->get_payment_method();
    188188
    189189  $payment_type = 'apollo_payment-'.$order->get_payment_method();
    … …  
    192192  $order_paid = get_post_meta( $order->get_id(), '_date_paid', true);
    193193
    194   $email = new WC_Email_Customer_Completed_Order();
     194  // $email = new WC_Email_Customer_Completed_Order();
    195195
    196196  // If paid online and order completed email enabled then skip creating invoice
    197197  // as it will be created in attachment hook to prevent double issuing in case both
    198198  // hooks get processed at the same time
    199   if (($payment_method === 'paypal' || $payment_method === 'stripe') && $email->is_enabled()) {
    200     return;
    201   }
     199  // if (($payment_method === 'paypal' || $payment_method === 'stripe') && $email->is_enabled()) {
     200  //   return;
     201  // }
    202202
    203203  // create invoice for bank transfer orders, when order status is set to completed
    204   if(($payment_method === 'bacs') || ($payment_enabled && $order_paid !== '')) {
     204  if(($order->get_payment_method() === 'bacs') || ($payment_enabled && $order_paid !== '')) {
    205205    Apollo_invoice::create($order_id, 'invoice');
    206   } else if ($payment_method === 'cod' && $auto_create_cod) {
     206  } else if ($order->get_payment_method() === 'cod' && $auto_create_cod) {
    207207    Apollo_invoice::create($order_id, 'invoice');
    208208  }

  • apollo/trunk/readme.txt

    r2470479 r2471891  
    8585
    8686== Changelog ==
     87= 1.1.18 - February 9, 2021 =
     88
     89- Fixed: Bug fixes
     90
    8791= 1.1.17 - February 7, 2021 =
    8892
Note: See TracChangeset for help on using the changeset viewer.