WordPress.org
Get WordPress

Plugin Directory

Changeset 2313911


Ignore:
Timestamp:
05/28/2020 05:13:12 PM (6 years ago)
Author:
jank404
Message:

v 1.1.6

Location:
apollo/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • apollo/trunk/apollo.php

    r2275758 r2313911  
    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.5
     6 * Version:           1.1.6
    77 * Author:            Studio404
    88 * Text Domain:       apollo
    99 * Domain Path:       /languages
    10  * WC tested up to:   4.0.1
     10 * WC tested up to:   4.1.1
    1111 * WC requires at least: 3.0
    1212 */
    … …  
    1414defined( 'ABSPATH' ) or exit;
    1515
    16 define( 'APOLLO_VERSION', '1.1.5' );
     16define( 'APOLLO_VERSION', '1.1.6' );
    1717
    1818function apollo_load_plugin() {
    … …  
    7070
    7171  // Only add attachment if new order, completed order or invoice mail
    72   if($status != 'customer_invoice' && $status != 'new_order'  && $status != 'customer_completed_order') {
     72  if($status != 'customer_invoice' && $status != 'new_order'  && $status != 'customer_completed_order' && $status != 'customer_on_hold_order') {
    7373    return;
    7474  }

  • apollo/trunk/includes/admin/invoice.php

    r2249467 r2313911  
    176176        }
    177177      }
     178     
     179      $paymentType = "online";
     180
     181      if($order->get_payment_method() === 'paypal')
     182      {
     183        $paymentType = 'paypal';
     184      } else if($order->get_payment_method() === 'bacs') {
     185        $paymentType = 'bank';
     186      }
    178187
    179188      // if this is invoice and payment type IS NOT 'Cash on delivery', mark invoice as paid
    180189      if ($type === 'invoice' && $order->get_payment_method() !== 'cod') {
    181190        $order_data['payments'] = array(array(
    182           "type" => "other",
     191          "type" => $paymentType,
    183192          "note" => $order->get_payment_method_title()
    184193        ));
    … …  
    188197
    189198      if(isset($create->error)) {
    190         return array("error" => "Apollo error (".$create->error->statusCode."): ".$create->error->text);
     199        return array("error" => "Apollo error (".$create->error->statusCode."): ".$create->error->message);
    191200      }
    192201

  • apollo/trunk/readme.txt

    r2275758 r2313911  
    55Requires PHP: 5.6.3
    66Stable tag: trunk
    7 Tested up to: 5.3.2
     7Tested up to: 5.4.1
    88
    99== Description ==
    … …  
    8585
    8686== Changelog ==
     87= 1.1.6 - May 28, 2020 =
     88
     89- Fixed: Estimate sending to user when new order is craeted
     90- Updated: Some payment types now match Apollo payment types
     91- Updated: Error logging
     92
    8793= 1.1.5 - April 4, 2020 =
    8894
    … …  
    9096- Updated: Invoices are now created when order is completed, only exceptin is Cash On Delivery payment, where invoice is created with new order (invoice is not marked as paid in this case)
    9197
    92 == Changelog ==
    9398= 1.1.4 - February 24, 2020 =
    9499

  • apollo/trunk/vendor/spaceinvoices/vendor/space-invoices/space-invoices-php/lib/ApiResource.php

    r2068795 r2313911  
    8787            $response->body->error->name = ApiResource::responseCodeName($code);
    8888            $response->body->error->text = ApiResource::responseCodeText($code);
     89            $response->body->error->message = $response->body->error->message;
    8990        }
    9091
Note: See TracChangeset for help on using the changeset viewer.