WordPress.org
Get WordPress

Plugin Directory

Changeset 2755467


Ignore:
Timestamp:
07/13/2022 06:39:51 AM (4 years ago)
Author:
ascendedcrow
Message:

1.0.13

1) Bug Fix where the reporting screen was not showing correctly

Location:
shop-2-api/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • shop-2-api/trunk/includes/Base/Enqueue.php

    r2720219 r2755467  
    8282        $this -> add_wc_style_scripts();
    8383        $this -> add_common_styles_scripts();
     84
    8485        if ($hook == 'toplevel_page_shop2api_plugin') {
    8586            $this -> add_dashboard_localize();
    … …  
    9899            wp_enqueue_style( 'jquery-modal-min-css', SHOP2API_PLUGIN_URL . '/assets/external/jquery/jquery.modal.min.css', [], $this->version_id());
    99100            wp_enqueue_script( 'bol2api_scripts', SHOP2API_PLUGIN_URL . '/assets/bol2api_report_scripts.js', [], $this->version_id());
    100         } elseif ($hook == 'shop-2-api_page_shop2api_wc_to_bol_reports') {
     101        } elseif ($hook == 'admin_page_shop2api_wc_to_bol_reports_detail') {
    101102            $this -> add_other_localize();
    102103            wp_enqueue_script( 'jquery-modal-min', SHOP2API_PLUGIN_URL . '/assets/external/jquery/jquery.modal.min.js', [], $this->version_id());

  • shop-2-api/trunk/includes/Tables/Bol2WcStatusReportDetail.php

    r2637595 r2755467  
    4545        $api_response = $shop_2_api_connection->get_bol_connection_report($search, $sort, $current_page);
    4646        $api_response_data = json_decode(wp_remote_retrieve_body($api_response), true);
    47         $this->report_data = $api_response_data['results'];
     47        if ($api_response_data != null) {
     48            $this->report_data = $api_response_data['results'];
     49            $total_items = $api_response_data['count'];
     50        } else {
     51            $this->report_data = [];
     52            $total_items = 0;
     53        }
    4854
    4955        $this->set_pagination_args(
    5056            array(
    51                 'total_items' => $api_response_data['count'],
     57                'total_items' => $total_items ,
    5258                'per_page' => 10
    5359            )

  • shop-2-api/trunk/readme.txt

    r2738043 r2755467  
    92921.2) Added marked as paid checkbox where the order will be marked as processing and the stock will be updated accordingly.
    9393
     94= 1.0.13 =
     951) Bug Fix where the reporting screen was not showing correctly
     96
    9497== Instructions ==
    95981) After installing Shop2Api, a new menu item will be available in your WordPress installation, you can continue and click on it and enter you token which was mailed to you.

  • shop-2-api/trunk/shop-2-api.php

    r2738043 r2755467  
    55Plugin URI: https://wordpress.org/plugins/shop-2-api/
    66Description: The plugin Shop2Api will sync products between e-Commerce platforms. The current supported e-Commerce platforms are WooCommerce to Bol.com, and we are working on Amazon, Shopify and others.  We added a koopblok service so that you can check if you lower your price can you get koopblok.
    7 Version: 1.0.12
     7Version: 1.0.13
    88Requires at least: 5.0
    99Requires PHP:      7.2
    … …  
    3434define('SHOP2API_PLUGIN_URL', plugin_dir_url( __FILE__ ));
    3535define('SHOP2API_PLUGIN', plugin_basename( __FILE__ ));
    36 define ('VERSION', '1.0.12');
     36define ('VERSION', '1.0.13');
    3737
    3838// Register items in the project.
Note: See TracChangeset for help on using the changeset viewer.