WordPress.org
Get WordPress

Plugin Directory

Changeset 2205277


Ignore:
Timestamp:
12/03/2019 12:31:11 PM (6 years ago)
Author:
shahalom
Message:

Revert back the sponsor taxonomy in Monetize Me Plugin

Location:
monetize-me/trunk
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed

  • monetize-me/trunk/dist/blocks.build.js

    r2205184 r2205277  
    1 !function(e){function t(r){if(n[r])return n[r].exports;var l=n[r]={i:r,l:!1,exports:{}};return e[r].call(l.exports,l,l.exports,t),l.l=!0,l.exports}var n={};t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=0)}([function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});n(1)},function(e,t,n){"use strict";var r=n(2),l=n(3),o=(n.n(l),n(4)),__=(n.n(o),wp.i18n.__),a=wp.blocks.registerBlockType,i=wp.element.Fragment,u=wp.components,c=u.PanelBody,p=u.SelectControl,s=u.ServerSideRender,m=u.TextControl,g=u.ToggleControl,d=wp.editor.InspectorControls;a("monetize-me/shortcode-mmps-to-block",{title:__("Monetize Me"),icon:"shield",category:"common",keywords:[__("Monetize Me"),__("Adsense"),__("msbd")],attributes:{adAlignment:{type:"string",default:"center-align"},adCategory:{type:"string",default:"0"},postSlug:{type:"string",default:""},limit:{type:"string",default:"1"},isWrapper:{type:"string",default:"true"}},edit:function(e){var t=e.setAttributes,n=e.attributes,l=n.adAlignment,o=n.adCategory,a=n.limit,u=n.postSlug,f=n.isWrapper;return wp.element.createElement(i,null,wp.element.createElement(d,null,wp.element.createElement(c,{title:__("Ad Settings"),initialOpen:!0},wp.element.createElement(p,{label:__("Ad Alignment"),value:l,options:Object(r.a)(),onChange:function(e){return t({adAlignment:e})}}),wp.element.createElement(p,{label:__("Ad Category"),value:o,options:mmpConfigs.adCategoryValueLabelPairs,onChange:function(e){return t({adCategory:e})}}),wp.element.createElement(m,{label:"Ad Slug",value:u,onChange:function(e){return t({postSlug:e})}}),wp.element.createElement(m,{label:"Ad Limit",value:a,onChange:function(e){return t({limit:e})}}),wp.element.createElement(g,{label:"Fixed Background",help:"true"===f?"Use wrapper for Ad.":"No wrapper for Ad.",checked:"true"===f,onChange:function(e){return t({isWrapper:e?"true":"false"})}}))),wp.element.createElement(s,{block:"monetize-me/shortcode-mmps-to-block",attributes:n}))},save:function(){return null}})},function(e,t,n){"use strict";n.d(t,"a",function(){return r});var r=function(){return[{label:"Right Alignment",value:"right-align"},{label:"Left Alignment",value:"left-align"},{label:"Center Alignment",value:"center-align"}]}},function(e,t){},function(e,t){}]);
     1!function(e){function t(r){if(n[r])return n[r].exports;var l=n[r]={i:r,l:!1,exports:{}};return e[r].call(l.exports,l,l.exports,t),l.l=!0,l.exports}var n={};t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=0)}([function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});n(1)},function(e,t,n){"use strict";var r=n(2),l=n(3),o=(n.n(l),n(4)),__=(n.n(o),wp.i18n.__),a=wp.blocks.registerBlockType,i=wp.element.Fragment,u=wp.components,p=u.PanelBody,s=u.SelectControl,c=u.ServerSideRender,m=u.TextControl,d=u.ToggleControl,g=wp.editor.InspectorControls;a("monetize-me/shortcode-mmps-to-block",{title:__("Monetize Me"),icon:"shield",category:"common",keywords:[__("Monetize Me"),__("Adsense"),__("msbd")],attributes:{adAlignment:{type:"string",default:"center-align"},adCategory:{type:"string",default:"0"},adSponsor:{type:"string",default:"0"},postSlug:{type:"string",default:""},limit:{type:"string",default:"1"},isWrapper:{type:"string",default:"true"}},edit:function(e){var t=e.setAttributes,n=e.attributes,l=n.adAlignment,o=n.adCategory,a=n.adSponsor,u=n.limit,f=n.postSlug,b=n.isWrapper;return wp.element.createElement(i,null,wp.element.createElement(g,null,wp.element.createElement(p,{title:__("Ad Settings"),initialOpen:!0},wp.element.createElement(s,{label:__("Ad Alignment"),value:l,options:Object(r.a)(),onChange:function(e){return t({adAlignment:e})}}),wp.element.createElement(s,{label:__("Ad Category **"),value:o,options:mmpConfigs.adCategoryValueLabelPairs,onChange:function(e){return t({adCategory:e})}}),wp.element.createElement(s,{label:__("Ad Sponsor"),value:a,options:mmpConfigs.adSponsorValueLabelPairs,onChange:function(e){return t({adSponsor:e})}}),wp.element.createElement(m,{label:"Ad Slug",value:f,onChange:function(e){return t({postSlug:e})}}),wp.element.createElement(m,{label:"Ad Limit **",value:u,onChange:function(e){return t({limit:e})}}),wp.element.createElement(d,{label:"Fixed Background",help:"true"===b?"Use wrapper for Ad.":"No wrapper for Ad.",checked:"true"===b,onChange:function(e){return t({isWrapper:e?"true":"false"})}}))),wp.element.createElement(c,{block:"monetize-me/shortcode-mmps-to-block",attributes:n}))},save:function(){return null}})},function(e,t,n){"use strict";n.d(t,"a",function(){return r});var r=function(){return[{label:"Right Alignment",value:"right-align"},{label:"Left Alignment",value:"left-align"},{label:"Center Alignment",value:"center-align"}]}},function(e,t){},function(e,t){}]);

  • monetize-me/trunk/inc/custom-post-types/ad.php

    r2205184 r2205277  
    5656            'menu_icon' => 'dashicons-star-filled',
    5757            'supports' => array( 'title', 'editor', 'custom-fields' ),
    58             'taxonomies' => array( 'adcategory' )
     58            'taxonomies' => array( 'adcategory', 'adsponsor' )
    5959        );
    6060

  • monetize-me/trunk/inc/functions.php

    r2205187 r2205277  
    11<?php
    2 
    32/**
    43 *
    54 */
    6 function get_ad_category_value_label_pairs( $emptySelectOption = true ) {
     5function monetize_me_taxonomy_name_id_pairs( $tax, $emptySelectOption = true ) {
    76    $rs = array();
    87    $terms = get_terms(array(
    9         'taxonomy' => 'adcategory',
    10         'hide_empty' => true,
     8        'taxonomy' => $tax,
     9        'hide_empty' => $emptySelectOption,
    1110    ));
    1211
    … …  
    3029 *
    3130 */
     31function monetize_me_ad_category_pairs( $emptySelectOption = true ) {
     32    return monetize_me_taxonomy_name_id_pairs( 'adcategory', $emptySelectOption );
     33}
     34
     35/**
     36 *
     37 */
     38function monetize_me_ad_sponsor_pairs( $emptySelectOption = true ) {
     39    return monetize_me_taxonomy_name_id_pairs( 'adsponsor', $emptySelectOption );
     40}
     41
     42
     43
     44/**
     45 *
     46 */
    3247function monetize_me_gutenberg_serverside_handler($atts) {
    3348    return monetize_me_shortcode_mmps( $atts );
    … …  
    4661    $postSlug = isset( $atts['postSlug'] ) ? $atts['postSlug'] : '';
    4762    $adCategory = isset( $atts['adCategory'] ) ? explode( ",", $atts['adCategory'] ) : array();
     63   
     64    $adSponsor = ( isset( $atts['adSponsor'] ) && ( $atts['adSponsor'] !== '0' ) ) ? explode( ",", $atts['adSponsor'] ) : array();
    4865
    4966    $className = isset( $atts['className'] ) ? $atts['className'] : ''; // Advanced class name
    … …  
    6683        $args['name'] = $postSlug;
    6784    } else {
    68         // $args['tax_query']['relation'] = 'OR';
    69 
    7085        $args['tax_query'][] = array(
    7186            'taxonomy' => 'adcategory',
    … …  
    7388            'terms' => $adCategory,
    7489        );
     90
     91        if ( ! empty( $adSponsor ) ) {
     92            $args['tax_query']['relation'] = 'AND';
     93
     94            $args['tax_query'][] = array(
     95                'taxonomy' => 'adsponsor',
     96                'field' => 'term_id',
     97                'terms' => $adSponsor,
     98            );
     99        }
    75100    }
    76101
    … …  
    98123
    99124    $rs = "";
     125    $test = '';// print_r($adSponsor, true);
    100126
    101127    if( !empty( $servable_ads ) ) {
    102128        // if ( $isWrapper ) {
    103             $rs = '<div class="monetize-me'. msbd_asf( $adAlignment ).'">'.implode("", $servable_ads).'</div>';
     129            $rs = '<div class="monetize-me'. msbd_asf( $adAlignment ).'">' . implode("", $servable_ads) . "{$test}</div>";
    104130        // } else {
    105131        //     $rs = implode("", $servable_ads);
    106132        // }
    107133    } else {
    108         $rs = "<div class=\"monetize-me center-align\">Ad Setting Require A Change!</div>";
     134        $rs = "<div class=\"monetize-me center-align\">Ad Setting Require A Change!{$test}</div>";
    109135    }
    110136

  • monetize-me/trunk/main.php

    r2205184 r2205277  
    66 * Author: microsolutions, shahalom
    77 * Author URI: https://MicroSolutionsBD.com/
    8  * Version: 1.0.0
     8 * Version: 1.0.1
    99 * License: GPL2+
    1010 * License URI: https://www.gnu.org/licenses/gpl-2.0.txt
    … …  
    2626require_once('inc/custom-post-types/ad.php');
    2727require_once('inc/custom-taxonomies/adcategory.php');
     28require_once('inc/custom-taxonomies/adsponsor.php');
    2829
    2930require_once('inc/functions.php');

  • monetize-me/trunk/readme.txt

    r2205200 r2205277  
    4949
    5050== Changelog ==
     51= 1.0.1 =
     52* Revert back the ad sponsor taxonomy
    5153
    5254= 1.0.0 =

  • monetize-me/trunk/src/init.php

    r2205184 r2205277  
    6868            'siteTagline' => get_bloginfo("description"),
    6969            'siteUrl' => esc_url( get_site_url() ),
    70             'adCategoryValueLabelPairs' => get_ad_category_value_label_pairs(),
     70            'adCategoryValueLabelPairs' => monetize_me_ad_category_pairs(),
     71            'adSponsorValueLabelPairs' => monetize_me_ad_sponsor_pairs(),
    7172        ]
    7273    );
    … …  
    103104                    'type' => 'string',
    104105                ),
     106                'adSponsor' => array(
     107                    'default' => '0',
     108                    'type' => 'string',
     109                ),
    105110                'postSlug' => array(
    106111                    'default' => '',

  • monetize-me/trunk/src/shortcode-mmps-to-block/block.js

    r2205184 r2205277  
    5454            default: '0',
    5555        },
     56        adSponsor: {
     57            type: 'string',
     58            default: '0',
     59        },
    5660        postSlug: {
    5761            type: 'string',
    … …  
    7983    edit: ( props ) => {
    8084        const { setAttributes, attributes } = props;
    81         const { adAlignment, adCategory, limit, postSlug, isWrapper } = attributes;
     85        const { adAlignment, adCategory, adSponsor, limit, postSlug, isWrapper } = attributes;
    8286
    8387        return (
    … …  
    96100
    97101                        <SelectControl
    98                             label={ __( 'Ad Category' ) }
     102                            label={ __( 'Ad Category **' ) }
    99103                            value={ adCategory }
    100104                            options={ mmpConfigs.adCategoryValueLabelPairs }
    101105                            onChange={ adCat => setAttributes( { adCategory: adCat } ) }
     106                        />
     107
     108                        <SelectControl
     109                            label={ __( 'Ad Sponsor' ) }
     110                            value={ adSponsor }
     111                            options={ mmpConfigs.adSponsorValueLabelPairs }
     112                            onChange={ adSpon => setAttributes( { adSponsor: adSpon } ) }
    102113                        />
    103114
    … …  
    109120
    110121                        <TextControl
    111                             label="Ad Limit"
     122                            label="Ad Limit **"
    112123                            value={ limit }
    113124                            onChange={ ( limitNo ) => setAttributes( { limit: limitNo } ) }
    … …  
    123134                </InspectorControls>
    124135
    125                 <ServerSideRender
    126                     block="monetize-me/shortcode-mmps-to-block"
    127                     attributes={ attributes }
    128                 />
     136                <ServerSideRender
     137                    block="monetize-me/shortcode-mmps-to-block"
     138                    attributes={ attributes }
     139                />
    129140            </Fragment>
    130141        );
Note: See TracChangeset for help on using the changeset viewer.