WordPress.org
Get WordPress

Plugin Directory

Changeset 2941103


Ignore:
Timestamp:
07/21/2023 05:21:44 AM (3 years ago)
Author:
managedorg
Message:

dynamic server added

Location:
managedorg-product-driver
Files:
59 added
3 edited

Legend:

Unmodified
Added
Removed

  • managedorg-product-driver/trunk/donative.php

    r2940482 r2941103  
    44Plugin URI: https://wordpress.org/plugins/managedorg-product-driver/
    55Description: Managedorg Product Driver for Amazon Business Integration.
    6 Version: 1.0.7.2
     6Version: 1.0.7.3
    77Author: Managedorg
    88Author URI: https://managedorg.io/
    … …  
    1111   
    1212if (!class_exists('MODD_Donation')) :
    13 define('MODD_VERSION', '1.0.7.2');
     13define('MODD_VERSION', '1.0.7.3');
    1414define('MODD_PLUGIN_URL', plugin_dir_url(__FILE__));
    1515define('MODD_PLUGIN_MAIN_PATH', plugin_dir_path(__FILE__));

  • managedorg-product-driver/trunk/js/modd_myscript.js

    r2940482 r2941103  
    5252        tags = tagValue;
    5353    }
     54    var static_server = null;
    5455    if($("#modd_campaign_list_div").data("server") !== undefined && $("#modd_campaign_list_div").data("server") !== null  && $("#modd_campaign_list_div").data("server") !== ""){
    5556        server = $("#modd_campaign_list_div").data("server");
     57        static_server = server;
    5658    }
    5759    if($("#modd_campaign_list_div").data("admin") !== undefined && $("#modd_campaign_list_div").data("admin") !== null  && $("#modd_campaign_list_div").data("admin") !== ""){
    … …  
    134136    .then(res => {
    135137        if(res.data.customerData != null){
    136 
    137             var frontendUrl = res.data.customerData.websiteURL;
     138            var dynamic_server = null;
     139            if(res.data.customerData.backendApi !== null) {
     140            var dynamic_server = res.data.customerData.backendApi;
     141                dynamic_server= "https://" + dynamic_server.replace(/^https?:\/\//, "").replace(/\/+$/, "") + "/api/";
     142            }
     143            var frontendUrl = res.data.customerData.websiteURL;
    138144            var frontendUrl = server_only.replace(/^https?:\/\//, '');
    139145            if (frontendUrl.endsWith('/')) {
    … …  
    146152                loadProductListInScroll(false, location, tags);
    147153                loadProductListInScroll(true, location, tags);
    148                 loadCampaignListInPage(location, tags, campaign_id, campaign_type); 
     154                loadCampaignListInPage(location, tags, campaign_id, campaign_type, dynamic_server); 
    149155            }
    150156            else{
    151157                loadProductListInScroll(false, location, tagsS);
    152158                loadProductListInScroll(true, location, tagsS);
    153                 loadCampaignListInPage(location, tagsL, campaign_id, campaign_type); 
     159                loadCampaignListInPage(location, tagsL, campaign_id, campaign_type, dynamic_server); 
    154160            }
    155161        }
    … …  
    429435
    430436   
    431     function loadCampaignListInPage(loc, tag, campaign_id, campaign_type){
     437    function loadCampaignListInPage(loc, tag, campaign_id, campaign_type, dynamic_server){
    432438        var locArray = loc.split(',').map(function(item) {
    433439            return item.trim();
    … …  
    444450
    445451            $('#modd_loadingDiv').show();
    446             var request_url = server+"campaigns?filters[isActive][$eq]=true&filters[isPublished][$eq]=true&populate=*";
     452            var request_server = server;
     453            if(dynamic_server !== null){
     454                request_server = dynamic_server;
     455            }
     456            if(static_server !== null){
     457                request_server = static_server;
     458            }
     459            var request_url = request_server+"campaigns?filters[isActive][$eq]=true&filters[isPublished][$eq]=true&populate=*";
    447460            if(campaignValue !== null){
    448                 request_url = server+"campaigns?filters[id][$eq]="+campaignValue+"&populate=*";
     461                request_url = request_server+"campaigns?filters[id][$eq]="+campaignValue+"&populate=*";
    449462            }
    450463            //Get active campaign lists to append

  • managedorg-product-driver/trunk/readme.txt

    r2940482 r2941103  
    44Requires at least: 4.7
    55Tested up to: 6.2
    6 Stable tag: 1.0.7.2
     6Stable tag: 1.0.7.3
    77Requires PHP: 7.0
    88License: GPLv2 or later
    … …  
    144144* Pricing format modified.
    145145
    146 = 1.0.7.2 =
     146= 1.0.7.3 =
    147147* New design
    148148* New shortcode attributes products_per_page, campaigns_per_page, cart_checkbox
Note: See TracChangeset for help on using the changeset viewer.