From aadda3c7993e85ec6e9668ec893048683f02aca8 Mon Sep 17 00:00:00 2001
From: abolabo <abolabo@gmail.com>
Date: Thu, 5 Apr 2018 13:38:00 +0300
Subject: [PATCH] Extensions: twilio improvements

---
 .../responses/extension/default_twilio.php    |  3 +-
 .../english/default_twilio/default_twilio.xml |  5 +++
 .../extension/default_twilio_test.tpl         | 32 ++++++++++++++-----
 .../extensions/default_twilio/config.xml      |  4 ---
 4 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/public_html/extensions/default_twilio/admin/controller/responses/extension/default_twilio.php b/public_html/extensions/default_twilio/admin/controller/responses/extension/default_twilio.php
index 940f8c3552..85b06a6a49 100644
--- a/public_html/extensions/default_twilio/admin/controller/responses/extension/default_twilio.php
+++ b/public_html/extensions/default_twilio/admin/controller/responses/extension/default_twilio.php
@@ -39,6 +39,7 @@ public function test()
         $AuthToken = $cfg['default_twilio_token'];
 
         $sender = new \Twilio\Rest\Client( $AccountSid, $AuthToken );
+        $to = preg_replace('/[^0-9\+]/','',$this->request->get['to']);
 
         if ( $this->config->get( 'default_twilio_test' ) ) {
             //sandbox number without errors from api
@@ -50,7 +51,7 @@ public function test()
         $error_message = '';
         try {
             $sender->messages->create(
-                "+15005550006",
+                $to,
                 array('from' => $from,
                       'body' => 'test message')
             );
diff --git a/public_html/extensions/default_twilio/admin/language/english/default_twilio/default_twilio.xml b/public_html/extensions/default_twilio/admin/language/english/default_twilio/default_twilio.xml
index 7e86037ade..4c828425f3 100755
--- a/public_html/extensions/default_twilio/admin/language/english/default_twilio/default_twilio.xml
+++ b/public_html/extensions/default_twilio/admin/language/english/default_twilio/default_twilio.xml
@@ -29,6 +29,11 @@
 		<value>
 			<![CDATA[Sender (Twilio) Phone: <span class="help">Phone number of sender in international format (ex. +14158675309)</span>]]></value>
 	</definition>
+	<definition>
+		<key>default_twilio_send_to</key>
+		<value>
+			<![CDATA[Send test SMS to: ]]></value>
+	</definition>
 	<definition>
 		<key>default_twilio_test_0</key>
 		<value><![CDATA[No]]></value>
diff --git a/public_html/extensions/default_twilio/admin/view/default/template/responses/extension/default_twilio_test.tpl b/public_html/extensions/default_twilio/admin/view/default/template/responses/extension/default_twilio_test.tpl
index 79e1f3935e..0b9d01a2ff 100644
--- a/public_html/extensions/default_twilio/admin/view/default/template/responses/extension/default_twilio_test.tpl
+++ b/public_html/extensions/default_twilio/admin/view/default/template/responses/extension/default_twilio_test.tpl
@@ -1,12 +1,27 @@
+<div class="col-sm-12">
+	<div class="row col-sm-2 mt5">
 <?php
-echo $this->html->buildElement( array(
-	'type' => 'button',
-	'name' => 'test_connection',
-	'title' => $text_test,
-	'text' => $text_test,
-	'style' => 'btn btn-info'
-)); ?>
-
+echo $this->language->get('default_twilio_send_to'); ?>
+	</div><div class="row col-sm-3 input-group afield">
+	<?php
+	echo $this->html->buildElement( array(
+		'type' => 'input',
+		'name' => 'to',
+		'value' => '+15005550006',
+		'style' => 'col-sm-2'
+	));
+?><span class="input-group-btn">
+<?php
+	echo $this->html->buildElement( array(
+		'type' => 'button',
+		'name' => 'test_connection',
+		'title' => $text_test,
+		'text' => $text_test,
+		'style' => 'btn btn-info'
+	)); ?>
+		</span>
+	</div>
+</div>
 <script type="text/javascript">
 
 	<?php if ( $this->config->get('default_twilio_test')){ ?>
@@ -23,6 +38,7 @@ echo $this->html->buildElement( array(
 			url: '<?php echo $this->html->getSecureUrl('r/extension/default_twilio/test'); ?>',
 			type: 'GET',
 			dataType: 'json',
+			data: {'to': $('#to').val()},
 			beforeSend: function() {
 				$('#test_connection').button('loading');
 			},
diff --git a/public_html/extensions/default_twilio/config.xml b/public_html/extensions/default_twilio/config.xml
index cfe3c5345f..4e10f5384f 100755
--- a/public_html/extensions/default_twilio/config.xml
+++ b/public_html/extensions/default_twilio/config.xml
@@ -22,10 +22,6 @@
 			<type required="true">input</type>
 			<default_value></default_value>
 		</item>
-		<item id="default_twilio_sender_phone">
-			<type required="true">input</type>
-			<default_value></default_value>
-		</item>
 		<item id="default_twilio_test">
 			<type>selectbox</type>
 			<variants>