WordPress.org
Get WordPress

Plugin Directory

Changeset 3110855


Ignore:
Timestamp:
07/02/2024 06:07:55 AM (21 months ago)
Author:
bmsupport
Message:
  • Code improvements
Location:
window-blinds-solution/trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • window-blinds-solution/trunk/includes/admin/views/html-freemium-days-remaining-info.php

    r3109295 r3110855  
    88}
    99
    10 $saved_date_timestamp  = get_option('bmfm_plugin_saved_date_timestamp');
     10$saved_date_timestamp = BMFM_User_Request::get_freemium_activated_date();
    1111if($saved_date_timestamp):
    1212    $expiry_date_timestamp = strtotime('+30 days',$saved_date_timestamp);

  • window-blinds-solution/trunk/includes/admin/views/html-welcome-settings.php

    r3109295 r3110855  
    280280        <section></section>
    281281    </form>
    282     <?php if('freemium' == $curl_status):
     282    <?php
     283    if('freemium' == $curl_status):
    283284        include(BMFM_ABSPATH . '/includes/admin/views/html-freemium-days-remaining-info.php');
    284285    endif;?>

  • window-blinds-solution/trunk/includes/bmfm-core-functions.php

    r3109295 r3110855  
    26722672 */
    26732673function bmfm_is_freemium(){
    2674     return 'freemium' == get_option('bmfm_plugin_status');
    2675 }
     2674    return 'freemium' == BMFM_User_Request::get_status();
     2675}

  • window-blinds-solution/trunk/includes/class-bmfm-ajax.php

    r3109295 r3110855  
    19641964            $timestamp = time();
    19651965            if($post_id){
    1966                 $response = BMFM_User_Request::send_request(array('freemium_activated_date' => gmdate('Y-m-d H:i:s', $timestamp),'post_status' => 'freemium'), 'POST');
     1966                $response = BMFM_User_Request::send_request(array('freemium_activated_date' => gmdate('Y-m-d H:i:s', $timestamp),'post_status' => 'freemium','id' => $post_id), 'POST');
    19671967            }else{
    19681968                $response = BMFM_User_Request::send_request(array('plugin_activated_date' => gmdate('Y-m-d H:i:s', $timestamp),'freemium_activated_date' => gmdate('Y-m-d H:i:s', $timestamp),'post_status' => 'freemium'), 'POST');

  • window-blinds-solution/trunk/includes/class-bmfm-install.php

    r3109295 r3110855  
    121121     */
    122122    public static function upgrade_plugin_status(){
    123         $saved_date_timestamp = get_option('bmfm_plugin_saved_date_timestamp');
    124         $plugin_status        = get_option('bmfm_plugin_status');
    125         if($saved_date_timestamp && 'freemium' == $plugin_status){
     123        $saved_date_timestamp = BMFM_User_Request::get_freemium_activated_date();
     124        if($saved_date_timestamp && bmfm_is_freemium()){
    126125            $remaining_timestamp  = strtotime('+30 days',$saved_date_timestamp);
    127126            if (time() > $remaining_timestamp ) {
    … …  
    134133            }
    135134        }
    136 
    137         $response = BMFM_User_Request::send_request(array('url_info' => wp_unslash(site_url())), 'GET');
    138         if(!is_object($response) || !isset($response->post_data)){
    139             delete_option('bmfm_plugin_status');
    140             delete_option('bmfm_plugin_saved_date_timestamp');
    141             return;
    142         }
    143        
    144         if(empty($response->post_data->url_info) && wp_unslash(site_url()) != $response->post_data->url_info){
    145             delete_option('bmfm_plugin_status');
    146             delete_option('bmfm_plugin_saved_date_timestamp');
    147             return;
    148         }
    149135    }
    150 
    151136}
    152137

  • window-blinds-solution/trunk/readme.txt

    r3109295 r3110855  
    22Tags: BlindMatrix e-Commerce
    33Requires at least: 4.4
    4 Tested up to: 6.5.4
     4Tested up to: 6.5.5
    55Requires PHP: 7.4
    6 Stable tag: 2.2
     6Stable tag: 2.3
    77License: GPLv3
    88License URI: https://www.gnu.org/licenses/gpl-3.0.html
    … …  
    3434
    3535== Changelog ==
     36
     37= 2.3 =
     38
     39* Code improvements
    3640
    3741= 2.2 =

  • window-blinds-solution/trunk/vendor/Api/class-user-request.php

    r3109295 r3110855  
    99
    1010class BMFM_User_Request {
     11   
     12    /**
     13     * Plugin Status
     14     */
     15    protected static $plugin_status;
     16   
     17    /**
     18     * Freemium activated date
     19     */
     20    protected static $freemium_activated_date;
     21   
     22    /**
     23     * Response
     24     */
     25    protected static $_response;
    1126
    1227    public static function send_request( $extra_args = array(), $method = 'GET', $response = false) {
    … …  
    128143
    129144    public static function get_requested_post_id() {
    130         $response = self::send_request(array('url_info' => wp_unslash(site_url())), 'GET');
     145        $response = self::get_response();
    131146        $post_id = get_option('bm_requested_post_id'); // have to do the add_option()
    132147        if (is_object($response) && isset($response->post_id)){
    … …  
    137152   
    138153    public static function get_status(){
    139         $response = self::send_request(array('url_info' => wp_unslash(site_url())), 'GET');
     154        if(isset(self::$plugin_status)){
     155            return self::$plugin_status;
     156        }
     157       
     158        $response = self::get_response();
    140159        if (!is_object($response) || !isset($response->post_data->post_status)) {
    141160            return '';
    142161        }
     162           
     163        self::$plugin_status = !empty($response->post_data->post_status) ? $response->post_data->post_status:'';
     164        return self::$plugin_status;
     165    }
     166   
     167    public static function get_freemium_activated_date(){
     168        if(isset(self::$freemium_activated_date)){
     169            return self::$freemium_activated_date;
     170        }
    143171       
    144         return !empty($response->post_data->post_status) ? $response->post_data->post_status:'';
     172        $response = self::get_response();
     173        if (!is_object($response) || !isset($response->post_data->post_status)) {
     174            return '';
     175        }
     176           
     177        self::$freemium_activated_date = !empty($response->post_data->freemium_activated_date) ? strtotime($response->post_data->freemium_activated_date):'';   
     178        return self::$freemium_activated_date;
    145179    }
    146 
     180   
     181    public static function get_response(){
     182        if(isset(self::$_response)){
     183            return self::$_response;
     184        }
     185       
     186        self::$_response = self::send_request(array('url_info' => wp_unslash(site_url())), 'GET');
     187        return self::$_response;
     188    }
    147189}

  • window-blinds-solution/trunk/window-blinds-solution.php

    r3109295 r3110855  
    44 * Plugin Name: BlindMatrix e-Commerce
    55 * Description: Sell window blinds, curtains and shutters online with the BlindMatrix e-commerce plugin, which converts your entire website into an e-commerce store, allowing you to sell products online 24/7. It features a product visualizer that lets your customers see and virtually feel the products on the window frame.
    6  * Version: 2.2
     6 * Version: 2.3
    77 * Author: Blindmatrix
    88 * License: GPLv3
    … …  
    3636     * Plugin version.
    3737     */
    38     public $version = '2.2';
     38    public $version = '2.3';
    3939
    4040    /**
Note: See TracChangeset for help on using the changeset viewer.