TGM_Voodoo_Ext - Version 4.1.1

Version Notes

Added a new functionality to SendSMS test SMS
Bug Fixes

Download this release

Release Info

Developer Top Gear Media
Extension TGM_Voodoo_Ext
Version 4.1.1
Comparing to
See all releases


Code changes from version 3.3.9 to 4.1.1

Files changed (14) hide show
  1. app/code/community/TGM/Voodoo/Block/Backend/Page/Header.php +25 -3
  2. app/code/community/TGM/Voodoo/Block/SendTestSmsOnCanceled.php +16 -0
  3. app/code/community/TGM/Voodoo/Block/SendTestSmsOnHold.php +16 -0
  4. app/code/community/TGM/Voodoo/Block/SendTestSmsOnOrder.php +16 -0
  5. app/code/community/TGM/Voodoo/Block/SendTestSmsOnShipment.php +16 -0
  6. app/code/community/TGM/Voodoo/Block/SendTestSmsOnUnHold.php +16 -0
  7. app/code/community/TGM/Voodoo/Block/ShowMessage.php +16 -0
  8. app/code/community/TGM/Voodoo/Helper/Data.php +25 -1
  9. app/code/community/TGM/Voodoo/Model/Observer.php +255 -146
  10. app/code/community/TGM/Voodoo/etc/config.xml +1 -1
  11. app/code/community/TGM/Voodoo/etc/system.xml +94 -9
  12. app/code/community/TGM/Voodoo/sql/voodoo_setup/mysql4-install-1.2.php +54 -0
  13. app/design/adminhtml/default/custom/template/sales/order/view/info.phtml +183 -0
  14. package.xml +6 -7
app/code/community/TGM/Voodoo/Block/Backend/Page/Header.php CHANGED
@@ -1,4 +1,5 @@
1
  <?php
 
2
  class TGM_Voodoo_Block_Backend_Page_Header
3
  extends Mage_Adminhtml_Block_Abstract
4
  implements Varien_Data_Form_Element_Renderer_Interface
@@ -8,22 +9,43 @@ class TGM_Voodoo_Block_Backend_Page_Header
8
  * Render fieldset html
9
  *
10
  * @param Varien_Data_Form_Element_Abstract $element
 
11
  * @return string
12
  */
13
  public function render(Varien_Data_Form_Element_Abstract $element)
14
  {
15
- $html = '<div style="background:#EAF0EE;border:1px solid #CCCCCC;margin-bottom:10px;padding:20px 15px 15px; border-radius: 5px;">
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
16
  <img src="https://www.voodoosms.com/ecommerce-extension/images/logo.png" style="margin-left:-15px;"/>
17
  <div style="margin: 0 auto;">
18
 
19
- <h4 style="color:#EA7601;">Voodoo SMS Extension Community Edition v3.3.9 by <a target="_blank" href="https://www.voodoosms.com"><strong>VoodooSMS</strong></a></h4>
20
  <h4>This module requires an account,
21
  API username/password and SMS credits with <a href="https://www.voodoosms.com">www.voodoosms.com</a>.
22
  <br>To register an account <a href="https://www.voodoosms.com/portal.html">click here</a>
23
  <br>To view instructions on how to configure this module <a href="https://www.voodoosms.com/portal/help/online_help/?help=69&p=173#help_detail_post_173">click here</a></h4>
24
  <p>Query? Feel free to contact the team by <a href="https://www.voodoosms.com/contact-us.html" target="_blank">clicking here</a></p>
25
  </div>
26
-
27
  ';
28
 
29
  return $html;
1
  <?php
2
+
3
  class TGM_Voodoo_Block_Backend_Page_Header
4
  extends Mage_Adminhtml_Block_Abstract
5
  implements Varien_Data_Form_Element_Renderer_Interface
9
  * Render fieldset html
10
  *
11
  * @param Varien_Data_Form_Element_Abstract $element
12
+ *
13
  * @return string
14
  */
15
  public function render(Varien_Data_Form_Element_Abstract $element)
16
  {
17
+ $html = '
18
+ <script type="text/javascript">
19
+
20
+ function sendtestmessge(section){
21
+ var uid = document.getElementById("voodoo_enter_username").value;
22
+ var pass = document.getElementById("voodoo_enter_password").value;
23
+ var orig = document.getElementById(section+"sender").value;
24
+ var msg = document.getElementById(section+"message").value;
25
+ var dest = document.getElementById(section+"oplctest").value;
26
+ //var url = "https://www.voodoosms.com/vapi/server/sendSMS?uid="+uid+"&pass="+pass+"&orig="+orig+"&dest="+dest+"&msg="+msg+"&validty=300&default_cc=44";
27
+ var xhttp;
28
+ xhttp = new XMLHttpRequest();
29
+ xhttp.onreadystatechange = function() {
30
+ if (this.readyState == 4 && this.status == 200) {
31
+ alert(this.responseText);
32
+ }
33
+ };
34
+ xhttp.open("GET", "http://magento.voodoosms.com/magento/sendtestmessageajax.php?uid="+uid+"&pass="+pass+"&orig="+orig+"&dest="+dest+"&msg="+msg, true);
35
+ xhttp.send();
36
+ }
37
+ </script>
38
+ <div style="background:#EAF0EE;border:1px solid #CCCCCC;margin-bottom:10px;padding:20px 15px 15px; border-radius: 5px;">
39
  <img src="https://www.voodoosms.com/ecommerce-extension/images/logo.png" style="margin-left:-15px;"/>
40
  <div style="margin: 0 auto;">
41
 
42
+ <h4 style="color:#EA7601;">Voodoo SMS Extension Community Edition v4.1.1 by <a target="_blank" href="https://www.voodoosms.com"><strong>VoodooSMS</strong></a></h4>
43
  <h4>This module requires an account,
44
  API username/password and SMS credits with <a href="https://www.voodoosms.com">www.voodoosms.com</a>.
45
  <br>To register an account <a href="https://www.voodoosms.com/portal.html">click here</a>
46
  <br>To view instructions on how to configure this module <a href="https://www.voodoosms.com/portal/help/online_help/?help=69&p=173#help_detail_post_173">click here</a></h4>
47
  <p>Query? Feel free to contact the team by <a href="https://www.voodoosms.com/contact-us.html" target="_blank">clicking here</a></p>
48
  </div>
 
49
  ';
50
 
51
  return $html;
app/code/community/TGM/Voodoo/Block/SendTestSmsOnCanceled.php ADDED
@@ -0,0 +1,16 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ class TGM_Voodoo_Block_SendTestSmsOnCanceled extends Mage_Adminhtml_Block_System_Config_Form_Field
3
+ {
4
+ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
5
+ {
6
+ $this->setElement($element);
7
+ $html = $this->getLayout()->createBlock('adminhtml/widget_button')
8
+ ->setType('button')
9
+ ->setClass('button')
10
+ ->setLabel(Mage::helper('voodoo')->__('Send Test SMS'))
11
+ ->setOnClick("sendtestmessge('voodoo_order_canceled_')")
12
+ ->toHtml();
13
+ return $html;
14
+ }
15
+ }
16
+ ?>
app/code/community/TGM/Voodoo/Block/SendTestSmsOnHold.php ADDED
@@ -0,0 +1,16 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ class TGM_Voodoo_Block_SendTestSmsOnHold extends Mage_Adminhtml_Block_System_Config_Form_Field
3
+ {
4
+ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
5
+ {
6
+ $this->setElement($element);
7
+ $html = $this->getLayout()->createBlock('adminhtml/widget_button')
8
+ ->setType('button')
9
+ ->setClass('button')
10
+ ->setLabel(Mage::helper('voodoo')->__('Send Test SMS'))
11
+ ->setOnClick("sendtestmessge('voodoo_order_hold_')")
12
+ ->toHtml();
13
+ return $html;
14
+ }
15
+ }
16
+ ?>
app/code/community/TGM/Voodoo/Block/SendTestSmsOnOrder.php ADDED
@@ -0,0 +1,16 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ class TGM_Voodoo_Block_SendTestSmsOnOrder extends Mage_Adminhtml_Block_System_Config_Form_Field
3
+ {
4
+ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
5
+ {
6
+ $this->setElement($element);
7
+ $html = $this->getLayout()->createBlock('adminhtml/widget_button')
8
+ ->setType('button')
9
+ ->setClass('button')
10
+ ->setLabel(Mage::helper('voodoo')->__('Send Test SMS'))
11
+ ->setOnClick("sendtestmessge('voodoo_orders_')")
12
+ ->toHtml();
13
+ return $html;
14
+ }
15
+ }
16
+ ?>
app/code/community/TGM/Voodoo/Block/SendTestSmsOnShipment.php ADDED
@@ -0,0 +1,16 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ class TGM_Voodoo_Block_SendTestSmsOnShipment extends Mage_Adminhtml_Block_System_Config_Form_Field
3
+ {
4
+ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
5
+ {
6
+ $this->setElement($element);
7
+ $html = $this->getLayout()->createBlock('adminhtml/widget_button')
8
+ ->setType('button')
9
+ ->setClass('button')
10
+ ->setLabel(Mage::helper('voodoo')->__('Send Test SMS'))
11
+ ->setOnClick("sendtestmessge('voodoo_shipments_')")
12
+ ->toHtml();
13
+ return $html;
14
+ }
15
+ }
16
+ ?>
app/code/community/TGM/Voodoo/Block/SendTestSmsOnUnHold.php ADDED
@@ -0,0 +1,16 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ class TGM_Voodoo_Block_SendTestSmsOnUnHold extends Mage_Adminhtml_Block_System_Config_Form_Field
3
+ {
4
+ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
5
+ {
6
+ $this->setElement($element);
7
+ $html = $this->getLayout()->createBlock('adminhtml/widget_button')
8
+ ->setType('button')
9
+ ->setClass('button')
10
+ ->setLabel(Mage::helper('voodoo')->__('Send Test SMS'))
11
+ ->setOnClick("sendtestmessge('voodoo_order_unhold_')")
12
+ ->toHtml();
13
+ return $html;
14
+ }
15
+ }
16
+ ?>
app/code/community/TGM/Voodoo/Block/ShowMessage.php ADDED
@@ -0,0 +1,16 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ class TGM_Voodoo_Block_ShowMessage extends Mage_Adminhtml_Block_System_Config_Form_Field
3
+ {
4
+ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
5
+ {
6
+ $this->setElement($element);
7
+
8
+ $html = '<div id="showhidemessagetext"></div>';
9
+
10
+ return $html;
11
+
12
+
13
+
14
+ }
15
+ }
16
+ ?>
app/code/community/TGM/Voodoo/Helper/Data.php CHANGED
@@ -373,6 +373,30 @@ class TGM_Voodoo_Helper_Data extends Mage_Core_Helper_Abstract
373
  return Mage::getStoreConfig(self::CONFIG_PATH.'mtwoe/receiver');
374
  }
375
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
376
 
377
 
378
  public function voodoo($url) {
@@ -408,7 +432,7 @@ class TGM_Voodoo_Helper_Data extends Mage_Core_Helper_Abstract
408
  }
409
 
410
  public function file_get_contents_curl($url) {
411
- $ch = curl_init();
412
  curl_setopt($ch, CURLOPT_HEADER, 0);
413
  curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
414
  curl_setopt($ch, CURLOPT_URL, $url);
373
  return Mage::getStoreConfig(self::CONFIG_PATH.'mtwoe/receiver');
374
  }
375
 
376
+ public function getSendTestNumberOrderPlaced()
377
+ {
378
+ return Mage::getStoreConfig(self::CONFIG_PATH.'orders/oplctest');
379
+ }
380
+ public function getMessageForTestOrderPlaced(){
381
+ return Mage::getStoreConfig(self::CONFIG_PATH.'orders/message');
382
+ }
383
+ public function getSendTestNumberOrderHold()
384
+ {
385
+ return Mage::getStoreConfig(self::CONFIG_PATH.'order_hold/ohldtest');
386
+ }
387
+ public function getSendTestNumberOrderUnHold()
388
+ {
389
+ return Mage::getStoreConfig(self::CONFIG_PATH.'order_unhold/ounhldtest');
390
+ }
391
+ public function getSendTestNumberOrderCanceled()
392
+ {
393
+ return Mage::getStoreConfig(self::CONFIG_PATH.'order_canceled/ocnldtest');
394
+ }
395
+ public function getSendTestNumberOrderShipped()
396
+ {
397
+ return Mage::getStoreConfig(self::CONFIG_PATH.'shipments/oshptest');
398
+ }
399
+
400
 
401
 
402
  public function voodoo($url) {
432
  }
433
 
434
  public function file_get_contents_curl($url) {
435
+ $ch = curl_init();
436
  curl_setopt($ch, CURLOPT_HEADER, 0);
437
  curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
438
  curl_setopt($ch, CURLOPT_URL, $url);
app/code/community/TGM/Voodoo/Model/Observer.php CHANGED
@@ -1,4 +1,5 @@
1
  <?php
 
2
  class TGM_Voodoo_Model_Observer
3
  {
4
  const ORDER_ATTRIBUTE_FHC_ID = 'voodoo';
@@ -49,41 +50,49 @@ class TGM_Voodoo_Model_Observer
49
  } catch (Exception $e) {
50
  }
51
  }
52
-
53
-
54
- if ($this->getHelper()->isOrdersNotify() and $this->getHelper()->getAdminTelephone()) {
55
- $smsto = $this->getHelper()->getAdminTelephone();
56
- $smsmsg = Mage::helper('voodoo')->__('A new order has been placed: %s', $order->getIncrementId());
57
- $data = '?uid=' . urlencode($username);
58
- $data .= '&pass=' . urlencode($password);
59
- $data .= '&dest=' . urlencode($smsto);
60
- $data .= '&orig=' . urlencode($smsfrom);
61
- $data .= '&msg=' . urlencode($smsmsg);
62
- $data .= '&validity=300&format=json';
63
- $url = $host . $path . $data;
64
- $verify_number_url = "http://voodoosms.com/vapi/server/checkRanges?uid=" . urlencode($username) . "&pass=" . urlencode($password) . "&dest=" . urlencode($smsto) . "&format=json";
65
- $verify_number = $this->getHelper()->verify_number($verify_number_url);
66
- if ($verify_number->result == 200) {
67
- $sendSms = $this->getHelper()->voodoo($url);
68
- try {
69
- Mage::getModel('voodoo/voodoo')
70
- ->setOrderId($order->getIncrementId())
71
- ->setFrom($smsfrom)
72
- ->setTo($smsto)
73
- ->setSmsMessage($smsmsg)
74
- ->setStatus($sendSms['status'])
75
- ->setStatusMessage($sendSms['status_message'])
76
- ->setCreatedTime(now())
77
- ->save();
78
- } catch (Exception $e) {
79
- }
80
- }
 
 
 
 
 
 
 
81
  }
82
  }
83
  }
84
  }
85
  }
86
 
 
87
  public function sendSmsOnOrderHold(Varien_Event_Observer $observer)
88
  {
89
  if ($this->getHelper()->isOrderHoldEnabled()) {
@@ -92,6 +101,20 @@ class TGM_Voodoo_Model_Observer
92
  if ($order->getState() !== $order->getOrigData('state') && $order->getState() === Mage_Sales_Model_Order::STATE_HOLDED) {
93
  if ($this->getHelper()->isOptinsEnabled()) {
94
  $smsto = Mage::getSingleton('core/session')->getTGMVoodoo();
 
 
 
 
 
 
 
 
 
 
 
 
 
 
95
  } else {
96
  if ($this->getHelper()->isbillingorshipping() == 0) {
97
  $smsto = $this->getHelper()->getTelephoneFromOrder($order);
@@ -130,33 +153,43 @@ class TGM_Voodoo_Model_Observer
130
  } catch (Exception $e) {
131
  }
132
  }
133
- if ($this->getHelper()->isOrdersHoldNotify() and $this->getHelper()->getAdminHoldTelephone()) {
134
- $smsto = $this->getHelper()->getAdminHoldTelephone();
135
- $smsmsg = Mage::helper('voodoo')->__('%s has been placed on hold', $order->getIncrementId());
136
- $data = '?uid=' . urlencode($username);
137
- $data .= '&pass=' . urlencode($password);
138
- $data .= '&dest=' . urlencode($smsto);
139
- $data .= '&orig=' . urlencode($smsfrom);
140
- $data .= '&msg=' . urlencode($smsmsg);
141
- $data .= '&validity=300&format=json';
142
- $url = $host . $path . $data;
143
- $verify_number_url = "http://voodoosms.com/vapi/server/checkRanges?uid=" . urlencode($username) . "&pass=" . urlencode($password) . "&dest=" . urlencode($smsto) . "&format=json";
144
- $verify_number = $this->getHelper()->verify_number($verify_number_url);
145
- if ($verify_number->result == 200) {
146
- $sendSms = $this->getHelper()->voodoo($url);
147
- try {
148
- Mage::getModel('voodoo/voodoo')
149
- ->setOrderId($order->getIncrementId())
150
- ->setFrom($smsfrom)
151
- ->setTo($smsto)
152
- ->setSmsMessage($smsmsg)
153
- ->setStatus($sendSms['status'])
154
- ->setStatusMessage($sendSms['status_message'])
155
- ->setCreatedTime(now())
156
- ->save();
157
- } catch (Exception $e) {
158
- }
159
- }
 
 
 
 
 
 
 
 
 
 
160
  }
161
  }
162
  }
@@ -172,6 +205,20 @@ class TGM_Voodoo_Model_Observer
172
  if ($order->getState() !== $order->getOrigData('state') && $order->getOrigData('state') === Mage_Sales_Model_Order::STATE_HOLDED) {
173
  if ($this->getHelper()->isOptinsEnabled()) {
174
  $smsto = Mage::getSingleton('core/session')->getTGMVoodoo();
 
 
 
 
 
 
 
 
 
 
 
 
 
 
175
  } else {
176
  if ($this->getHelper()->isbillingorshipping() == 0) {
177
  $smsto = $this->getHelper()->getTelephoneFromOrder($order);
@@ -210,36 +257,46 @@ class TGM_Voodoo_Model_Observer
210
  } catch (Exception $e) {
211
  }
212
  }
213
- if ($this->getHelper()->isOrdersUnholdNotify() and $this->getHelper()->getAdminUnholdTelephone()) {
214
- $smsto = $this->getHelper()->getAdminUnholdTelephone();
215
- $smsmsg = Mage::helper('voodoo')->__('%s has been placed on unhold', $order->getIncrementId());
216
- $data = '?uid=' . urlencode($username);
217
- $data .= '&pass=' . urlencode($password);
218
- $data .= '&dest=' . urlencode($smsto);
219
- $data .= '&orig=' . urlencode($smsfrom);
220
- $data .= '&msg=' . urlencode($smsmsg);
221
- $data .= '&validity=300&format=json';
222
- $url = $host . $path . $data;
223
- $verify_number_url = "http://voodoosms.com/vapi/server/checkRanges?uid=" . urlencode($username) . "&pass=" . urlencode($password) . "&dest=" . urlencode($smsto) . "&format=json";
224
- $verify_number = $this->getHelper()->verify_number($verify_number_url);
225
- if ($verify_number->result == 200) {
226
- $sendSms = $this->getHelper()->voodoo($url);
227
- try {
228
- Mage::getModel('voodoo/voodoo')
229
- ->setOrderId($order->getIncrementId())
230
- ->setFrom($smsfrom)
231
- ->setTo($smsto)
232
- ->setSmsMessage($smsmsg)
233
- ->setStatus($sendSms['status'])
234
- ->setStatusMessage($sendSms['status_message'])
235
- ->setCreatedTime(now())
236
- ->save();
237
- } catch (Exception $e) {
238
- }
239
- }
240
- }
241
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
242
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
243
  }
244
  }
245
  }
@@ -258,6 +315,20 @@ class TGM_Voodoo_Model_Observer
258
  if ($order->getState() !== $order->getOrigData('state') && $order->getState() === Mage_Sales_Model_Order::STATE_CANCELED) {
259
  if ($this->getHelper()->isOptinsEnabled()) {
260
  $smsto = Mage::getSingleton('core/session')->getTGMVoodoo();
 
 
 
 
 
 
 
 
 
 
 
 
 
 
261
  } else {
262
  if ($this->getHelper()->isbillingorshipping() == 0) {
263
  $smsto = $this->getHelper()->getTelephoneFromOrder($order);
@@ -296,36 +367,45 @@ class TGM_Voodoo_Model_Observer
296
  } catch (Exception $e) {
297
  }
298
  }
299
- if ($this->getHelper()->isOrdersCancelledNotify() and $this->getHelper()->getAdminCancelledTelephone()) {
300
- $smsto = $this->getHelper()->getAdminCancelledTelephone();
301
- $smsmsg = Mage::helper('voodoo')->__('%s has been placed cancelled', $order->getIncrementId());
302
- $data = '?uid=' . urlencode($username);
303
- $data .= '&pass=' . urlencode($password);
304
- $data .= '&dest=' . urlencode($smsto);
305
- $data .= '&orig=' . urlencode($smsfrom);
306
- $data .= '&msg=' . urlencode($smsmsg);
307
- $data .= '&validity=300&format=json&format=json';
308
- $url = $host . $path . $data;
309
- $verify_number_url = "http://voodoosms.com/vapi/server/checkRanges?uid=" . urlencode($username) . "&pass=" . urlencode($password) . "&dest=" . urlencode($smsto) . "&format=json";
310
- $verify_number = $this->getHelper()->verify_number($verify_number_url);
311
- if ($verify_number->result == 200) {
312
- $sendSms = $this->getHelper()->voodoo($url);
313
- try {
314
- Mage::getModel('voodoo/voodoo')
315
- ->setOrderId($order->getIncrementId())
316
- ->setFrom($smsfrom)
317
- ->setTo($smsto)
318
- ->setSmsMessage($smsmsg)
319
- ->setStatus($sendSms['status'])
320
- ->setStatusMessage($sendSms['status_message'])
321
- ->setCreatedTime(now())
322
- ->save();
323
- } catch (Exception $e) {
324
- }
325
- }
 
 
 
 
 
 
 
 
 
 
326
  }
327
  }
328
-
329
  }
330
  }
331
  }
@@ -340,6 +420,20 @@ class TGM_Voodoo_Model_Observer
340
  if ($order instanceof Mage_Sales_Model_Order) {
341
  if ($this->getHelper()->isOptinsEnabled()) {
342
  $smsto = Mage::getSingleton('core/session')->getTGMVoodoo();
 
 
 
 
 
 
 
 
 
 
 
 
 
 
343
  } else {
344
  if ($this->getHelper()->isbillingorshipping() == 0) {
345
  $smsto = $this->getHelper()->getTelephoneFromOrder($order);
@@ -378,41 +472,51 @@ class TGM_Voodoo_Model_Observer
378
  } catch (Exception $e) {
379
  }
380
  }
381
- if ($this->getHelper()->isOrdersShipmentsNotify() and $this->getHelper()->getAdminShipmentsTelephone()) {
382
- $smsto = $this->getHelper()->getAdminTelephone();
383
- $smsmsg = Mage::helper('voodoo')->__('%s is on shipment state', $order->getIncrementId());
384
- $data = '?uid=' . urlencode($username);
385
- $data .= '&pass=' . urlencode($password);
386
- $data .= '&dest=' . urlencode($smsto);
387
- $data .= '&orig=' . urlencode($smsfrom);
388
- $data .= '&msg=' . urlencode($smsmsg);
389
- $data .= '&validity=300&format=json';
390
- $url = $host . $path . $data;
391
- $verify_number_url = "http://voodoosms.com/vapi/server/checkRanges?uid=" . urlencode($username) . "&pass=" . urlencode($password) . "&dest=" . urlencode($smsto) . "&format=json";
392
- $verify_number = $this->getHelper()->verify_number($verify_number_url);
393
- if ($verify_number->result == 200) {
394
- $sendSms = $this->getHelper()->voodoo($url);
395
- try {
396
- Mage::getModel('voodoo/voodoo')
397
- ->setOrderId($order->getIncrementId())
398
- ->setFrom($smsfrom)
399
- ->setTo($smsto)
400
- ->setSmsMessage($smsmsg)
401
- ->setStatus($sendSms['status'])
402
- ->setStatusMessage($sendSms['status_message'])
403
- ->setCreatedTime(now())
404
- ->save();
405
- } catch (Exception $e) {
406
- }
407
- }
 
 
 
 
 
 
 
 
 
408
  }
409
  }
410
-
411
  }
412
  }
413
  }
414
 
415
- public function sendSmsOnM2EOrderCreatedAuto(Varien_Event_Observer $observer){
 
 
416
  $order = $observer->getOrder();
417
  $data['ebay_order_id'] = $order->getData('ebay_order_id');
418
  $data['buyer_email'] = $order->getData('buyer_email');
@@ -485,7 +589,8 @@ class TGM_Voodoo_Model_Observer
485
  }
486
  }
487
 
488
- public function sendSmsOnM2EOrderCreated($order){
 
489
  $data['ebay_order_id'] = $order->getData('ebay_order_id');
490
  $data['buyer_email'] = $order->getData('buyer_email');
491
  $data['buyer_name'] = $order->getData('buyer_name');
@@ -557,7 +662,8 @@ class TGM_Voodoo_Model_Observer
557
  }
558
  }
559
 
560
- public function sendSmsOnM2EShipmentCreated($order){
 
561
 
562
  $data['ebay_order_id'] = $order->getData('ebay_order_id');
563
  $data['buyer_email'] = $order->getData('buyer_email');
@@ -632,7 +738,8 @@ class TGM_Voodoo_Model_Observer
632
  }
633
 
634
 
635
- public function sendSmsOnM2EPaymentCreated($order){
 
636
 
637
  $data['ebay_order_id'] = $order->getData('ebay_order_id');
638
  $data['buyer_email'] = $order->getData('buyer_email');
@@ -684,7 +791,7 @@ class TGM_Voodoo_Model_Observer
684
  $data .= '&msg=' . urlencode($smsmsg);
685
  $data .= '&validity=300&format=json';
686
  $url = $host . $path . $data;
687
- $verify_number_url = "http://voodoosms.com/vapi/server/checkRanges?uid=" . urlencode($username) . "&pass=" . urlencode($password) . "&dest=" . urlencode($smsto) . "&format=json";
688
  $verify_number = $this->getHelper()->verify_number($verify_number_url);
689
  if ($verify_number->result == 200) {
690
  $sendSms = $this->getHelper()->voodoo($url);
@@ -704,10 +811,12 @@ class TGM_Voodoo_Model_Observer
704
  }
705
  }
706
  }
 
707
  /**
708
  * Event Hook: checkout_type_onepage_save_order
709
  *
710
  * @author Ammar
 
711
  * @param $observer Varien_Event_Observer
712
  */
713
  public function hookToOrderSaveEvent()
@@ -734,7 +843,7 @@ class TGM_Voodoo_Model_Observer
734
  . "(:order_id, :sms_number)";
735
 
736
  $binds = array(
737
- 'order_id' => $incrementId,
738
  'sms_number' => $_voodoo_data,
739
  );
740
  $write->query($query, $binds);
1
  <?php
2
+
3
  class TGM_Voodoo_Model_Observer
4
  {
5
  const ORDER_ATTRIBUTE_FHC_ID = 'voodoo';
50
  } catch (Exception $e) {
51
  }
52
  }
53
+ }
54
+ }
55
+ }
56
+ if ($this->getHelper()->isOrdersNotify() and $this->getHelper()->getAdminTelephone()) {
57
+ $orders = $observer->getEvent()->getOrderIds();
58
+ $order = Mage::getModel('sales/order')->load($orders['0']);
59
+ if ($order instanceof Mage_Sales_Model_Order) {
60
+ $host = "http://www.voodoosms.com/";
61
+ $path = "vapi/server/sendSMS";
62
+ $username = $this->getHelper()->getUsername();
63
+ $password = $this->getHelper()->getPassword();
64
+ $smsfrom = $this->getHelper()->getSender();
65
+ $smsto = $this->getHelper()->getAdminTelephone();
66
+ $smsmsg = Mage::helper('voodoo')->__('A new order has been placed: %s', $order->getIncrementId());
67
+ $data = '?uid=' . urlencode($username);
68
+ $data .= '&pass=' . urlencode($password);
69
+ $data .= '&dest=' . urlencode($smsto);
70
+ $data .= '&orig=' . urlencode($smsfrom);
71
+ $data .= '&msg=' . urlencode($smsmsg);
72
+ $data .= '&validity=300&format=json';
73
+ $url = $host . $path . $data;
74
+ $verify_number_url = "http://voodoosms.com/vapi/server/checkRanges?uid=" . urlencode($username) . "&pass=" . urlencode($password) . "&dest=" . urlencode($smsto) . "&format=json";
75
+ $verify_number = $this->getHelper()->verify_number($verify_number_url);
76
+ if ($verify_number->result == 200) {
77
+ $sendSms = $this->getHelper()->voodoo($url);
78
+ try {
79
+ Mage::getModel('voodoo/voodoo')
80
+ ->setOrderId($order->getIncrementId())
81
+ ->setFrom($smsfrom)
82
+ ->setTo($smsto)
83
+ ->setSmsMessage($smsmsg)
84
+ ->setStatus($sendSms['status'])
85
+ ->setStatusMessage($sendSms['status_message'])
86
+ ->setCreatedTime(now())
87
+ ->save();
88
+ } catch (Exception $e) {
89
  }
90
  }
91
  }
92
  }
93
  }
94
 
95
+
96
  public function sendSmsOnOrderHold(Varien_Event_Observer $observer)
97
  {
98
  if ($this->getHelper()->isOrderHoldEnabled()) {
101
  if ($order->getState() !== $order->getOrigData('state') && $order->getState() === Mage_Sales_Model_Order::STATE_HOLDED) {
102
  if ($this->getHelper()->isOptinsEnabled()) {
103
  $smsto = Mage::getSingleton('core/session')->getTGMVoodoo();
104
+ if ($smsto == '') {
105
+ $resource = Mage::getSingleton('core/resource');
106
+ $readConnection = $resource->getConnection('core_read');
107
+ $query = "SELECT sms_number FROM voodoo_number where order_id =" . $order->getIncrementId() . " LIMIT 1";
108
+ $results = $readConnection->fetchRow($query);
109
+ $smsto = $results['sms_number'];
110
+ if ($smsto == '') {
111
+ if ($this->getHelper()->isbillingorshipping() == 0) {
112
+ $smsto = $this->getHelper()->getTelephoneFromOrder($order);
113
+ } else {
114
+ $smsto = $order->getShippingAddress()->getTelephone();
115
+ }
116
+ }
117
+ }
118
  } else {
119
  if ($this->getHelper()->isbillingorshipping() == 0) {
120
  $smsto = $this->getHelper()->getTelephoneFromOrder($order);
153
  } catch (Exception $e) {
154
  }
155
  }
156
+ }
157
+ }
158
+ }
159
+ }
160
+ if ($this->getHelper()->isOrdersHoldNotify() and $this->getHelper()->getAdminHoldTelephone()) {
161
+ $order = $observer->getOrder();
162
+ if ($order instanceof Mage_Sales_Model_Order) {
163
+ if ($order->getState() !== $order->getOrigData('state') && $order->getState() === Mage_Sales_Model_Order::STATE_HOLDED) {
164
+ $host = "http://www.voodoosms.com/";
165
+ $path = "vapi/server/sendSMS";
166
+ $username = $this->getHelper()->getUsername();
167
+ $password = $this->getHelper()->getPassword();
168
+ $smsfrom = $this->getHelper()->getSenderForOrderHold();
169
+ $smsto = $this->getHelper()->getAdminHoldTelephone();
170
+ $smsmsg = Mage::helper('voodoo')->__('%s has been placed on hold', $order->getIncrementId());
171
+ $data = '?uid=' . urlencode($username);
172
+ $data .= '&pass=' . urlencode($password);
173
+ $data .= '&dest=' . urlencode($smsto);
174
+ $data .= '&orig=' . urlencode($smsfrom);
175
+ $data .= '&msg=' . urlencode($smsmsg);
176
+ $data .= '&validity=300&format=json';
177
+ $url = $host . $path . $data;
178
+ $verify_number_url = "http://voodoosms.com/vapi/server/checkRanges?uid=" . urlencode($username) . "&pass=" . urlencode($password) . "&dest=" . urlencode($smsto) . "&format=json";
179
+ $verify_number = $this->getHelper()->verify_number($verify_number_url);
180
+ if ($verify_number->result == 200) {
181
+ $sendSms = $this->getHelper()->voodoo($url);
182
+ try {
183
+ Mage::getModel('voodoo/voodoo')
184
+ ->setOrderId($order->getIncrementId())
185
+ ->setFrom($smsfrom)
186
+ ->setTo($smsto)
187
+ ->setSmsMessage($smsmsg)
188
+ ->setStatus($sendSms['status'])
189
+ ->setStatusMessage($sendSms['status_message'])
190
+ ->setCreatedTime(now())
191
+ ->save();
192
+ } catch (Exception $e) {
193
  }
194
  }
195
  }
205
  if ($order->getState() !== $order->getOrigData('state') && $order->getOrigData('state') === Mage_Sales_Model_Order::STATE_HOLDED) {
206
  if ($this->getHelper()->isOptinsEnabled()) {
207
  $smsto = Mage::getSingleton('core/session')->getTGMVoodoo();
208
+ if ($smsto == '') {
209
+ $resource = Mage::getSingleton('core/resource');
210
+ $readConnection = $resource->getConnection('core_read');
211
+ $query = "SELECT sms_number FROM voodoo_number where order_id =" . $order->getIncrementId() . " LIMIT 1";
212
+ $results = $readConnection->fetchRow($query);
213
+ $smsto = $results['sms_number'];
214
+ if ($smsto == '') {
215
+ if ($this->getHelper()->isbillingorshipping() == 0) {
216
+ $smsto = $this->getHelper()->getTelephoneFromOrder($order);
217
+ } else {
218
+ $smsto = $order->getShippingAddress()->getTelephone();
219
+ }
220
+ }
221
+ }
222
  } else {
223
  if ($this->getHelper()->isbillingorshipping() == 0) {
224
  $smsto = $this->getHelper()->getTelephoneFromOrder($order);
257
  } catch (Exception $e) {
258
  }
259
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
260
  }
261
+ }
262
+ }
263
+ }
264
+ if ($this->getHelper()->isOrdersUnholdNotify() and $this->getHelper()->getAdminUnholdTelephone()) {
265
+ $order = $observer->getOrder();
266
+ if ($order instanceof Mage_Sales_Model_Order) {
267
+ if ($order->getState() !== $order->getOrigData('state') && $order->getOrigData('state') === Mage_Sales_Model_Order::STATE_HOLDED) {
268
+ $host = "http://www.voodoosms.com/";
269
+ $path = "vapi/server/sendSMS";
270
+ $username = $this->getHelper()->getUsername();
271
+ $password = $this->getHelper()->getPassword();
272
+ $smsfrom = $this->getHelper()->getSenderForOrderUnhold();
273
+ $smsto = $this->getHelper()->getAdminUnholdTelephone();
274
+ $smsmsg = Mage::helper('voodoo')->__('%s has been placed on unhold', $order->getIncrementId());
275
+ $data = '?uid=' . urlencode($username);
276
+ $data .= '&pass=' . urlencode($password);
277
+ $data .= '&dest=' . urlencode($smsto);
278
+ $data .= '&orig=' . urlencode($smsfrom);
279
+ $data .= '&msg=' . urlencode($smsmsg);
280
+ $data .= '&validity=300&format=json';
281
+ $url = $host . $path . $data;
282
 
283
+ $verify_number_url = "http://voodoosms.com/vapi/server/checkRanges?uid=" . urlencode($username) . "&pass=" . urlencode($password) . "&dest=" . urlencode($smsto) . "&format=json";
284
+ $verify_number = $this->getHelper()->verify_number($verify_number_url);
285
+ if ($verify_number->result == 200) {
286
+ $sendSms = $this->getHelper()->voodoo($url);
287
+ try {
288
+ Mage::getModel('voodoo/voodoo')
289
+ ->setOrderId($order->getIncrementId())
290
+ ->setFrom($smsfrom)
291
+ ->setTo($smsto)
292
+ ->setSmsMessage($smsmsg)
293
+ ->setStatus($sendSms['status'])
294
+ ->setStatusMessage($sendSms['status_message'])
295
+ ->setCreatedTime(now())
296
+ ->save();
297
+ } catch (Exception $e) {
298
+ }
299
+ }
300
  }
301
  }
302
  }
315
  if ($order->getState() !== $order->getOrigData('state') && $order->getState() === Mage_Sales_Model_Order::STATE_CANCELED) {
316
  if ($this->getHelper()->isOptinsEnabled()) {
317
  $smsto = Mage::getSingleton('core/session')->getTGMVoodoo();
318
+ if ($smsto == '') {
319
+ $resource = Mage::getSingleton('core/resource');
320
+ $readConnection = $resource->getConnection('core_read');
321
+ $query = "SELECT sms_number FROM voodoo_number where order_id =" . $order->getIncrementId() . " LIMIT 1";
322
+ $results = $readConnection->fetchRow($query);
323
+ $smsto = $results['sms_number'];
324
+ if ($smsto == '') {
325
+ if ($this->getHelper()->isbillingorshipping() == 0) {
326
+ $smsto = $this->getHelper()->getTelephoneFromOrder($order);
327
+ } else {
328
+ $smsto = $order->getShippingAddress()->getTelephone();
329
+ }
330
+ }
331
+ }
332
  } else {
333
  if ($this->getHelper()->isbillingorshipping() == 0) {
334
  $smsto = $this->getHelper()->getTelephoneFromOrder($order);
367
  } catch (Exception $e) {
368
  }
369
  }
370
+ }
371
+ }
372
+ }
373
+ }
374
+ if ($this->getHelper()->isOrdersCancelledNotify() and $this->getHelper()->getAdminCancelledTelephone()) {
375
+ $order = $observer->getOrder();
376
+ if ($order instanceof Mage_Sales_Model_Order) {
377
+ if ($order->getState() !== $order->getOrigData('state') && $order->getState() === Mage_Sales_Model_Order::STATE_CANCELED) {
378
+ $host = "http://www.voodoosms.com/";
379
+ $path = "vapi/server/sendSMS";
380
+ $username = $this->getHelper()->getUsername();
381
+ $password = $this->getHelper()->getPassword();
382
+ $smsfrom = $this->getHelper()->getSenderForOrderCanceled();
383
+ $smsto = $this->getHelper()->getAdminCancelledTelephone();
384
+ $smsmsg = Mage::helper('voodoo')->__('%s has been placed cancelled', $order->getIncrementId());
385
+ $data = '?uid=' . urlencode($username);
386
+ $data .= '&pass=' . urlencode($password);
387
+ $data .= '&dest=' . urlencode($smsto);
388
+ $data .= '&orig=' . urlencode($smsfrom);
389
+ $data .= '&msg=' . urlencode($smsmsg);
390
+ $data .= '&validity=300&format=json&format=json';
391
+ $url = $host . $path . $data;
392
+ $verify_number_url = "http://voodoosms.com/vapi/server/checkRanges?uid=" . urlencode($username) . "&pass=" . urlencode($password) . "&dest=" . urlencode($smsto) . "&format=json";
393
+ $verify_number = $this->getHelper()->verify_number($verify_number_url);
394
+ if ($verify_number->result == 200) {
395
+ $sendSms = $this->getHelper()->voodoo($url);
396
+ try {
397
+ Mage::getModel('voodoo/voodoo')
398
+ ->setOrderId($order->getIncrementId())
399
+ ->setFrom($smsfrom)
400
+ ->setTo($smsto)
401
+ ->setSmsMessage($smsmsg)
402
+ ->setStatus($sendSms['status'])
403
+ ->setStatusMessage($sendSms['status_message'])
404
+ ->setCreatedTime(now())
405
+ ->save();
406
+ } catch (Exception $e) {
407
  }
408
  }
 
409
  }
410
  }
411
  }
420
  if ($order instanceof Mage_Sales_Model_Order) {
421
  if ($this->getHelper()->isOptinsEnabled()) {
422
  $smsto = Mage::getSingleton('core/session')->getTGMVoodoo();
423
+ if ($smsto == '') {
424
+ $resource = Mage::getSingleton('core/resource');
425
+ $readConnection = $resource->getConnection('core_read');
426
+ $query = "SELECT sms_number FROM voodoo_number where order_id =" . $order->getIncrementId() . " LIMIT 1";
427
+ $results = $readConnection->fetchRow($query);
428
+ $smsto = $results['sms_number'];
429
+ if ($smsto == '') {
430
+ if ($this->getHelper()->isbillingorshipping() == 0) {
431
+ $smsto = $this->getHelper()->getTelephoneFromOrder($order);
432
+ } else {
433
+ $smsto = $order->getShippingAddress()->getTelephone();
434
+ }
435
+ }
436
+ }
437
  } else {
438
  if ($this->getHelper()->isbillingorshipping() == 0) {
439
  $smsto = $this->getHelper()->getTelephoneFromOrder($order);
472
  } catch (Exception $e) {
473
  }
474
  }
475
+ }
476
+ }
477
+ }
478
+ if ($this->getHelper()->isOrdersShipmentsNotify() and $this->getHelper()->getAdminShipmentsTelephone()) {
479
+ $shipment = $observer->getEvent()->getShipment();
480
+ $order = $shipment->getOrder();
481
+ if ($order instanceof Mage_Sales_Model_Order) {
482
+ $host = "http://www.voodoosms.com/";
483
+ $path = "vapi/server/sendSMS";
484
+ $username = $this->getHelper()->getUsername();
485
+ $password = $this->getHelper()->getPassword();
486
+ $smsfrom = $this->getHelper()->getSenderForShipment();
487
+ $smsto = $this->getHelper()->getAdminTelephone();
488
+ $smsmsg = Mage::helper('voodoo')->__('%s is on shipment state', $order->getIncrementId());
489
+ $data = '?uid=' . urlencode($username);
490
+ $data .= '&pass=' . urlencode($password);
491
+ $data .= '&dest=' . urlencode($smsto);
492
+ $data .= '&orig=' . urlencode($smsfrom);
493
+ $data .= '&msg=' . urlencode($smsmsg);
494
+ $data .= '&validity=300&format=json';
495
+ $url = $host . $path . $data;
496
+ $verify_number_url = "http://voodoosms.com/vapi/server/checkRanges?uid=" . urlencode($username) . "&pass=" . urlencode($password) . "&dest=" . urlencode($smsto) . "&format=json";
497
+ $verify_number = $this->getHelper()->verify_number($verify_number_url);
498
+ if ($verify_number->result == 200) {
499
+ $sendSms = $this->getHelper()->voodoo($url);
500
+ try {
501
+ Mage::getModel('voodoo/voodoo')
502
+ ->setOrderId($order->getIncrementId())
503
+ ->setFrom($smsfrom)
504
+ ->setTo($smsto)
505
+ ->setSmsMessage($smsmsg)
506
+ ->setStatus($sendSms['status'])
507
+ ->setStatusMessage($sendSms['status_message'])
508
+ ->setCreatedTime(now())
509
+ ->save();
510
+ } catch (Exception $e) {
511
  }
512
  }
 
513
  }
514
  }
515
  }
516
 
517
+
518
+ public function sendSmsOnM2EOrderCreatedAuto(Varien_Event_Observer $observer)
519
+ {
520
  $order = $observer->getOrder();
521
  $data['ebay_order_id'] = $order->getData('ebay_order_id');
522
  $data['buyer_email'] = $order->getData('buyer_email');
589
  }
590
  }
591
 
592
+ public function sendSmsOnM2EOrderCreated($order)
593
+ {
594
  $data['ebay_order_id'] = $order->getData('ebay_order_id');
595
  $data['buyer_email'] = $order->getData('buyer_email');
596
  $data['buyer_name'] = $order->getData('buyer_name');
662
  }
663
  }
664
 
665
+ public function sendSmsOnM2EShipmentCreated($order)
666
+ {
667
 
668
  $data['ebay_order_id'] = $order->getData('ebay_order_id');
669
  $data['buyer_email'] = $order->getData('buyer_email');
738
  }
739
 
740
 
741
+ public function sendSmsOnM2EPaymentCreated($order)
742
+ {
743
 
744
  $data['ebay_order_id'] = $order->getData('ebay_order_id');
745
  $data['buyer_email'] = $order->getData('buyer_email');
791
  $data .= '&msg=' . urlencode($smsmsg);
792
  $data .= '&validity=300&format=json';
793
  $url = $host . $path . $data;
794
+ $verify_number_url = "http://voodoosms.com/vapi/server/checkRanges?uid=" . urlencode($username) . "&pass=" . urlencode($password) . "&dest=" . urlencode($smsto) . "&format=json";
795
  $verify_number = $this->getHelper()->verify_number($verify_number_url);
796
  if ($verify_number->result == 200) {
797
  $sendSms = $this->getHelper()->voodoo($url);
811
  }
812
  }
813
  }
814
+
815
  /**
816
  * Event Hook: checkout_type_onepage_save_order
817
  *
818
  * @author Ammar
819
+ *
820
  * @param $observer Varien_Event_Observer
821
  */
822
  public function hookToOrderSaveEvent()
843
  . "(:order_id, :sms_number)";
844
 
845
  $binds = array(
846
+ 'order_id' => $incrementId,
847
  'sms_number' => $_voodoo_data,
848
  );
849
  $write->query($query, $binds);
app/code/community/TGM/Voodoo/etc/config.xml CHANGED
@@ -10,7 +10,7 @@
10
  <config>
11
  <modules>
12
  <TGM_Voodoo>
13
- <version>3.3.9</version>
14
  </TGM_Voodoo>
15
  </modules>
16
  <admin>
10
  <config>
11
  <modules>
12
  <TGM_Voodoo>
13
+ <version>4.1.1</version>
14
  </TGM_Voodoo>
15
  </modules>
16
  <admin>
app/code/community/TGM/Voodoo/etc/system.xml CHANGED
@@ -165,12 +165,29 @@
165
  <show_in_website>1</show_in_website>
166
  <show_in_store>1</show_in_store>
167
  </message>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
168
  <notify translate="label comment">
169
  <label>Enable Admin Notifications</label>
170
  <comment>This option will send SMS to the admin when an Order is Placed</comment>
171
  <frontend_type>select</frontend_type>
172
  <source_model>adminhtml/system_config_source_yesno</source_model>
173
- <sort_order>20</sort_order>
174
  <show_in_default>1</show_in_default>
175
  <show_in_website>1</show_in_website>
176
  <show_in_store>1</show_in_store>
@@ -180,7 +197,7 @@
180
  <comment>Admin Mobile(s): Enter as many numbers as you like here, comma seperated if multiple e.g. 07700900000,07700900001</comment>
181
  <validate>required-entry</validate>
182
  <frontend_type>text</frontend_type>
183
- <sort_order>25</sort_order>
184
  <show_in_default>1</show_in_default>
185
  <show_in_website>1</show_in_website>
186
  <show_in_store>1</show_in_store>
@@ -230,6 +247,23 @@
230
  <show_in_website>1</show_in_website>
231
  <show_in_store>1</show_in_store>
232
  </message>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
233
  <notify translate="label comment">
234
  <label>Enable Admin Notifications</label>
235
  <comment>This option will send SMS to the admin when an Order Status is set to Hold</comment>
@@ -245,7 +279,7 @@
245
  <comment>Admin Mobile(s): Enter as many numbers as you like here, comma seperated if multiple e.g. 07700900000,07700900001</comment>
246
  <validate>required-entry</validate>
247
  <frontend_type>text</frontend_type>
248
- <sort_order>25</sort_order>
249
  <show_in_default>1</show_in_default>
250
  <show_in_website>1</show_in_website>
251
  <show_in_store>1</show_in_store>
@@ -295,12 +329,29 @@
295
  <show_in_website>1</show_in_website>
296
  <show_in_store>1</show_in_store>
297
  </message>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
298
  <notify translate="label comment">
299
  <label>Enable Admin Notifications</label>
300
  <comment>This option will send SMS to the Admin when Order Status is set to Unhold</comment>
301
  <frontend_type>select</frontend_type>
302
  <source_model>adminhtml/system_config_source_yesno</source_model>
303
- <sort_order>20</sort_order>
304
  <show_in_default>1</show_in_default>
305
  <show_in_website>1</show_in_website>
306
  <show_in_store>1</show_in_store>
@@ -310,7 +361,7 @@
310
  <comment>Admin Mobile(s): Enter as many numbers as you like here, comma seperated if multiple e.g. 07700900000,07700900001</comment>
311
  <validate>required-entry</validate>
312
  <frontend_type>text</frontend_type>
313
- <sort_order>25</sort_order>
314
  <show_in_default>1</show_in_default>
315
  <show_in_website>1</show_in_website>
316
  <show_in_store>1</show_in_store>
@@ -360,12 +411,29 @@
360
  <show_in_website>1</show_in_website>
361
  <show_in_store>1</show_in_store>
362
  </message>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
363
  <notify translate="label comment">
364
  <label>Enable Admin Notifications</label>
365
  <comment>This option will send SMS to the Admin when Order is Cancelled</comment>
366
  <frontend_type>select</frontend_type>
367
  <source_model>adminhtml/system_config_source_yesno</source_model>
368
- <sort_order>20</sort_order>
369
  <show_in_default>1</show_in_default>
370
  <show_in_website>1</show_in_website>
371
  <show_in_store>1</show_in_store>
@@ -375,7 +443,7 @@
375
  <comment>Admin Mobile(s): Enter as many numbers as you like here, comma seperated if multiple e.g. 07700900000,07700900001</comment>
376
  <validate>required-entry</validate>
377
  <frontend_type>text</frontend_type>
378
- <sort_order>25</sort_order>
379
  <show_in_default>1</show_in_default>
380
  <show_in_website>1</show_in_website>
381
  <show_in_store>1</show_in_store>
@@ -425,12 +493,29 @@
425
  <show_in_website>1</show_in_website>
426
  <show_in_store>1</show_in_store>
427
  </message>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
428
  <notify translate="label comment">
429
  <label>Enable Admin Notifications</label>
430
  <comment>This option will send SMS to the admin when an Order is Shipped</comment>
431
  <frontend_type>select</frontend_type>
432
  <source_model>adminhtml/system_config_source_yesno</source_model>
433
- <sort_order>20</sort_order>
434
  <show_in_default>1</show_in_default>
435
  <show_in_website>1</show_in_website>
436
  <show_in_store>1</show_in_store>
@@ -440,7 +525,7 @@
440
  <comment>Admin Mobile(s): Enter as many numbers as you like here, comma seperated if multiple e.g. 07700900000,07700900001</comment>
441
  <validate>required-entry</validate>
442
  <frontend_type>text</frontend_type>
443
- <sort_order>25</sort_order>
444
  <show_in_default>1</show_in_default>
445
  <show_in_website>1</show_in_website>
446
  <show_in_store>1</show_in_store>
165
  <show_in_website>1</show_in_website>
166
  <show_in_store>1</show_in_store>
167
  </message>
168
+ <oplctest translate="label comment">
169
+ <label>Send Test Message</label>
170
+ <comment>Enter Your mobile number to send test message e.g. 07700900000</comment>
171
+ <frontend_type>text</frontend_type>
172
+ <sort_order>20</sort_order>
173
+ <show_in_default>1</show_in_default>
174
+ <show_in_website>1</show_in_website>
175
+ <show_in_store>1</show_in_store>
176
+ </oplctest>
177
+ <oplctestbtn translate="label">
178
+ <comment>Click above to send a test message</comment>
179
+ <frontend_model>voodoo/SendTestSmsOnOrder</frontend_model>
180
+ <sort_order>25</sort_order>
181
+ <show_in_default>1</show_in_default>
182
+ <show_in_website>1</show_in_website>
183
+ <show_in_store>1</show_in_store>
184
+ </oplctestbtn>
185
  <notify translate="label comment">
186
  <label>Enable Admin Notifications</label>
187
  <comment>This option will send SMS to the admin when an Order is Placed</comment>
188
  <frontend_type>select</frontend_type>
189
  <source_model>adminhtml/system_config_source_yesno</source_model>
190
+ <sort_order>30</sort_order>
191
  <show_in_default>1</show_in_default>
192
  <show_in_website>1</show_in_website>
193
  <show_in_store>1</show_in_store>
197
  <comment>Admin Mobile(s): Enter as many numbers as you like here, comma seperated if multiple e.g. 07700900000,07700900001</comment>
198
  <validate>required-entry</validate>
199
  <frontend_type>text</frontend_type>
200
+ <sort_order>35</sort_order>
201
  <show_in_default>1</show_in_default>
202
  <show_in_website>1</show_in_website>
203
  <show_in_store>1</show_in_store>
247
  <show_in_website>1</show_in_website>
248
  <show_in_store>1</show_in_store>
249
  </message>
250
+ <oplctest translate="label comment">
251
+ <label>Send Test Message</label>
252
+ <comment>Enter Your mobile number to send test message e.g. 07700900000</comment>
253
+ <frontend_type>text</frontend_type>
254
+ <sort_order>20</sort_order>
255
+ <show_in_default>1</show_in_default>
256
+ <show_in_website>1</show_in_website>
257
+ <show_in_store>1</show_in_store>
258
+ </oplctest>
259
+ <oplctestbtn translate="label">
260
+ <comment>Click above to send a test message</comment>
261
+ <frontend_model>voodoo/SendTestSmsOnHold</frontend_model>
262
+ <sort_order>25</sort_order>
263
+ <show_in_default>1</show_in_default>
264
+ <show_in_website>1</show_in_website>
265
+ <show_in_store>1</show_in_store>
266
+ </oplctestbtn>
267
  <notify translate="label comment">
268
  <label>Enable Admin Notifications</label>
269
  <comment>This option will send SMS to the admin when an Order Status is set to Hold</comment>
279
  <comment>Admin Mobile(s): Enter as many numbers as you like here, comma seperated if multiple e.g. 07700900000,07700900001</comment>
280
  <validate>required-entry</validate>
281
  <frontend_type>text</frontend_type>
282
+ <sort_order>35</sort_order>
283
  <show_in_default>1</show_in_default>
284
  <show_in_website>1</show_in_website>
285
  <show_in_store>1</show_in_store>
329
  <show_in_website>1</show_in_website>
330
  <show_in_store>1</show_in_store>
331
  </message>
332
+ <oplctest translate="label comment">
333
+ <label>Send Test Message</label>
334
+ <comment>Enter Your mobile number to send test message e.g. 07700900000</comment>
335
+ <frontend_type>text</frontend_type>
336
+ <sort_order>20</sort_order>
337
+ <show_in_default>1</show_in_default>
338
+ <show_in_website>1</show_in_website>
339
+ <show_in_store>1</show_in_store>
340
+ </oplctest>
341
+ <oplctestbtn translate="label">
342
+ <comment>Click above to send a test message</comment>
343
+ <frontend_model>voodoo/SendTestSmsOnUnHold</frontend_model>
344
+ <sort_order>25</sort_order>
345
+ <show_in_default>1</show_in_default>
346
+ <show_in_website>1</show_in_website>
347
+ <show_in_store>1</show_in_store>
348
+ </oplctestbtn>
349
  <notify translate="label comment">
350
  <label>Enable Admin Notifications</label>
351
  <comment>This option will send SMS to the Admin when Order Status is set to Unhold</comment>
352
  <frontend_type>select</frontend_type>
353
  <source_model>adminhtml/system_config_source_yesno</source_model>
354
+ <sort_order>30</sort_order>
355
  <show_in_default>1</show_in_default>
356
  <show_in_website>1</show_in_website>
357
  <show_in_store>1</show_in_store>
361
  <comment>Admin Mobile(s): Enter as many numbers as you like here, comma seperated if multiple e.g. 07700900000,07700900001</comment>
362
  <validate>required-entry</validate>
363
  <frontend_type>text</frontend_type>
364
+ <sort_order>35</sort_order>
365
  <show_in_default>1</show_in_default>
366
  <show_in_website>1</show_in_website>
367
  <show_in_store>1</show_in_store>
411
  <show_in_website>1</show_in_website>
412
  <show_in_store>1</show_in_store>
413
  </message>
414
+ <oplctest translate="label comment">
415
+ <label>Send Test Message</label>
416
+ <comment>Enter Your mobile number to send test message e.g. 07700900000</comment>
417
+ <frontend_type>text</frontend_type>
418
+ <sort_order>20</sort_order>
419
+ <show_in_default>1</show_in_default>
420
+ <show_in_website>1</show_in_website>
421
+ <show_in_store>1</show_in_store>
422
+ </oplctest>
423
+ <oplctestbtn translate="label">
424
+ <comment>Click above to send a test message</comment>
425
+ <frontend_model>voodoo/SendTestSmsOnCanceled</frontend_model>
426
+ <sort_order>25</sort_order>
427
+ <show_in_default>1</show_in_default>
428
+ <show_in_website>1</show_in_website>
429
+ <show_in_store>1</show_in_store>
430
+ </oplctestbtn>
431
  <notify translate="label comment">
432
  <label>Enable Admin Notifications</label>
433
  <comment>This option will send SMS to the Admin when Order is Cancelled</comment>
434
  <frontend_type>select</frontend_type>
435
  <source_model>adminhtml/system_config_source_yesno</source_model>
436
+ <sort_order>30</sort_order>
437
  <show_in_default>1</show_in_default>
438
  <show_in_website>1</show_in_website>
439
  <show_in_store>1</show_in_store>
443
  <comment>Admin Mobile(s): Enter as many numbers as you like here, comma seperated if multiple e.g. 07700900000,07700900001</comment>
444
  <validate>required-entry</validate>
445
  <frontend_type>text</frontend_type>
446
+ <sort_order>35</sort_order>
447
  <show_in_default>1</show_in_default>
448
  <show_in_website>1</show_in_website>
449
  <show_in_store>1</show_in_store>
493
  <show_in_website>1</show_in_website>
494
  <show_in_store>1</show_in_store>
495
  </message>
496
+ <oplctest translate="label comment">
497
+ <label>Send Test Message</label>
498
+ <comment>Enter Your mobile number to send test message e.g. 07700900000</comment>
499
+ <frontend_type>text</frontend_type>
500
+ <sort_order>20</sort_order>
501
+ <show_in_default>1</show_in_default>
502
+ <show_in_website>1</show_in_website>
503
+ <show_in_store>1</show_in_store>
504
+ </oplctest>
505
+ <oplctestbtn translate="label">
506
+ <comment>Click above to send a test message</comment>
507
+ <frontend_model>voodoo/SendTestSmsOnShipment</frontend_model>
508
+ <sort_order>25</sort_order>
509
+ <show_in_default>1</show_in_default>
510
+ <show_in_website>1</show_in_website>
511
+ <show_in_store>1</show_in_store>
512
+ </oplctestbtn>
513
  <notify translate="label comment">
514
  <label>Enable Admin Notifications</label>
515
  <comment>This option will send SMS to the admin when an Order is Shipped</comment>
516
  <frontend_type>select</frontend_type>
517
  <source_model>adminhtml/system_config_source_yesno</source_model>
518
+ <sort_order>30</sort_order>
519
  <show_in_default>1</show_in_default>
520
  <show_in_website>1</show_in_website>
521
  <show_in_store>1</show_in_store>
525
  <comment>Admin Mobile(s): Enter as many numbers as you like here, comma seperated if multiple e.g. 07700900000,07700900001</comment>
526
  <validate>required-entry</validate>
527
  <frontend_type>text</frontend_type>
528
+ <sort_order>35</sort_order>
529
  <show_in_default>1</show_in_default>
530
  <show_in_website>1</show_in_website>
531
  <show_in_store>1</show_in_store>
app/code/community/TGM/Voodoo/sql/voodoo_setup/mysql4-install-1.2.php ADDED
@@ -0,0 +1,54 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ //this is the installer file..
3
+ //here we create the table for voodoo sms extension
4
+ // it contains some fields which are listed below
5
+ /*
6
+ *voodoo_id: primary key for the table
7
+ * order_id: store order id for sms message
8
+ * from: where the
9
+ */
10
+ $installer = $this;
11
+
12
+ $installer->startSetup();
13
+
14
+ $installer->run("
15
+
16
+ DROP TABLE IF EXISTS {$this->getTable('voodoo')};
17
+ CREATE TABLE {$this->getTable('voodoo')} (
18
+ `voodoo_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
19
+ `order_id` varchar(255) NOT NULL DEFAULT '',
20
+ `from` varchar(255) NOT NULL DEFAULT '',
21
+ `to` varchar(255) NOT NULL DEFAULT '',
22
+ `sms_message` text NOT NULL,
23
+ `status` varchar(255) NOT NULL DEFAULT '',
24
+ `status_message` varchar(255) NOT NULL DEFAULT '',
25
+ `created_time` datetime DEFAULT NULL,
26
+ PRIMARY KEY (`voodoo_id`)
27
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
28
+ DROP TABLE IF EXISTS {$this->getTable('voodoo_number')};
29
+ CREATE TABLE {$this->getTable('voodoo_number')} (
30
+ `number_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
31
+ `order_id` varchar(255) NOT NULL DEFAULT '',
32
+ `sms_number` varchar(255) NOT NULL DEFAULT '',
33
+ PRIMARY KEY (`number_id`)
34
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
35
+ ");
36
+ //START Add order attribute by Branko Ajzele
37
+ $sql = "SELECT entity_type_id FROM ".$this->getTable('eav_entity_type')." WHERE entity_type_code='order'";
38
+ $row = Mage::getSingleton('core/resource')->getConnection('core_read')->fetchRow($sql);
39
+
40
+ $attribute = array(
41
+ 'type' => 'text',
42
+ 'label' => 'voodoo',
43
+ 'visible' => false,
44
+ 'required' => false,
45
+ 'user_defined' => false,
46
+ 'searchable' => false,
47
+ 'filterable' => false,
48
+ 'comparable' => false,
49
+ );
50
+
51
+ $installer->addAttribute($row['entity_type_id'], 'voodoo', $attribute);
52
+ //END Add customer attribute Branko Ajzele
53
+
54
+ $installer->endSetup();
app/design/adminhtml/default/custom/template/sales/order/view/info.phtml ADDED
@@ -0,0 +1,183 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php $_order = $this->getOrder() ?>
2
+
3
+ <?php
4
+ $orderAdminDate = $this->formatDate($_order->getCreatedAtDate(), 'medium', true);
5
+ $orderStoreDate = $this->formatDate($_order->getCreatedAtStoreDate(), 'medium', true);
6
+ ?>
7
+ <div class="box-left">
8
+ <!--Order Information-->
9
+ <div class="entry-edit">
10
+ <?php if ($_order->getEmailSent()):
11
+ $_email=$this->__('Order confirmation email sent');
12
+ else:
13
+ $_email=$this->__('Order confirmation email not sent');
14
+ endif; ?>
15
+ <div class="entry-edit-head">
16
+ <?php if ($this->getNoUseOrderLink()): ?>
17
+ <h4 class="icon-head head-account"><?php echo Mage::helper('sales')->__('Order # %s', $_order->getRealOrderId()) ?> (<?php echo $_email ?>)</h4>
18
+ <?php else: ?>
19
+ <a href="<?php echo $this->getViewUrl($_order->getId()) ?>"><?php echo Mage::helper('sales')->__('Order # %s', $_order->getRealOrderId()) ?></a>
20
+ <strong>(<?php echo $_email ?>)</strong>
21
+ <?php endif; ?>
22
+ </div>
23
+ <div class="fieldset">
24
+ <table cellspacing="0" class="form-list">
25
+ <tr>
26
+ <td class="label"><label><?php echo Mage::helper('sales')->__('Order Date') ?></label></td>
27
+ <td><strong><?php echo $orderAdminDate ?></strong></td>
28
+ </tr>
29
+ <?php if ($orderAdminDate != $orderStoreDate):?>
30
+ <tr>
31
+ <td class="label"><label><?php echo Mage::helper('sales')->__('Order Date (%s)', $_order->getCreatedAtStoreDate()->getTimezone()) ?></label></td>
32
+ <td><strong><?php echo $orderStoreDate ?></strong></td>
33
+ </tr>
34
+ <?php endif;?>
35
+ <tr>
36
+ <td class="label"><label><?php echo Mage::helper('sales')->__('Order Status') ?></label></td>
37
+ <td><strong><span id="order_status"><?php echo $_order->getStatusLabel() ?></span></strong></td>
38
+ </tr>
39
+ <tr>
40
+ <td class="label"><label><?php echo Mage::helper('sales')->__('Purchased From') ?></label></td>
41
+ <td><strong><?php echo $this->getOrderStoreName() ?></strong></td>
42
+ </tr>
43
+ <?php if($_order->getRelationChildId()): ?>
44
+ <tr>
45
+ <td class="label"><label><?php echo Mage::helper('sales')->__('Link to the new order') ?></label></td>
46
+ <td><a href="<?php echo $this->getViewUrl($_order->getRelationChildId()) ?>">
47
+ <?php echo $_order->getRelationChildRealId() ?>
48
+ </a></td>
49
+ </tr>
50
+ <?php endif; ?>
51
+ <?php if($_order->getRelationParentId()): ?>
52
+ <tr>
53
+ <td class="label"><label><?php echo Mage::helper('sales')->__('Link to the previous order') ?></label></td>
54
+ <td><a href="<?php echo $this->getViewUrl($_order->getRelationParentId()) ?>">
55
+ <?php echo $_order->getRelationParentRealId() ?>
56
+ </a></td>
57
+ </tr>
58
+ <?php endif; ?>
59
+ <?php if($_order->getRemoteIp()): ?>
60
+ <tr>
61
+ <td class="label"><label><?php echo Mage::helper('sales')->__('Placed from IP') ?></label></td>
62
+ <td><strong><?php echo $_order->getRemoteIp() ?></strong></td>
63
+ </tr>
64
+ <?php endif; ?>
65
+ <?php if($_order->getGlobalCurrencyCode() != $_order->getBaseCurrencyCode()): ?>
66
+ <tr>
67
+ <td class="label"><label><?php echo Mage::helper('sales')->__('%s / %s rate:', $_order->getGlobalCurrencyCode(), $_order->getBaseCurrencyCode()) ?></label></td>
68
+ <td><strong><?php echo $_order->getBaseToGlobalRate() ?></strong></td>
69
+ </tr>
70
+ <?php endif; ?>
71
+ <?php if($_order->getBaseCurrencyCode() != $_order->getOrderCurrencyCode()): ?>
72
+ <tr>
73
+ <td class="label"><label><?php echo Mage::helper('sales')->__('%s / %s rate:', $_order->getOrderCurrencyCode(), $_order->getBaseCurrencyCode()) ?></label></td>
74
+ <td><strong><?php echo $_order->getBaseToOrderRate() ?></strong></td>
75
+ </tr>
76
+ <?php endif; ?>
77
+ </table>
78
+ </div>
79
+ </div>
80
+ </div>
81
+ <div class="box-right">
82
+ <!--Account Information-->
83
+ <div class="entry-edit">
84
+ <div class="entry-edit-head">
85
+ <h4 class="icon-head head-account"><?php echo Mage::helper('sales')->__('Account Information') ?></h4>
86
+ </div>
87
+ <div class="fieldset">
88
+ <div class="hor-scroll">
89
+ <table cellspacing="0" class="form-list">
90
+ <tr>
91
+ <td class="label"><label><?php echo Mage::helper('sales')->__('Customer Name') ?></label></td>
92
+ <td>
93
+ <?php if ($_customerUrl=$this->getCustomerViewUrl()) : ?>
94
+ <a href="<?php echo $_customerUrl ?>" target="_blank"><strong><?php echo $this->htmlEscape($_order->getCustomerName()) ?></strong></a>
95
+ <?php else: ?>
96
+ <strong><?php echo $this->htmlEscape($_order->getCustomerName()) ?></strong>
97
+ <?php endif; ?>
98
+ </td>
99
+ </tr>
100
+ <tr>
101
+ <td class="label"><label><?php echo Mage::helper('sales')->__('Email') ?></label></td>
102
+ <td><a href="mailto:<?php echo $_order->getCustomerEmail() ?>"><strong><?php echo $_order->getCustomerEmail() ?></strong></a></td>
103
+ </tr>
104
+ <?php if ($_groupName=$this->getCustomerGroupName()) : ?>
105
+ <tr>
106
+ <td class="label"><label><?php echo Mage::helper('sales')->__('Customer Group') ?></label></td>
107
+ <td><strong><?php echo $_groupName ?></strong></td>
108
+ </tr>
109
+ <?php endif; ?>
110
+ <?php if ($_dob=$this->getOrder()->getCustomerDob()) : ?>
111
+ <tr>
112
+ <td class="label"><label><?php echo Mage::helper('sales')->__('Date of Birth') ?></label></td>
113
+ <td><strong><?php echo Mage::helper('core')->formatDate($_dob, 'medium') ?></strong></td>
114
+ </tr>
115
+ <?php endif; ?>
116
+ <?php if ($_taxvat = $_order->getCustomerTaxvat()):?>
117
+ <tr>
118
+ <td class="label"><label><?php echo Mage::helper('sales')->__('TAX/VAT Number') ?></label></label></td>
119
+ <td><strong><?php echo $this->htmlEscape($_taxvat)?></strong></td>
120
+ </tr>
121
+ <?php endif;?>
122
+ </table>
123
+ </div>
124
+ </div>
125
+ </div>
126
+ </div>
127
+
128
+
129
+
130
+ <div class="box-right">
131
+ <!--TGM Module Placeholder - SMS Notification -->
132
+ <div class="entry-edit">
133
+ <div class="entry-edit-head">
134
+ <h4 class="icon-head head-voodoo"><?php echo Mage::helper('sales')->__('SMS Notifications') ?></h4>
135
+ </div>
136
+ <fieldset>
137
+ <strong>
138
+ Did the user opt-in to receive SMS:
139
+ </strong>
140
+ <?php
141
+ $resource = Mage::getSingleton('core/resource');
142
+ $readConnection = $resource->getConnection('core_read');
143
+ $query = "SELECT sms_number FROM voodoo_number where order_id =".$_order->getRealOrderId()." LIMIT 1";
144
+ $results = $readConnection->fetchRow($query);
145
+ $sms_notification = $results['sms_number'];
146
+ $yes = "NO";
147
+ if($sms_notification){
148
+ $yes = "YES";
149
+ }
150
+ echo $yes;
151
+ ?>
152
+ <br/>
153
+ <?php echo $sms_notification; ?>
154
+ </fieldset>
155
+ </div>
156
+ </div>
157
+ <div class="clear"></div>
158
+
159
+ <div class="box-left">
160
+ <!--Billing Address-->
161
+ <div class="entry-edit">
162
+ <div class="entry-edit-head">
163
+ <h4 class="icon-head head-billing-address"><?php echo Mage::helper('sales')->__('Billing Address') ?></h4>
164
+ </div>
165
+ <fieldset>
166
+ <address><?php echo $_order->getBillingAddress()->getFormated(true) ?></address>
167
+ </fieldset>
168
+ </div>
169
+ </div>
170
+ <?php if (!$this->getOrder()->getIsVirtual()): ?>
171
+ <div class="box-right">
172
+ <!--Shipping Address-->
173
+ <div class="entry-edit">
174
+ <div class="entry-edit-head">
175
+ <h4 class="icon-head head-shipping-address"><?php echo Mage::helper('sales')->__('Shipping Address') ?></h4>
176
+ </div>
177
+ <fieldset>
178
+ <address><?php echo $_order->getShippingAddress()->getFormated(true) ?></address>
179
+ </fieldset>
180
+ </div>
181
+ </div>
182
+ <div class="clear"></div>
183
+ <?php endif; ?>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>TGM_Voodoo_Ext</name>
4
- <version>3.3.9</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
@@ -33,13 +33,12 @@ select which versions it works with? (hopefully 1.5.0.0 &amp; later?)&#xD;
33
  Licence type: &#x2018;OSL&#x2019;&#xD;
34
  Release Version: &#x2018;1.0.0'&#xD;
35
  Release Stability: 'Stable'</description>
36
- <notes>Changes in OPT-In template and layout&#xD;
37
- moved to voodoo sms new API&#xD;
38
- Option to select between billing number or shipping number to send SMS if OPT-IN in not selected</notes>
39
  <authors><author><name>Top Gear Media</name><user>bulksms</user><email>team@voodoosms.com</email></author></authors>
40
- <date>2016-03-18</date>
41
- <time>14:40:55</time>
42
- <contents><target name="magecommunity"><dir name="TGM"><dir name="Voodoo"><dir name="Block"><dir name="Backend"><dir name="Page"><file name="Footer.php" hash="c7a672484710de89eb6af0524da0bf83"/><file name="Header.php" hash="5cc6ece8bd810d5e1f8e75f839a5457e"/></dir></dir><file name="Credits.php" hash="985372b01f30961fda66cc3ee97c5fe6"/><file name="GrabAccount.php" hash="4139429015ceaa8592140d32974dac12"/><file name="GrabApiAccount.php" hash="cac6f6155576965eb61b39e04ecf482b"/><dir name="Onepage"><file name="Voodoo.php" hash="ca6d6eda73e578cea49cad753d744b87"/></dir><file name="Onepage.php" hash="560f9c37ffeca7dc245df0b2b231d244"/><file name="OtherVerifications.php" hash="5ac53ed1f31324f79181baf3287341a0"/><file name="VerifyApiAccount.php" hash="24cbec5d74d126a210af1d48e28a6262"/></dir><dir name="Controller"><file name="Observer.php" hash="af5b01bd3e7b91f5aafc87a44dc1b556"/></dir><dir name="Helper"><file name="Data.php" hash="5d04b08476221f3c6f2e8792145d7b6f"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Source"><file name="Color.php" hash="b12a5cf4996438b331abcf6f48676bd2"/></dir></dir></dir></dir><dir name="Ebay"><file name="Order.php" hash="89183d32e0806baa59a1f11d1f564d28"/></dir><dir name="Mysql4"><dir name="Mysql4"><dir name="Voodoo"><file name="Collection.php" hash="c97ac45e6c51ddb7ce3349561a542561"/></dir><file name="Voodoo.php" hash="a4bf4656536e83dfc07557b7748a6a42"/></dir><dir name="Voodoo"><file name="Collection.php" hash="c97ac45e6c51ddb7ce3349561a542561"/></dir><file name="Voodoo.php" hash="a4bf4656536e83dfc07557b7748a6a42"/></dir><file name="Observer.php" hash="05690ed66cf4b36a2d8a00408ef804db"/><dir name="Type"><file name="Onepage.php" hash="769b2910e6d213436ed04f137b0ca184"/></dir><file name="Voodoo.php" hash="3dc9553dcf330777bf356ff57c44e581"/></dir><dir name="controllers"><file name="IndexController.php" hash="50654ac2e787445270ca5a9500534814"/><file name="OnepageController.php" hash="4459c3a29d24637a568bde83026de2be"/></dir><dir name="etc"><file name="config.xml" hash="3aea60e2d45d00477cbaa9ed55220839"/><file name="system.xml" hash="720a4bec3fe4d1561c2676f1399887ed"/></dir><dir name="sql"><dir name="voodoo_setup"><file name="mysql4-install-1.0.0.php" hash="965a0814ade0be43ad933128c27cdeef"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="voodoo.xml" hash="5b102f6937a94a51d7e6a474ab4715a3"/></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="voodoo.xml" hash="17ac416a0d16865420344d50dbce154b"/></dir><dir name="template"><dir name="checkout"><dir name="onepage"><file name="voodoo.phtml" hash="d692466cb7b1e8e3a1873bf766fe4701"/></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="TGM_Voodoo.xml" hash="70457ac3df296584ccdf008d46226653"/></dir></target><target name="magelocale"><dir name="en_US"><file name="TGM_Voodoo.csv" hash="70e4f1215f0542fce3651720c32ce67a"/></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><file name="magepal.png" hash="abca7476c80b078964c0a08fd736dc8a"/></dir></dir></dir></dir></target></contents>
43
  <compatible/>
44
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
45
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>TGM_Voodoo_Ext</name>
4
+ <version>4.1.1</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
33
  Licence type: &#x2018;OSL&#x2019;&#xD;
34
  Release Version: &#x2018;1.0.0'&#xD;
35
  Release Stability: 'Stable'</description>
36
+ <notes>Added a new functionality to SendSMS test SMS&#xD;
37
+ Bug Fixes</notes>
 
38
  <authors><author><name>Top Gear Media</name><user>bulksms</user><email>team@voodoosms.com</email></author></authors>
39
+ <date>2016-10-17</date>
40
+ <time>08:26:09</time>
41
+ <contents><target name="magecommunity"><dir name="TGM"><dir name="Voodoo"><dir name="Block"><dir name="Backend"><dir name="Page"><file name="Footer.php" hash="c7a672484710de89eb6af0524da0bf83"/><file name="Header.php" hash="9729598dda588d84bae5dc3bee783216"/></dir></dir><file name="Credits.php" hash="985372b01f30961fda66cc3ee97c5fe6"/><file name="GrabAccount.php" hash="4139429015ceaa8592140d32974dac12"/><file name="GrabApiAccount.php" hash="cac6f6155576965eb61b39e04ecf482b"/><dir name="Onepage"><file name="Voodoo.php" hash="ca6d6eda73e578cea49cad753d744b87"/></dir><file name="Onepage.php" hash="560f9c37ffeca7dc245df0b2b231d244"/><file name="OtherVerifications.php" hash="5ac53ed1f31324f79181baf3287341a0"/><file name="SendTestSmsOnCanceled.php" hash="c5bb0f06510b0fac6aadeb38cd45c3ea"/><file name="SendTestSmsOnHold.php" hash="7f861984c870d0e88ff852275ab97fbb"/><file name="SendTestSmsOnOrder.php" hash="0b11c674c2030d4f1142e6a1ee03dc6f"/><file name="SendTestSmsOnShipment.php" hash="f64214e1d24547c36717d5137582ed98"/><file name="SendTestSmsOnUnHold.php" hash="fb91f8c49b8e800cc56f540855b2f040"/><file name="ShowMessage.php" hash="c2246c5516250b147763676a0cc32225"/><file name="VerifyApiAccount.php" hash="24cbec5d74d126a210af1d48e28a6262"/></dir><dir name="Controller"><file name="Observer.php" hash="af5b01bd3e7b91f5aafc87a44dc1b556"/></dir><dir name="Helper"><file name="Data.php" hash="8e9f76d1865ca16843c8776d50f6cf70"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Source"><file name="Color.php" hash="b12a5cf4996438b331abcf6f48676bd2"/></dir></dir></dir></dir><dir name="Ebay"><file name="Order.php" hash="89183d32e0806baa59a1f11d1f564d28"/></dir><dir name="Mysql4"><dir name="Mysql4"><dir name="Voodoo"><file name="Collection.php" hash="c97ac45e6c51ddb7ce3349561a542561"/></dir><file name="Voodoo.php" hash="a4bf4656536e83dfc07557b7748a6a42"/></dir><dir name="Voodoo"><file name="Collection.php" hash="c97ac45e6c51ddb7ce3349561a542561"/></dir><file name="Voodoo.php" hash="a4bf4656536e83dfc07557b7748a6a42"/></dir><file name="Observer.php" hash="b1f9159f21b36f0684a1e481beee6dc7"/><dir name="Type"><file name="Onepage.php" hash="769b2910e6d213436ed04f137b0ca184"/></dir><file name="Voodoo.php" hash="3dc9553dcf330777bf356ff57c44e581"/></dir><dir name="controllers"><file name="IndexController.php" hash="50654ac2e787445270ca5a9500534814"/><file name="OnepageController.php" hash="4459c3a29d24637a568bde83026de2be"/></dir><dir name="etc"><file name="config.xml" hash="50f17600aec4cca23d7f3fdcb039f0a9"/><file name="system.xml" hash="217b154dd7080256c84f0561113147fa"/></dir><dir name="sql"><dir name="voodoo_setup"><file name="mysql4-install-1.0.0.php" hash="965a0814ade0be43ad933128c27cdeef"/><file name="mysql4-install-1.2.php" hash="965a0814ade0be43ad933128c27cdeef"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="voodoo.xml" hash="5b102f6937a94a51d7e6a474ab4715a3"/></dir></dir><dir name="custom"><dir name="template"><dir name="sales"><dir name="order"><dir name="view"><file name="info.phtml" hash="482c0d85a6680ed429ad027650880aa6"/></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="voodoo.xml" hash="17ac416a0d16865420344d50dbce154b"/></dir><dir name="template"><dir name="checkout"><dir name="onepage"><file name="voodoo.phtml" hash="d692466cb7b1e8e3a1873bf766fe4701"/></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="TGM_Voodoo.xml" hash="70457ac3df296584ccdf008d46226653"/></dir></target><target name="magelocale"><dir name="en_US"><file name="TGM_Voodoo.csv" hash="70e4f1215f0542fce3651720c32ce67a"/></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><file name="magepal.png" hash="abca7476c80b078964c0a08fd736dc8a"/></dir></dir></dir></dir></target></contents>
42
  <compatible/>
43
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
44
  </package>