WordPress.org
Get WordPress

Plugin Directory

Changeset 2360717


Ignore:
Timestamp:
08/14/2020 03:50:25 AM (6 years ago)
Author:
zikubd
Message:

Release version 1.6.3

Location:
erp
Files:
2237 added
7 edited

Legend:

Unmodified
Added
Removed

  • erp/trunk/includes/admin/class-ajax.php

    r2224700 r2360717  
    267267        $password       = isset( $_REQUEST['password'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['password'] ) ) : '';
    268268
    269         global $phpmailer;
    270 
    271         if ( ! is_object( $phpmailer ) || ! is_a( $phpmailer, 'PHPMailer' ) ) {
    272             require_once ABSPATH . WPINC . '/class-phpmailer.php';
    273             require_once ABSPATH . WPINC . '/class-smtp.php';
    274             $phpmailer = new \PHPMailer( true );
     269        global $phpmailer, $wp_version;
     270
     271        // (Re)create it, if it's gone missing.
     272        if ( version_compare( $wp_version,'5.5' ) >= 0 ) {
     273            if ( ! ( $phpmailer instanceof \PHPMailer\PHPMailer\PHPMailer ) ) {
     274                require_once ABSPATH . WPINC . '/PHPMailer/PHPMailer.php';
     275                require_once ABSPATH . WPINC . '/PHPMailer/SMTP.php';
     276                require_once ABSPATH . WPINC . '/PHPMailer/Exception.php';
     277                $phpmailer = new \PHPMailer\PHPMailer\PHPMailer( true );
     278            }
     279        }
     280        else {
     281            if ( ! ( $phpmailer instanceof PHPMailer ) ) {
     282                require_once ABSPATH . WPINC . '/class-phpmailer.php';
     283                require_once ABSPATH . WPINC . '/class-smtp.php';
     284                $phpmailer = new \PHPMailer( true );
     285            }
    275286        }
    276287

  • erp/trunk/includes/class-install.php

    r2316399 r2360717  
    985985                `trn_date` date DEFAULT NULL,
    986986                `amount` decimal(20,2) DEFAULT 0,
     987                `transaction_charge` decimal(20,2) DEFAULT 0,
    987988                `ref` varchar(255) DEFAULT NULL,
    988989                `particulars` varchar(255) DEFAULT NULL,

  • erp/trunk/includes/class-updates.php

    r2316399 r2360717  
    5050        '1.5.16'  => 'updates/update-1.5.16.php',
    5151        '1.6.0' => 'updates/update-1.6.0.php',
     52        '1.6.3' => 'updates/update-1.6.3.php',
    5253    ];
    5354

  • erp/trunk/includes/functions.php

    r2345364 r2360717  
    20602060function erp_mail_send_via_gmail( $to, $subject, $message, $headers = '', $attachments = [], $custom_headers = [] ) {
    20612061
    2062     global $phpmailer;
    2063 
    2064     // (Re)create it, if it's gone missing
    2065     if ( ! ( $phpmailer instanceof PHPMailer ) ) {
    2066         require_once ABSPATH . WPINC . '/class-phpmailer.php';
    2067         require_once ABSPATH . WPINC . '/class-smtp.php';
    2068         $phpmailer = new PHPMailer( true );
     2062    global $phpmailer, $wp_version;
     2063
     2064    // (Re)create it, if it's gone missing.
     2065    if ( version_compare( $wp_version,'5.5' ) >= 0 ) {
     2066        if ( ! ( $phpmailer instanceof \PHPMailer\PHPMailer\PHPMailer ) ) {
     2067            require_once ABSPATH . WPINC . '/PHPMailer/PHPMailer.php';
     2068            require_once ABSPATH . WPINC . '/PHPMailer/SMTP.php';
     2069            require_once ABSPATH . WPINC . '/PHPMailer/Exception.php';
     2070            $phpmailer = new \PHPMailer\PHPMailer\PHPMailer( true );
     2071        }
     2072    }
     2073    else {
     2074        if ( ! ( $phpmailer instanceof PHPMailer ) ) {
     2075            require_once ABSPATH . WPINC . '/class-phpmailer.php';
     2076            require_once ABSPATH . WPINC . '/class-smtp.php';
     2077            $phpmailer = new \PHPMailer( true );
     2078        }
    20692079    }
    20702080

  • erp/trunk/modules/crm/includes/functions-customer.php

    r2332856 r2360717  
    191191
    192192    $counts = wp_parse_args( $counts, [
    193         'customer'    => 0,
    194         'lead'        => 0,
    195         'opportunity' => 0,
    196         'subscriber'  => 0
     193        'customer'    => 1,
     194        'lead'        => 1,
     195        'opportunity' => 1,
     196        'subscriber'  => 1
    197197    ] );
    198198

  • erp/trunk/readme.txt

    r2345364 r2360717  
    44Tags: business manager, erp, accounting, crm, hr, project manager, small business, SME, contact, contacts, Customer Relationship Management, employee, leave management, hr, human resource management, job, jobs, job listing, lead management, opportunity, schedule, task, lead, holiday, company
    55Requires at least: 4.4
    6 Tested up to: 5.4.2
     6Tested up to: 5.5
    77Requires PHP: 5.6
    8 Stable tag: 1.6.2
     8Stable tag: 1.6.3
    99License: GPLv2
    1010License: GPLv2 or later
    … …  
    267267
    268268== Changelog ==
     269
     270= v1.6.3 -> August 13, 2020 =
     271--------------------------
     272- [enhancement] Support both old PHPMailer v5 (WordPress <=5.4) and PHPMailer v6 (WordPress >=5.5)
     273- [new] Added Bank Transaction Charge on Accounting Module
     274- [fix] Fixed life stage display issue when translating
    269275
    270276= v1.6.2 -> July 23, 2020 =

  • erp/trunk/wp-erp.php

    r2345364 r2360717  
    66 * Author: weDevs
    77 * Author URI: https://wedevs.com
    8  * Version: 1.6.2
     8 * Version: 1.6.3
    99 * License: GPL2
    1010 * Text Domain: erp
    … …  
    5353     * @var string
    5454     */
    55     public $version = '1.6.2';
     55    public $version = '1.6.3';
    5656
    5757    /**
Note: See TracChangeset for help on using the changeset viewer.