Changeset 2551245
- Timestamp:
- 06/21/2021 07:59:02 AM (5 years ago)
- Location:
- joy-of-text/trunk
- Files:
-
- 2 added
- 4 deleted
- 5 edited
-
classes/class-jot-plugin-admin.php (modified) (1 diff)
-
classes/class-jot-plugin-settings.php (modified) (1 diff)
-
classes/smsproviders/class-jot-provider-twilio.php (modified) (2 diffs)
-
css/jot-2-2-7.css (deleted)
-
css/jot-2-2-8.css (deleted)
-
css/jot-2-2-9.css (added)
-
joy-of-text.php (modified) (3 diffs)
-
js/jot-messenger-2-2-7.js (deleted)
-
js/jot-messenger-2-2-8.js (deleted)
-
js/jot-messenger-2-2-9.js (added)
-
readme.txt (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
joy-of-text/trunk/classes/class-jot-plugin-admin.php
r2474746 r2551245 406 406 echo "<div class='jot-footer-upgrade'>" . __("Upgrade to the ","jot-plugin") . "<a href='https://www.getcloudsms.com/downloads/joy-of-text-pro-version-3/' target='_blank'>" . __("Joy Of Text Pro Version","jot-plugin") . "</a>."; 407 407 408 $end_date = new DateTime("0 3/31/2021");408 $end_date = new DateTime("07/31/2021"); 409 409 $now = new DateTime(); 410 410 -
joy-of-text/trunk/classes/class-jot-plugin-settings.php
r2474746 r2551245 616 616 } 617 617 } 618 // Render account status 619 $twilio_acc_details_json = Joy_Of_Text_Plugin()->currentsmsprovider->getAccountDetails(); 620 $twilio_acc_details = json_decode($twilio_acc_details_json); 621 $twilio_acc_status = isset($twilio_acc_details->status) ? $twilio_acc_details->status : ""; 622 $twilio_acc_name = isset($twilio_acc_details->friendly_name) ? $twilio_acc_details->friendly_name : ""; 623 $twilio_acc_type = isset($twilio_acc_details->type) ? $twilio_acc_details->type : ""; 624 $display_acc_status = (($twilio_acc_status != "" && !is_numeric($twilio_acc_status)) ? $twilio_acc_status : "<<Not set>>" ); 625 $display_acc_name = (($twilio_acc_name != "") ? $twilio_acc_name : "<<Not set>>" ); 626 $display_acc_type = (($twilio_acc_type != "") ? $twilio_acc_type : "<<Not set>>" ); 627 $html .= $this->render_row('jot-accountstatus','',ucfirst($display_acc_status),$tab); 628 $html .= $this->render_row('jot-accountname','',ucfirst($display_acc_name),$tab); 629 $html .= $this->render_row('jot-accounttype','',ucfirst($display_acc_type),$tab); 618 630 619 631 // Get account balance info -
joy-of-text/trunk/classes/smsproviders/class-jot-provider-twilio.php
r2327333 r2551245 252 252 'description' => __( 'Select the Twilio number you wish to send your SMS messages from.', 'jot-plugin' ) 253 253 ); 254 $settings_fields['jot-accountstatus'] = array( 255 'name' => __( 'Twilio Account Status', 'jot-plugin' ), 256 'type' => 'textvalue', 257 'default' => '', 258 'section' => 'smsprovider', 259 'sectiontab' => 'twiliosettings', 260 'subform' => 'main', 261 'description' => __( 'Twilio account status', 'jot-plugin' ) 262 ); 263 $settings_fields['jot-accountname'] = array( 264 'name' => __( 'Twilio Account Name', 'jot-plugin' ), 265 'type' => 'textvalue', 266 'default' => '', 267 'section' => 'smsprovider', 268 'sectiontab' => 'twiliosettings', 269 'subform' => 'main', 270 'description' => __( 'Twilio account name', 'jot-plugin' ) 271 ); 272 $settings_fields['jot-accounttype'] = array( 273 'name' => __( 'Twilio Account Type', 'jot-plugin' ), 274 'type' => 'textvalue', 275 'default' => '', 276 'section' => 'smsprovider', 277 'sectiontab' => 'twiliosettings', 278 'subform' => 'main', 279 'description' => __( 'Twilio account type', 'jot-plugin' ) 280 ); 254 281 $settings_fields['jot-accountbalance'] = array( 255 282 'name' => __( 'Twilio Account Balance', 'jot-plugin' ), … … 320 347 } 321 348 349 /** 350 * Get account details from Twilio 351 */ 352 public function getAccountDetails() { 353 354 355 $selected_provider = Joy_Of_Text_Plugin()->currentsmsprovidername; 356 $sid = Joy_Of_Text_Plugin()->settings->get_smsprovider_settings('jot-accountsid-' . $selected_provider); 357 358 try { 359 360 $data = array(); 361 $url = "https://api.twilio.com/2010-04-01/Accounts/$sid.json"; 362 $jot_response = Joy_Of_Text_Plugin()->messenger->call_curl($url,$data,'get'); 363 364 return $jot_response; 365 366 } catch (Exception $e) { 367 // Ignore error 368 } 369 } 370 322 371 323 372 } // end class -
joy-of-text/trunk/joy-of-text.php
r2474746 r2551245 17 17 * Plugin URI: http://www.getcloudsms.com 18 18 * Description: Send SMS and text-to-voice messages to your customers, subscribers, followers, members and friends. 19 * Version: 2.2. 819 * Version: 2.2.9 20 20 * Author: Stuart Wilson 21 21 * Author URI: http://www.getcloudsms.com … … 32 32 * 33 33 * Version 34 * 2.2.9 - Added Twilio account details to Messaging-Settings-Twilio Settings tab 34 35 * 2.2.8 - Changes to the Extensions tab 35 36 * 2.2.7 - Minor change to the layout of the Messages tab. … … 121 122 $this->product = "JOT Lite"; 122 123 $this->token = 'jot-plugin'; 123 $this->version = '2.2. 8';124 $this->version = '2.2.9'; 124 125 $this->debug = false; 125 126 -
joy-of-text/trunk/readme.txt
r2474746 r2551245 4 4 Tags: twilio, message, sms, mms, text, mobile, sms scheduler, scheduler, woocommerce, membermouse, voice message, notification, subscribe, buddypress, gravity forms 5 5 Requires at least: 3.0.1 6 Tested up to: 5. 6.17 Stable tag: 5. 6.16 Tested up to: 5.7.2 7 Stable tag: 5.7.2 8 8 License: GPLv2 or later 9 9 License URI: http://www.gnu.org/licenses/gpl-2.0.html … … 260 260 == Changelog == 261 261 262 = 2.2.9 = 263 * Added Twilio account details to Messaging-Settings-Twilio Settings tab 264 262 265 = 2.2.8 = 263 266 * Changes to the Extensions tab … … 390 393 == Upgrade Notice == 391 394 392 = 2.2. 8=393 * Changes to the Extensions tab394 395 = 2.2.9 = 396 * Added Twilio account details to Messaging-Settings-Twilio Settings tab 397
Note: See TracChangeset
for help on using the changeset viewer.