WordPress.org
Get WordPress

Plugin Directory

Changeset 2388789


Ignore:
Timestamp:
09/26/2020 10:14:09 AM (6 years ago)
Author:
webinnane
Message:

fixed various issues

Location:
lifeline-donation/trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • lifeline-donation/trunk/lifeline-donation.php

    r2388230 r2388789  
    3232 */
    3333function lifeline_donation_init() {
    34     delete_transient( 'webinane_commerce_db_upgrade_status' );
    3534    require_once LIFELINE_DONATION_PATH . 'includes/load.php';
    3635
    … …  
    5150        }
    5251        WebinaneCommerce\Admin\Install::init();
     52
     53        $settings = get_option('_wpcommerce_settings');
     54        if(! isset($settings['gateways'])) {
     55            $settings['base_country'] = ['country' => $settings['base_country'], 'state' => $settings['base_state']];
     56            $settings['gateways'] = array();
     57            $settings['gateways']['paypal_express_gateway'] = array(
     58                'paypal_title'  => $settings['paypal_title'],
     59                'paypal_description'    => $settings['paypal_description'],
     60                'paypal_email'  => $settings['paypal_email'],
     61                'paypal_api_username'   => $settings['paypal_api_username'],
     62                'paypal_api_signature'  => $settings['paypal_api_signature'],
     63            );
     64            $settings['gateways']['offline_gateway'] = array(
     65                'offline_payment_description'   => $settings['offline_payment_description'],
     66                'offline_payment_instruction'   => $settings['offline_payment_instruction'],
     67                'offline_payment_title' => $settings['offline_payment_title'],
     68            );
     69            $settings['gateways']['stripe_gateway'] = array(
     70                'stripe_description'    => array_get($settings, 'stripe_description'),
     71                'stripe_private_key'    => array_get($settings, 'stripe_private_key'),
     72                'stripe_publishable_key'    => array_get($settings, 'stripe_publishable_key'),
     73                'stripe_title'  => array_get( $settings, 'stripe_title'),
     74                'stripe_webhook_signing_secret' => array_get($settings, 'stripe_webhook_signing_secret'),
     75            );
     76           
     77            update_option('_wpcommerce_settings', $settings);
     78        }
     79
    5380    }
    5481);

  • lifeline-donation/trunk/templates/donation-templates/donation-page-2.php

    r2348397 r2388789  
    7171                        </div>
    7272                    <?php endif; ?>
    73                         <div class="donation-payment-cycle">
     73                        <div class="donation-payment-cycle" v-if="is_recurring()">
    7474                            <a href="#" @click.prevent="step = 1;recurring = true" :class="(recurring) ? 'active' : ''"><?php esc_html_e( 'Recurring', 'lifeline-donation' ); ?></a>
    7575                            <a href="#" @click.prevent="step = 1;recurring = false" :class="(!recurring) ? 'active' : ''"><?php esc_html_e( 'One Time', 'lifeline-donation' ); ?></a>

  • lifeline-donation/trunk/templates/donation-templates/donation-page-3.php

    r2348397 r2388789  
    7171                                <h2>New Offical Compaign Starts Today</h2>
    7272                            </div>
    73                             <div class="donation-payment-cycle">
     73                            <div class="donation-payment-cycle" v-if="is_recurring()">
    7474                                <a href="#" @click.prevent="step = 1;recurring = true" :class="(recurring) ? 'active' : ''"><?php esc_html_e( 'Recurring', 'lifeline-donation' ); ?></a>
    7575                                <a href="#" @click.prevent="step = 1;recurring = false" :class="(!recurring) ? 'active' : ''"><?php esc_html_e( 'One Time', 'lifeline-donation' ); ?></a>

  • lifeline-donation/trunk/templates/donation-templates/donation-page.php

    r2348397 r2388789  
    5656                        <div class="payment-box">
    5757
    58                             <ul class="frequency">
     58                            <ul class="frequency" v-if="is_recurring()">
    5959                                <li>
    6060                                    <a href="#" @click.prevent="step = 1;recurring = true" :class="(recurring) ? 'active' : ''"><?php esc_html_e( 'Recurring', 'lifeline-donation' ); ?></a>

  • lifeline-donation/trunk/templates/modal/modal.php

    r2348397 r2388789  
    6060                            <div class="payment-box">
    6161                                <?php if ($settings->get('donation_recurring_payments') === true) : ?>
    62                                     <ul class="frequency">
     62                                    <ul class="frequency" v-if="is_recurring()">
    6363                                        <li>
    6464                                            <a href="#" @click.prevent="step = 1;recurring = true" :class="(recurring) ? 'active' : ''"><?php esc_html_e('Recurring', 'lifeline-donation'); ?></a>

  • lifeline-donation/trunk/templates/modal/modal2.php

    r2362947 r2388789  
    1919                        <div class="donation-amount-box">
    2020                           
    21                             <div class="donation-payment-cycle">
     21                            <div class="donation-payment-cycle" v-if="is_recurring()">
    2222                                <a href="#" @click.prevent="step = 1;recurring = true" :class="(recurring) ? 'active' : ''"><?php esc_html_e('Recurring', 'lifeline-donation'); ?></a>
    2323                                <a href="#" @click.prevent="step = 1;recurring = false" :class="(!recurring) ? 'active' : ''"><?php esc_html_e('One Time', 'lifeline-donation'); ?></a>

  • lifeline-donation/trunk/templates/modal/modal3.php

    r2348397 r2388789  
    2323                        <h2 v-if="text" v-html="text"></h2>
    2424                    </div>
    25                     <div class="donation-payment-cycle" style="margin-bottom:20px">
     25                    <div class="donation-payment-cycle" style="margin-bottom:20px" v-if="is_recurring()">
    2626                        <a :class="(recurring) ? 'active' : ''" @click.prevent="step = 1;recurring = true" href="#"><?php esc_html_e('Recurring', 'lifeline-donation'); ?></a>
    27                         <a :class="(!recurring) ? 'active' : ''" @click.prevent="step = 1;recurring = false" href="#" title="">One Time</a>
     27                        <a :class="(!recurring) ? 'active' : ''" @click.prevent="step = 1;recurring = false" href="#" title=""><?php esc_html__('One Time', 'lifeline-donation'); ?></a>
    2828                    </div>
    2929                    <?php include LIFELINE_DONATION_PATH . 'templates/donation-modal/recurring_fields.php' ?>

  • lifeline-donation/trunk/webinane-commerce/includes/Admin/Settings.php

    r2388230 r2388789  
    8383     */
    8484    static function admin_custom_css() {
    85         $version = (defined('WP_DEBUG') && WP_DEBUG ) ? time() : WPCM_VERSION;
     85        $version = (defined('WP_DEBUG') && WP_DEBUG ) ? time() : time();
    8686        wp_enqueue_editor();
    8787        wp_enqueue_media();

  • lifeline-donation/trunk/webinane-commerce/includes/Gateways/GatewayPaypal.php

    r2388230 r2388789  
    171171     */
    172172    function is_active() {
    173         $status = array_get(wpcm_get_settings()->get('gateways'), 'paypal_express_gateway.status');
     173        $status = wpcm_get_settings()->get('paypal_express_gateway');
    174174
    175175        if( ! $status ) {
Note: See TracChangeset for help on using the changeset viewer.