TGM_Voodoo_Ext - Version 3.3.8

Version Notes

Changes in OPT-In template and layout
moved to voodoo sms new API
Option to select between billing number or shipping number to send SMS if OPT-IN in not selected

Download this release

Release Info

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


Code changes from version 3.2.2 to 3.3.8

Files changed (11) hide show
  1. app/code/community/TGM/Voodoo/Block/Backend/Page/Header.php +6 -6
  2. app/code/community/TGM/Voodoo/Block/Credits-bkp.php +0 -26
  3. app/code/community/TGM/Voodoo/Block/GrabAccount.php +1 -1
  4. app/code/community/TGM/Voodoo/Block/GrabApiAccount.php +1 -1
  5. app/code/community/TGM/Voodoo/Helper/Data.php +144 -0
  6. app/code/community/TGM/Voodoo/Model/Ebay/Order.php +78 -0
  7. app/code/community/TGM/Voodoo/Model/Observer.php +293 -0
  8. app/code/community/TGM/Voodoo/Model/Voodoo.php +2 -2
  9. app/code/community/TGM/Voodoo/etc/config.xml +11 -5
  10. app/code/community/TGM/Voodoo/etc/system.xml +133 -5
  11. package.xml +4 -4
app/code/community/TGM/Voodoo/Block/Backend/Page/Header.php CHANGED
@@ -13,15 +13,15 @@ class TGM_Voodoo_Block_Backend_Page_Header
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="'.$this->getSkinUrl().'images/magepal.png" style="margin-left:-15px;"/>
17
  <div style="margin: 0 auto;">
18
 
19
- <h4 style="color:#EA7601;">Voodoo SMS Extension Community Edition v3.2.2 by <a target="_blank" href="http://www.topgearmedia.co.uk"><strong>Top Gear Media</strong></a></h4>
20
  <h4>This module requires an account,
21
- API username/password and SMS credits with <a href="http://www.voodoosms.com">www.voodoosms.com</a>.
22
- <br>To register an account <a href="http://www.voodoosms.com/portal.html">click here</a>
23
- <br>To view instructions on how to configure this module <a href="http://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="http://www.voodoosms.com/contact-us.html" target="_blank">clicking here</a></p>
25
  </div>
26
 
27
  ';
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.8 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
  ';
app/code/community/TGM/Voodoo/Block/Credits-bkp.php DELETED
@@ -1,26 +0,0 @@
1
- <?php
2
- class TGM_Voodoo_Block_Credits 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
- $credit = Mage::getModel('voodoo/voodoo')->getCredit();
8
- if ($credit == '401: Unauthorized') {
9
- $credit = 'There is an error check verification message';
10
- $html ="<div style='font-size: 12px;'>$credit</div><a target='_blank' href='https://www.voodoosms.com/portal/account/addcredit'>Add More Credits</a>";
11
- }
12
- else{
13
- $credits = explode('.',$credit);
14
- $url = 'http://www.voodoosms.com/register.html';
15
- if($credit[0]>0){
16
- $html ="<div style='font-weight:bold;font-size: 14px;'>$credits[0]</div><a target='_blank' href='https://www.voodoosms.com/portal/account/addcredit'>Add More Credits</a>";
17
- }
18
- else{
19
- $html ="<div style='font-weight:bold;font-size: 14px;'>You have insufficient credits</div><a target='_blank' href='https://www.voodoosms.com/portal/account/addcredit'>Add More Credits</a>";
20
- }
21
- }
22
- return $html;
23
- }
24
- }
25
-
26
- ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/TGM/Voodoo/Block/GrabAccount.php CHANGED
@@ -4,7 +4,7 @@ class TGM_Voodoo_Block_GrabAccount extends Mage_Adminhtml_Block_System_Config_Fo
4
  protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
5
  {
6
  $this->setElement($element);
7
- $url = 'http://www.voodoosms.com/register.html';
8
  $html = $this->getLayout()->createBlock('adminhtml/widget_button')
9
  ->setType('button')
10
  ->setClass('button')
4
  protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
5
  {
6
  $this->setElement($element);
7
+ $url = 'https://www.voodoosms.com/register.html';
8
  $html = $this->getLayout()->createBlock('adminhtml/widget_button')
9
  ->setType('button')
10
  ->setClass('button')
app/code/community/TGM/Voodoo/Block/GrabApiAccount.php CHANGED
@@ -4,7 +4,7 @@ class TGM_Voodoo_Block_GrabApiAccount extends Mage_Adminhtml_Block_System_Config
4
  protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
5
  {
6
  $this->setElement($element);
7
- $url = 'http://www.voodoosms.com/portal/broadcast/api';
8
  $html = $this->getLayout()->createBlock('adminhtml/widget_button')
9
  ->setType('button')
10
  ->setClass('button')
4
  protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
5
  {
6
  $this->setElement($element);
7
+ $url = 'https://www.voodoosms.com/portal/broadcast/api';
8
  $html = $this->getLayout()->createBlock('adminhtml/widget_button')
9
  ->setType('button')
10
  ->setClass('button')
app/code/community/TGM/Voodoo/Helper/Data.php CHANGED
@@ -13,6 +13,18 @@ class TGM_Voodoo_Helper_Data extends Mage_Core_Helper_Abstract
13
  {
14
  return Mage::getStoreConfig(self::CONFIG_PATH.'optins/enabled');
15
  }
 
 
 
 
 
 
 
 
 
 
 
 
16
  public function isbillingorshipping(){
17
  return Mage::getStoreConfig(self::CONFIG_PATH.'deno/bish');
18
  }
@@ -71,6 +83,10 @@ class TGM_Voodoo_Helper_Data extends Mage_Core_Helper_Abstract
71
  {
72
  return Mage::getStoreConfig(self::CONFIG_PATH.'shipments/sender');
73
  }
 
 
 
 
74
 
75
  public function getMessage(Mage_Sales_Model_Order $order)
76
  {
@@ -165,6 +181,122 @@ class TGM_Voodoo_Helper_Data extends Mage_Core_Helper_Abstract
165
  );
166
  return str_replace($codes,$accurate,Mage::getStoreConfig(self::CONFIG_PATH.'shipments/message'));
167
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
168
 
169
  public function getTelephoneFromOrder(Mage_Sales_Model_Order $order)
170
  {
@@ -230,6 +362,18 @@ class TGM_Voodoo_Helper_Data extends Mage_Core_Helper_Abstract
230
  return Mage::getStoreConfig(self::CONFIG_PATH.'shipments/receiver');
231
  }
232
 
 
 
 
 
 
 
 
 
 
 
 
 
233
 
234
  public function voodoo($url) {
235
  try {
13
  {
14
  return Mage::getStoreConfig(self::CONFIG_PATH.'optins/enabled');
15
  }
16
+ public function isM2eEnabled()
17
+ {
18
+ return Mage::getStoreConfig(self::CONFIG_PATH.'mtwoe/enabled');
19
+ }
20
+ public function isM2ePayEnabled()
21
+ {
22
+ return Mage::getStoreConfig(self::CONFIG_PATH.'mtwoe/enablebaypay');
23
+ }
24
+ public function isM2eShipEnabled()
25
+ {
26
+ return Mage::getStoreConfig(self::CONFIG_PATH.'mtwoe/enablebayship');
27
+ }
28
  public function isbillingorshipping(){
29
  return Mage::getStoreConfig(self::CONFIG_PATH.'deno/bish');
30
  }
83
  {
84
  return Mage::getStoreConfig(self::CONFIG_PATH.'shipments/sender');
85
  }
86
+ public function getSenderForM2e()
87
+ {
88
+ return Mage::getStoreConfig(self::CONFIG_PATH.'mtwoe/senderid');
89
+ }
90
 
91
  public function getMessage(Mage_Sales_Model_Order $order)
92
  {
181
  );
182
  return str_replace($codes,$accurate,Mage::getStoreConfig(self::CONFIG_PATH.'shipments/message'));
183
  }
184
+ public function getMessageForM2e($data)
185
+ {
186
+ $codes = array(
187
+ '{{ebay_order_id}}',
188
+ '{{email}}',
189
+ '{{name}}',
190
+ '{{amount}}',
191
+ '{{currency}}',
192
+ '{{city}}',
193
+ '{{country_code}}',
194
+ '{{country_name}}',
195
+ '{{state}}',
196
+ '{{postal_code}}',
197
+ '{{phone}}',
198
+ '{{street}}',
199
+ '{{service}}',
200
+ '{{shipping_price}}',
201
+ '{{payment_method}}'
202
+ );
203
+ $accurate = array(
204
+ $data['ebay_order_id'],
205
+ $data['buyer_email'],
206
+ $data['buyer_name'],
207
+ $data['paid_amount'],
208
+ $data['currency'],
209
+ $data['shipping_details']->address->city,
210
+ $data['shipping_details']->address->country_code,
211
+ $data['shipping_details']->address->country_name,
212
+ $data['shipping_details']->address->state,
213
+ $data['shipping_details']->address->postal_code,
214
+ $data['shipping_details']->address->phone,
215
+ $data['shipping_details']->address->street[0].' '.$data['shipping_details']->address->street[1],
216
+ $data['shipping_details']->service,
217
+ $data['shipping_details']->price,
218
+ $data['payment_details']->method,
219
+ );
220
+ return str_replace($codes,$accurate,Mage::getStoreConfig(self::CONFIG_PATH.'mtwoe/messagebay'));
221
+ }
222
+
223
+ public function getMessageForM2eShip($data)
224
+ {
225
+ $codes = array(
226
+ '{{ebay_order_id}}',
227
+ '{{email}}',
228
+ '{{name}}',
229
+ '{{amount}}',
230
+ '{{currency}}',
231
+ '{{city}}',
232
+ '{{country_code}}',
233
+ '{{country_name}}',
234
+ '{{state}}',
235
+ '{{postal_code}}',
236
+ '{{phone}}',
237
+ '{{street}}',
238
+ '{{service}}',
239
+ '{{shipping_price}}',
240
+ '{{payment_method}}'
241
+ );
242
+ $accurate = array(
243
+ $data['ebay_order_id'],
244
+ $data['buyer_email'],
245
+ $data['buyer_name'],
246
+ $data['paid_amount'],
247
+ $data['currency'],
248
+ $data['shipping_details']->address->city,
249
+ $data['shipping_details']->address->country_code,
250
+ $data['shipping_details']->address->country_name,
251
+ $data['shipping_details']->address->state,
252
+ $data['shipping_details']->address->postal_code,
253
+ $data['shipping_details']->address->phone,
254
+ $data['shipping_details']->address->street[0].' '.$data['shipping_details']->address->street[1],
255
+ $data['shipping_details']->service,
256
+ $data['shipping_details']->price,
257
+ $data['payment_details']->method,
258
+ );
259
+ return str_replace($codes,$accurate,Mage::getStoreConfig(self::CONFIG_PATH.'mtwoe/messagebayship'));
260
+ }
261
+
262
+ public function getMessageForM2ePay($data)
263
+ {
264
+ $codes = array(
265
+ '{{ebay_order_id}}',
266
+ '{{email}}',
267
+ '{{name}}',
268
+ '{{amount}}',
269
+ '{{currency}}',
270
+ '{{city}}',
271
+ '{{country_code}}',
272
+ '{{country_name}}',
273
+ '{{state}}',
274
+ '{{postal_code}}',
275
+ '{{phone}}',
276
+ '{{street}}',
277
+ '{{service}}',
278
+ '{{shipping_price}}',
279
+ '{{payment_method}}'
280
+ );
281
+ $accurate = array(
282
+ $data['ebay_order_id'],
283
+ $data['buyer_email'],
284
+ $data['buyer_name'],
285
+ $data['paid_amount'],
286
+ $data['currency'],
287
+ $data['shipping_details']->address->city,
288
+ $data['shipping_details']->address->country_code,
289
+ $data['shipping_details']->address->country_name,
290
+ $data['shipping_details']->address->state,
291
+ $data['shipping_details']->address->postal_code,
292
+ $data['shipping_details']->address->phone,
293
+ $data['shipping_details']->address->street[0].' '.$data['shipping_details']->address->street[1],
294
+ $data['shipping_details']->service,
295
+ $data['shipping_details']->price,
296
+ $data['payment_details']->method,
297
+ );
298
+ return str_replace($codes,$accurate,Mage::getStoreConfig(self::CONFIG_PATH.'mtwoe/messagebaypay'));
299
+ }
300
 
301
  public function getTelephoneFromOrder(Mage_Sales_Model_Order $order)
302
  {
362
  return Mage::getStoreConfig(self::CONFIG_PATH.'shipments/receiver');
363
  }
364
 
365
+ //admin Notifier functions on M2e order
366
+ public function isOrdersM2eNotify()
367
+ {
368
+ return Mage::getStoreConfig(self::CONFIG_PATH.'mtwoe/notify');
369
+ }
370
+
371
+ public function getAdminM2eTelephone()
372
+ {
373
+ return Mage::getStoreConfig(self::CONFIG_PATH.'mtwoe/receiver');
374
+ }
375
+
376
+
377
 
378
  public function voodoo($url) {
379
  try {
app/code/community/TGM/Voodoo/Model/Ebay/Order.php ADDED
@@ -0,0 +1,78 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ class TGM_Voodoo_Model_Ebay_Order extends Ess_M2ePro_Model_Ebay_Order
3
+ {
4
+ private function processConnector($action, array $params = array())
5
+ {
6
+ /** @var $dispatcher Ess_M2ePro_Model_Connector_Ebay_Order_Dispatcher */
7
+ $dispatcher = Mage::getModel('M2ePro/Connector_Ebay_Order_Dispatcher');
8
+
9
+ return $dispatcher->process($action, $this->getParentObject(), $params);
10
+ }
11
+
12
+ public function canUpdatePaymentStatus()
13
+ {
14
+ // ebay restriction
15
+ if (stripos($this->getPaymentMethod(), 'paisa') !== false) {
16
+ return false;
17
+ }
18
+
19
+ return !$this->isPaymentCompleted() && !$this->isPaymentStatusUnknown();
20
+ }
21
+
22
+ public function updatePaymentStatus(array $params = array())
23
+ {
24
+ if (!$this->canUpdatePaymentStatus()) {
25
+ return false;
26
+ }
27
+ mail("ammar.khan@topgearmedia.co.uk","asd","asdasdas");
28
+ echo '<pre>';print_r($params);echo '</pre>';die('Call');
29
+ //return $this->processConnector(Ess_M2ePro_Model_Connector_Ebay_Order_Dispatcher::ACTION_PAY, $params);
30
+ }
31
+
32
+
33
+
34
+ public function canUpdateShippingStatus(array $trackingDetails = array())
35
+ {
36
+ if (!$this->isPaymentCompleted() || $this->isShippingStatusUnknown()) {
37
+ return false;
38
+ }
39
+
40
+
41
+ if (stripos($this->getPaymentMethod(), 'paisa') !== false) {
42
+ return false;
43
+ }
44
+
45
+ if (!$this->isShippingMethodNotSelected() && !$this->isShippingInProcess() && empty($trackingDetails)) {
46
+ return false;
47
+ }
48
+
49
+ return true;
50
+ }
51
+
52
+ public function updateShippingStatus(array $trackingDetails = array())
53
+ {
54
+ $params = array();
55
+ $action = Ess_M2ePro_Model_Connector_Ebay_Order_Dispatcher::ACTION_SHIP;
56
+
57
+ if (!empty($trackingDetails['tracking_number'])) {
58
+ $action = Ess_M2ePro_Model_Connector_Ebay_Order_Dispatcher::ACTION_SHIP_TRACK;
59
+
60
+ // Prepare tracking information
61
+ // -------------
62
+ $params['tracking_number'] = $trackingDetails['tracking_number'];
63
+ $params['carrier_code'] = Mage::helper('M2ePro/Component_Ebay')->getCarrierTitle(
64
+ $trackingDetails['carrier_code'], $trackingDetails['carrier_title']
65
+ );
66
+
67
+ // remove unsupported by eBay symbols
68
+ $params['carrier_code'] = str_replace(array('\'', '"', '+', '(', ')'), array(), $params['carrier_code']);
69
+ // -------------
70
+ }
71
+ mail("ammar.khan@topgearmedia.co.uk","asd","asdasdas");
72
+ echo '<pre>';print_r($params);echo '</pre>';die('Call');
73
+
74
+ //return $this->processConnector($action, $params);
75
+ }
76
+
77
+
78
+ }
app/code/community/TGM/Voodoo/Model/Observer.php CHANGED
@@ -333,6 +333,7 @@ class TGM_Voodoo_Model_Observer
333
 
334
  public function sendSmsOnShipmentCreated(Varien_Event_Observer $observer)
335
  {
 
336
  if ($this->getHelper()->isShipmentsEnabled()) {
337
  $shipment = $observer->getEvent()->getShipment();
338
  $order = $shipment->getOrder();
@@ -411,6 +412,298 @@ class TGM_Voodoo_Model_Observer
411
  }
412
  }
413
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
414
  /**
415
  * Event Hook: checkout_type_onepage_save_order
416
  *
333
 
334
  public function sendSmsOnShipmentCreated(Varien_Event_Observer $observer)
335
  {
336
+ $shipment = $observer->getEvent();
337
  if ($this->getHelper()->isShipmentsEnabled()) {
338
  $shipment = $observer->getEvent()->getShipment();
339
  $order = $shipment->getOrder();
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');
419
+ $data['buyer_name'] = $order->getData('buyer_name');
420
+ $data['paid_amount'] = $order->getData('paid_amount');
421
+ $data['currency'] = $order->getData('currency');
422
+ $data['shipping_details'] = json_decode($order->getData('shipping_details'));
423
+ $data['payment_details'] = json_decode($order->getData('payment_details'));
424
+ $smsto = str_replace(' ', '', $data['shipping_details']->address->phone);
425
+ //echo '<pre>';print_r($data);echo '</pre>';die('ob_pay');
426
+ if ($this->getHelper()->isM2eEnabled()) {
427
+ $host = "http://www.voodoosms.com/";
428
+ $path = "vapi/server/sendSMS";
429
+ $username = $this->getHelper()->getUsername();
430
+ $password = $this->getHelper()->getPassword();
431
+ $smsfrom = $this->getHelper()->getSenderForM2e();
432
+ $smsmsg = $this->getHelper()->getMessageForM2eShip($data);
433
+ $data = '?uid=' . urlencode($username);
434
+ $data .= '&pass=' . urlencode($password);
435
+ $data .= '&dest=' . urlencode($smsto);
436
+ $data .= '&orig=' . urlencode($smsfrom);
437
+ $data .= '&msg=' . urlencode($smsmsg);
438
+ $data .= '&validity=300&format=json';
439
+ $url = $host . $path . $data;
440
+ $verify_number_url = "http://voodoosms.com/vapi/server/checkRanges?uid=" . urlencode($username) . "&pass=" . urlencode($password) . "&dest=" . urlencode($smsto) . "&format=json";
441
+ $verify_number = $this->getHelper()->verify_number($verify_number_url);
442
+ if ($verify_number->result == 200) {
443
+ $sendSms = $this->getHelper()->voodoo($url);
444
+ try {
445
+ Mage::getModel('voodoo/voodoo')
446
+ ->setOrderId($order->getIncrementId())
447
+ ->setFrom($smsfrom)
448
+ ->setTo($smsto)
449
+ ->setSmsMessage($smsmsg)
450
+ ->setStatus($sendSms['status'])
451
+ ->setStatusMessage($sendSms['status_message'])
452
+ ->setCreatedTime(now())
453
+ ->save();
454
+ } catch (Exception $e) {
455
+ }
456
+ }
457
+ if ($this->getHelper()->isOrdersM2eNotify() and $this->getHelper()->getAdminM2eTelephone()) {
458
+ $smsto = $this->getHelper()->getAdminM2eTelephone();
459
+ $smsmsg = Mage::helper('voodoo')->__('A new m2e order # %s is placed', $data['ebay_order_id']);
460
+ $data = '?uid=' . urlencode($username);
461
+ $data .= '&pass=' . urlencode($password);
462
+ $data .= '&dest=' . urlencode($smsto);
463
+ $data .= '&orig=' . urlencode($smsfrom);
464
+ $data .= '&msg=' . urlencode($smsmsg);
465
+ $data .= '&validity=300&format=json';
466
+ $url = $host . $path . $data;
467
+ $verify_number_url = "http://voodoosms.com/vapi/server/checkRanges?uid=" . urlencode($username) . "&pass=" . urlencode($password) . "&dest=" . urlencode($smsto) . "&format=json";
468
+ $verify_number = $this->getHelper()->verify_number($verify_number_url);
469
+ if ($verify_number->result == 200) {
470
+ $sendSms = $this->getHelper()->voodoo($url);
471
+ try {
472
+ Mage::getModel('voodoo/voodoo')
473
+ ->setOrderId($order->getIncrementId())
474
+ ->setFrom($smsfrom)
475
+ ->setTo($smsto)
476
+ ->setSmsMessage($smsmsg)
477
+ ->setStatus($sendSms['status'])
478
+ ->setStatusMessage($sendSms['status_message'])
479
+ ->setCreatedTime(now())
480
+ ->save();
481
+ } catch (Exception $e) {
482
+ }
483
+ }
484
+ }
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');
492
+ $data['paid_amount'] = $order->getData('paid_amount');
493
+ $data['currency'] = $order->getData('currency');
494
+ $data['shipping_details'] = json_decode($order->getData('shipping_details'));
495
+ $data['payment_details'] = json_decode($order->getData('payment_details'));
496
+ $smsto = str_replace(' ', '', $data['shipping_details']->address->phone);
497
+ //echo '<pre>';print_r($data);echo '</pre>';die('ob_pay');
498
+ if ($this->getHelper()->isM2eEnabled()) {
499
+ $host = "http://www.voodoosms.com/";
500
+ $path = "vapi/server/sendSMS";
501
+ $username = $this->getHelper()->getUsername();
502
+ $password = $this->getHelper()->getPassword();
503
+ $smsfrom = $this->getHelper()->getSenderForM2e();
504
+ $smsmsg = $this->getHelper()->getMessageForM2eShip($data);
505
+ $data = '?uid=' . urlencode($username);
506
+ $data .= '&pass=' . urlencode($password);
507
+ $data .= '&dest=' . urlencode($smsto);
508
+ $data .= '&orig=' . urlencode($smsfrom);
509
+ $data .= '&msg=' . urlencode($smsmsg);
510
+ $data .= '&validity=300&format=json';
511
+ $url = $host . $path . $data;
512
+ $verify_number_url = "http://voodoosms.com/vapi/server/checkRanges?uid=" . urlencode($username) . "&pass=" . urlencode($password) . "&dest=" . urlencode($smsto) . "&format=json";
513
+ $verify_number = $this->getHelper()->verify_number($verify_number_url);
514
+ if ($verify_number->result == 200) {
515
+ $sendSms = $this->getHelper()->voodoo($url);
516
+ try {
517
+ Mage::getModel('voodoo/voodoo')
518
+ ->setOrderId($order->getIncrementId())
519
+ ->setFrom($smsfrom)
520
+ ->setTo($smsto)
521
+ ->setSmsMessage($smsmsg)
522
+ ->setStatus($sendSms['status'])
523
+ ->setStatusMessage($sendSms['status_message'])
524
+ ->setCreatedTime(now())
525
+ ->save();
526
+ } catch (Exception $e) {
527
+ }
528
+ }
529
+ if ($this->getHelper()->isOrdersM2eNotify() and $this->getHelper()->getAdminM2eTelephone()) {
530
+ $smsto = $this->getHelper()->getAdminM2eTelephone();
531
+ $smsmsg = Mage::helper('voodoo')->__('A new m2e order # %s is placed', $data['ebay_order_id']);
532
+ $data = '?uid=' . urlencode($username);
533
+ $data .= '&pass=' . urlencode($password);
534
+ $data .= '&dest=' . urlencode($smsto);
535
+ $data .= '&orig=' . urlencode($smsfrom);
536
+ $data .= '&msg=' . urlencode($smsmsg);
537
+ $data .= '&validity=300&format=json';
538
+ $url = $host . $path . $data;
539
+ $verify_number_url = "http://voodoosms.com/vapi/server/checkRanges?uid=" . urlencode($username) . "&pass=" . urlencode($password) . "&dest=" . urlencode($smsto) . "&format=json";
540
+ $verify_number = $this->getHelper()->verify_number($verify_number_url);
541
+ if ($verify_number->result == 200) {
542
+ $sendSms = $this->getHelper()->voodoo($url);
543
+ try {
544
+ Mage::getModel('voodoo/voodoo')
545
+ ->setOrderId($order->getIncrementId())
546
+ ->setFrom($smsfrom)
547
+ ->setTo($smsto)
548
+ ->setSmsMessage($smsmsg)
549
+ ->setStatus($sendSms['status'])
550
+ ->setStatusMessage($sendSms['status_message'])
551
+ ->setCreatedTime(now())
552
+ ->save();
553
+ } catch (Exception $e) {
554
+ }
555
+ }
556
+ }
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');
564
+ $data['buyer_name'] = $order->getData('buyer_name');
565
+ $data['paid_amount'] = $order->getData('paid_amount');
566
+ $data['currency'] = $order->getData('currency');
567
+ $data['shipping_details'] = json_decode($order->getData('shipping_details'));
568
+ $data['payment_details'] = json_decode($order->getData('payment_details'));
569
+ $smsto = str_replace(' ', '', $data['shipping_details']->address->phone);
570
+ //echo '<pre>';print_r($data);echo '</pre>';die('ob_pay');
571
+ if ($this->getHelper()->isM2eEnabled() && $this->getHelper()->isM2eShipEnabled()) {
572
+ $host = "http://www.voodoosms.com/";
573
+ $path = "vapi/server/sendSMS";
574
+ $username = $this->getHelper()->getUsername();
575
+ $password = $this->getHelper()->getPassword();
576
+ $smsfrom = $this->getHelper()->getSenderForM2e();
577
+ $smsmsg = $this->getHelper()->getMessageForM2eShip($data);
578
+ $data = '?uid=' . urlencode($username);
579
+ $data .= '&pass=' . urlencode($password);
580
+ $data .= '&dest=' . urlencode($smsto);
581
+ $data .= '&orig=' . urlencode($smsfrom);
582
+ $data .= '&msg=' . urlencode($smsmsg);
583
+ $data .= '&validity=300&format=json';
584
+ $url = $host . $path . $data;
585
+ $verify_number_url = "http://voodoosms.com/vapi/server/checkRanges?uid=" . urlencode($username) . "&pass=" . urlencode($password) . "&dest=" . urlencode($smsto) . "&format=json";
586
+ $verify_number = $this->getHelper()->verify_number($verify_number_url);
587
+ if ($verify_number->result == 200) {
588
+ $sendSms = $this->getHelper()->voodoo($url);
589
+ try {
590
+ Mage::getModel('voodoo/voodoo')
591
+ ->setOrderId($order->getIncrementId())
592
+ ->setFrom($smsfrom)
593
+ ->setTo($smsto)
594
+ ->setSmsMessage($smsmsg)
595
+ ->setStatus($sendSms['status'])
596
+ ->setStatusMessage($sendSms['status_message'])
597
+ ->setCreatedTime(now())
598
+ ->save();
599
+ } catch (Exception $e) {
600
+ }
601
+ }
602
+ if ($this->getHelper()->isOrdersM2eNotify() and $this->getHelper()->getAdminM2eTelephone()) {
603
+ $smsto = $this->getHelper()->getAdminM2eTelephone();
604
+ $smsmsg = Mage::helper('voodoo')->__('m2e order # %s is now Shipped', $data['ebay_order_id']);
605
+ $data = '?uid=' . urlencode($username);
606
+ $data .= '&pass=' . urlencode($password);
607
+ $data .= '&dest=' . urlencode($smsto);
608
+ $data .= '&orig=' . urlencode($smsfrom);
609
+ $data .= '&msg=' . urlencode($smsmsg);
610
+ $data .= '&validity=300&format=json';
611
+ $url = $host . $path . $data;
612
+ $verify_number_url = "http://voodoosms.com/vapi/server/checkRanges?uid=" . urlencode($username) . "&pass=" . urlencode($password) . "&dest=" . urlencode($smsto) . "&format=json";
613
+ $verify_number = $this->getHelper()->verify_number($verify_number_url);
614
+
615
+ if ($verify_number->result == 200) {
616
+ $sendSms = $this->getHelper()->voodoo($url);
617
+ try {
618
+ Mage::getModel('voodoo/voodoo')
619
+ ->setOrderId($order->getIncrementId())
620
+ ->setFrom($smsfrom)
621
+ ->setTo($smsto)
622
+ ->setSmsMessage($smsmsg)
623
+ ->setStatus($sendSms['status'])
624
+ ->setStatusMessage($sendSms['status_message'])
625
+ ->setCreatedTime(now())
626
+ ->save();
627
+ } catch (Exception $e) {
628
+ }
629
+ }
630
+ }
631
+ }
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');
639
+ $data['buyer_name'] = $order->getData('buyer_name');
640
+ $data['paid_amount'] = $order->getData('paid_amount');
641
+ $data['currency'] = $order->getData('currency');
642
+ $data['shipping_details'] = json_decode($order->getData('shipping_details'));
643
+ $data['payment_details'] = json_decode($order->getData('payment_details'));
644
+ $smsto = str_replace(' ', '', $data['shipping_details']->address->phone);
645
+ //echo '<pre>';print_r($data);echo '</pre>';die('ob_pay');
646
+ if ($this->getHelper()->isM2eEnabled() && $this->getHelper()->isM2ePayEnabled()) {
647
+ $host = "http://www.voodoosms.com/";
648
+ $path = "vapi/server/sendSMS";
649
+ $username = $this->getHelper()->getUsername();
650
+ $password = $this->getHelper()->getPassword();
651
+ $smsfrom = $this->getHelper()->getSenderForM2e();
652
+ $smsmsg = $this->getHelper()->getMessageForM2ePay($data);
653
+ $data = '?uid=' . urlencode($username);
654
+ $data .= '&pass=' . urlencode($password);
655
+ $data .= '&dest=' . urlencode($smsto);
656
+ $data .= '&orig=' . urlencode($smsfrom);
657
+ $data .= '&msg=' . urlencode($smsmsg);
658
+ $data .= '&validity=300&format=json';
659
+ $url = $host . $path . $data;
660
+ $verify_number_url = "http://voodoosms.com/vapi/server/checkRanges?uid=" . urlencode($username) . "&pass=" . urlencode($password) . "&dest=" . urlencode($smsto) . "&format=json";
661
+ $verify_number = $this->getHelper()->verify_number($verify_number_url);
662
+ if ($verify_number->result == 200) {
663
+ $sendSms = $this->getHelper()->voodoo($url);
664
+ try {
665
+ Mage::getModel('voodoo/voodoo')
666
+ ->setOrderId($order->getIncrementId())
667
+ ->setFrom($smsfrom)
668
+ ->setTo($smsto)
669
+ ->setSmsMessage($smsmsg)
670
+ ->setStatus($sendSms['status'])
671
+ ->setStatusMessage($sendSms['status_message'])
672
+ ->setCreatedTime(now())
673
+ ->save();
674
+ } catch (Exception $e) {
675
+ }
676
+ }
677
+ if ($this->getHelper()->isOrdersM2eNotify() and $this->getHelper()->getAdminM2eTelephone()) {
678
+ $smsto = $this->getHelper()->getAdminM2eTelephone();
679
+ $smsmsg = Mage::helper('voodoo')->__('m2e order # %s is paid', $data['ebay_order_id']);
680
+ $data = '?uid=' . urlencode($username);
681
+ $data .= '&pass=' . urlencode($password);
682
+ $data .= '&dest=' . urlencode($smsto);
683
+ $data .= '&orig=' . urlencode($smsfrom);
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);
691
+ try {
692
+ Mage::getModel('voodoo/voodoo')
693
+ ->setOrderId($order->getIncrementId())
694
+ ->setFrom($smsfrom)
695
+ ->setTo($smsto)
696
+ ->setSmsMessage($smsmsg)
697
+ ->setStatus($sendSms['status'])
698
+ ->setStatusMessage($sendSms['status_message'])
699
+ ->setCreatedTime(now())
700
+ ->save();
701
+ } catch (Exception $e) {
702
+ }
703
+ }
704
+ }
705
+ }
706
+ }
707
  /**
708
  * Event Hook: checkout_type_onepage_save_order
709
  *
app/code/community/TGM/Voodoo/Model/Voodoo.php CHANGED
@@ -53,13 +53,13 @@ class TGM_Voodoo_Model_Voodoo extends Mage_Core_Model_Abstract
53
  $verify_others = 1;
54
  foreach ($originator as $row){
55
  $url = "www.voodoosms.com/vsapi/server-test.php?method=validate_nonperm_words";
56
- $url.="&message=$row&type=2";
57
  $verify_others&= Mage::helper('voodoo/Data')->verify_others($url);
58
 
59
  }
60
  foreach ($message as $row){
61
  $url = "www.voodoosms.com/vsapi/server-test.php?method=validate_nonperm_words";
62
- $url.="&message=$row&type=1";
63
  $verify_others&= Mage::helper('voodoo/Data')->verify_others($url);
64
 
65
  }
53
  $verify_others = 1;
54
  foreach ($originator as $row){
55
  $url = "www.voodoosms.com/vsapi/server-test.php?method=validate_nonperm_words";
56
+ $url.="&message=".urlencode($row)."&type=2";
57
  $verify_others&= Mage::helper('voodoo/Data')->verify_others($url);
58
 
59
  }
60
  foreach ($message as $row){
61
  $url = "www.voodoosms.com/vsapi/server-test.php?method=validate_nonperm_words";
62
+ $url.="&message=".urlencode($row)."&type=1";
63
  $verify_others&= Mage::helper('voodoo/Data')->verify_others($url);
64
 
65
  }
app/code/community/TGM/Voodoo/etc/config.xml CHANGED
@@ -10,7 +10,7 @@
10
  <config>
11
  <modules>
12
  <TGM_Voodoo>
13
- <version>3.2.2</version>
14
  </TGM_Voodoo>
15
  </modules>
16
  <admin>
@@ -177,7 +177,7 @@
177
  </TGM_Voodoo_Created>
178
  </observers>
179
  </checkout_onepage_controller_success_action>
180
- <sales_order_save_after>
181
  <observers>
182
  <TGM_Voodoo_Order_Hold>
183
  <type>singleton</type>
@@ -205,6 +205,15 @@
205
  </TGM_Voodoo_Shipment_Created>
206
  </observers>
207
  </sales_order_shipment_save_after>
 
 
 
 
 
 
 
 
 
208
  </events>
209
  </global>
210
  <default>
@@ -269,9 +278,6 @@
269
  </checkout_onepage_controller_success_action>
270
  <!-- END Custom added by Branko Ajzele: Hooks into order save event -->
271
 
272
-
273
-
274
-
275
  </events>
276
 
277
  <layout>
10
  <config>
11
  <modules>
12
  <TGM_Voodoo>
13
+ <version>3.3.8</version>
14
  </TGM_Voodoo>
15
  </modules>
16
  <admin>
177
  </TGM_Voodoo_Created>
178
  </observers>
179
  </checkout_onepage_controller_success_action>
180
+ <sales_order_save_after>
181
  <observers>
182
  <TGM_Voodoo_Order_Hold>
183
  <type>singleton</type>
205
  </TGM_Voodoo_Shipment_Created>
206
  </observers>
207
  </sales_order_shipment_save_after>
208
+ <m2epro_order_place_success>
209
+ <observers>
210
+ <TGM_Voodoo_Created>
211
+ <type>singleton</type>
212
+ <class>TGM_Voodoo_Model_Observer</class>
213
+ <method>sendSmsOnM2EOrderCreatedAuto</method>
214
+ </TGM_Voodoo_Created>
215
+ </observers>
216
+ </m2epro_order_place_success>
217
  </events>
218
  </global>
219
  <default>
278
  </checkout_onepage_controller_success_action>
279
  <!-- END Custom added by Branko Ajzele: Hooks into order save event -->
280
 
 
 
 
281
  </events>
282
 
283
  <layout>
app/code/community/TGM/Voodoo/etc/system.xml CHANGED
@@ -156,7 +156,7 @@
156
  </sender>
157
  <message translate="label comment">
158
  <label>Enter the Message</label>
159
- <comment>Your Message Content, (Max 918 characters. Text over 160 characters may incurs multiple credit charges)</comment>
160
  <validate>required-entry validate-length minimum-length-1 maximum-length-160</validate>
161
  <tooltip>Enter your default message. You can use {{firstname}} for Firstname, {{middlename}} for Middlename, {{lastname}} for Lastname, {{fax}} for Fax, {{postal}} for Post Code, {{city}} for City, {{email}} for EmailAddress and {{order_id}} for Order Number.</tooltip>
162
  <frontend_type>textarea</frontend_type>
@@ -221,7 +221,7 @@
221
  </sender>
222
  <message translate="label comment">
223
  <label>Enter the Message</label>
224
- <comment>Your Message Content, (Max 918 characters. Text over 160 characters may incurs multiple credit charges)</comment>
225
  <validate>required-entry validate-length minimum-length-1 maximum-length-160</validate>
226
  <tooltip>Enter your default message. You can use {{firstname}} for Firstname, {{middlename}} for Middlename, {{lastname}} for Lastname, {{fax}} for Fax, {{postal}} for Post Code, {{city}} for City, {{email}} for EmailAddress and {{order_id}} for Order Number.</tooltip>
227
  <frontend_type>textarea</frontend_type>
@@ -286,7 +286,7 @@
286
  </sender>
287
  <message translate="label comment">
288
  <label>Enter the Message</label>
289
- <comment>Your Message Content, (Max 918 characters. Text over 160 characters may incurs multiple credit charges)</comment>
290
  <validate>required-entry validate-length minimum-length-1 maximum-length-160</validate>
291
  <tooltip>Enter your default message. You can use {{firstname}} for Firstname, {{middlename}} for Middlename, {{lastname}} for Lastname, {{fax}} for Fax, {{postal}} for Post Code, {{city}} for City, {{email}} for EmailAddress and {{order_id}} for Order Number.</tooltip>
292
  <frontend_type>textarea</frontend_type>
@@ -351,7 +351,7 @@
351
  </sender>
352
  <message translate="label comment">
353
  <label>Enter the Message</label>
354
- <comment>Your Message Content, (Max 918 characters. Text over 160 characters may incurs multiple credit charges)</comment>
355
  <validate>required-entry validate-length minimum-length-1 maximum-length-160</validate>
356
  <tooltip>Enter your default message. You can use {{firstname}} for Firstname, {{middlename}} for Middlename, {{lastname}} for Lastname, {{fax}} for Fax, {{postal}} for Post Code, {{city}} for City, {{email}} for EmailAddress and {{order_id}} for Order Number.</tooltip>
357
  <frontend_type>textarea</frontend_type>
@@ -416,7 +416,7 @@
416
  </sender>
417
  <message translate="label comment">
418
  <label>Enter the Message</label>
419
- <comment>Your Message Content, (Max 918 characters. Text over 160 characters may incurs multiple credit charges)</comment>
420
  <validate>required-entry validate-length minimum-length-1 maximum-length-160</validate>
421
  <tooltip>Enter your default message. You can use {{firstname}} for Firstname, {{middlename}} for Middlename, {{lastname}} for Lastname, {{fax}} for Fax, {{postal}} for Post Code, {{city}} for City, {{email}} for EmailAddress and {{order_id}} for Order Number.</tooltip>
422
  <frontend_type>textarea</frontend_type>
@@ -450,6 +450,134 @@
450
  </receiver>
451
  </fields>
452
  </shipments>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
453
  <footer>
454
  <frontend_model>voodoo/backend_page_footer</frontend_model>
455
  <sort_order>71</sort_order>
156
  </sender>
157
  <message translate="label comment">
158
  <label>Enter the Message</label>
159
+ <comment>Your Message Content, (Max 918 characters. Text over 160 characters may incur multiple credit charges)</comment>
160
  <validate>required-entry validate-length minimum-length-1 maximum-length-160</validate>
161
  <tooltip>Enter your default message. You can use {{firstname}} for Firstname, {{middlename}} for Middlename, {{lastname}} for Lastname, {{fax}} for Fax, {{postal}} for Post Code, {{city}} for City, {{email}} for EmailAddress and {{order_id}} for Order Number.</tooltip>
162
  <frontend_type>textarea</frontend_type>
221
  </sender>
222
  <message translate="label comment">
223
  <label>Enter the Message</label>
224
+ <comment>Your Message Content, (Max 918 characters. Text over 160 characters may incur multiple credit charges)</comment>
225
  <validate>required-entry validate-length minimum-length-1 maximum-length-160</validate>
226
  <tooltip>Enter your default message. You can use {{firstname}} for Firstname, {{middlename}} for Middlename, {{lastname}} for Lastname, {{fax}} for Fax, {{postal}} for Post Code, {{city}} for City, {{email}} for EmailAddress and {{order_id}} for Order Number.</tooltip>
227
  <frontend_type>textarea</frontend_type>
286
  </sender>
287
  <message translate="label comment">
288
  <label>Enter the Message</label>
289
+ <comment>Your Message Content, (Max 918 characters. Text over 160 characters may incur multiple credit charges)</comment>
290
  <validate>required-entry validate-length minimum-length-1 maximum-length-160</validate>
291
  <tooltip>Enter your default message. You can use {{firstname}} for Firstname, {{middlename}} for Middlename, {{lastname}} for Lastname, {{fax}} for Fax, {{postal}} for Post Code, {{city}} for City, {{email}} for EmailAddress and {{order_id}} for Order Number.</tooltip>
292
  <frontend_type>textarea</frontend_type>
351
  </sender>
352
  <message translate="label comment">
353
  <label>Enter the Message</label>
354
+ <comment>Your Message Content, (Max 918 characters. Text over 160 characters may incur multiple credit charges)</comment>
355
  <validate>required-entry validate-length minimum-length-1 maximum-length-160</validate>
356
  <tooltip>Enter your default message. You can use {{firstname}} for Firstname, {{middlename}} for Middlename, {{lastname}} for Lastname, {{fax}} for Fax, {{postal}} for Post Code, {{city}} for City, {{email}} for EmailAddress and {{order_id}} for Order Number.</tooltip>
357
  <frontend_type>textarea</frontend_type>
416
  </sender>
417
  <message translate="label comment">
418
  <label>Enter the Message</label>
419
+ <comment>Your Message Content, (Max 918 characters. Text over 160 characters may incur multiple credit charges)</comment>
420
  <validate>required-entry validate-length minimum-length-1 maximum-length-160</validate>
421
  <tooltip>Enter your default message. You can use {{firstname}} for Firstname, {{middlename}} for Middlename, {{lastname}} for Lastname, {{fax}} for Fax, {{postal}} for Post Code, {{city}} for City, {{email}} for EmailAddress and {{order_id}} for Order Number.</tooltip>
422
  <frontend_type>textarea</frontend_type>
450
  </receiver>
451
  </fields>
452
  </shipments>
453
+ <mtwoe translate="label">
454
+ <label>SMS Notifications for M2E Orders</label>
455
+ <frontend_type>text</frontend_type>
456
+ <sort_order>50</sort_order>
457
+ <show_in_default>1</show_in_default>
458
+ <show_in_website>1</show_in_website>
459
+ <show_in_store>1</show_in_store>
460
+ <fields>
461
+ <enabled translate="label comment">
462
+ <label>Enable M2E Sync</label>
463
+ <comment>This will send the sms on M2E orders</comment>
464
+ <frontend_type>select</frontend_type>
465
+ <source_model>adminhtml/system_config_source_yesno</source_model>
466
+ <sort_order>5</sort_order>
467
+ <show_in_default>1</show_in_default>
468
+ <show_in_website>1</show_in_website>
469
+ <show_in_store>1</show_in_store>
470
+ </enabled>
471
+ <senderid translate="label comment">
472
+ <label>Enter the Sender ID</label>
473
+ <comment>‘Company’ e.g. 'My Store’ (max: 11 alphanumeric characters. This is who the SMS will appear from when received)</comment>
474
+ <tooltip>You can enter upto 11 digits or characters</tooltip>
475
+ <validate>required-entry validate-length minimum-length-1 maximum-length-11</validate>
476
+ <frontend_type>text</frontend_type>
477
+ <sort_order>10</sort_order>
478
+ <show_in_default>1</show_in_default>
479
+ <show_in_website>1</show_in_website>
480
+ <show_in_store>1</show_in_store>
481
+ </senderid>
482
+ <notify translate="label comment">
483
+ <label>Enable Admin Notifications</label>
484
+ <comment>This option will send SMS to the admin when an Order is Placed</comment>
485
+ <frontend_type>select</frontend_type>
486
+ <source_model>adminhtml/system_config_source_yesno</source_model>
487
+ <sort_order>15</sort_order>
488
+ <show_in_default>1</show_in_default>
489
+ <show_in_website>1</show_in_website>
490
+ <show_in_store>1</show_in_store>
491
+ </notify>
492
+ <receiver translate="label comment">
493
+ <label>Admin Mobile</label>
494
+ <comment>Admin Mobile(s): Enter as many numbers as you like here, comma seperated if multiple e.g. 07700900000,07700900001</comment>
495
+ <validate>required-entry</validate>
496
+ <frontend_type>text</frontend_type>
497
+ <sort_order>20</sort_order>
498
+ <show_in_default>1</show_in_default>
499
+ <show_in_website>1</show_in_website>
500
+ <show_in_store>1</show_in_store>
501
+ <depends>
502
+ <notify>1</notify>
503
+ </depends>
504
+ </receiver>
505
+ <enablebay translate="label comment">
506
+ <label>Enable M2E Ebay Sync</label>
507
+ <comment>This will send the sms on M2E orders from ebay</comment>
508
+ <frontend_type>select</frontend_type>
509
+ <source_model>adminhtml/system_config_source_yesno</source_model>
510
+ <sort_order>25</sort_order>
511
+ <show_in_default>1</show_in_default>
512
+ <show_in_website>1</show_in_website>
513
+ <show_in_store>1</show_in_store>
514
+ </enablebay>
515
+ <messagebay translate="label comment">
516
+ <label>Enter the Message for Checkout</label>
517
+ <comment>Your Message Content, (Max 918 characters. Text over 160 characters may incur multiple credit charges)</comment>
518
+ <validate>required-entry validate-length minimum-length-1 maximum-length-918</validate>
519
+ <tooltip>Enter your default message. You can use Enter your default message. You can use {{ebay_order_id}} {{email}} {{name}} {{amount}} {{currency}} {{city}} {{country_code}} {{country_name}} {{state}} {{postal_code}} {{phone}} {{street}} {{service}} {{shipping_price}} {{payment_method}}</tooltip>
520
+ <frontend_type>textarea</frontend_type>
521
+ <sort_order>30</sort_order>
522
+ <show_in_default>1</show_in_default>
523
+ <show_in_website>1</show_in_website>
524
+ <show_in_store>1</show_in_store>
525
+ <depends>
526
+ <enablebay>1</enablebay>
527
+ </depends>
528
+ </messagebay>
529
+ <enablebaypay translate="label comment">
530
+ <label>Enable Message on Paid</label>
531
+ <comment>This option will send SMS when an Order is Paid</comment>
532
+ <frontend_type>select</frontend_type>
533
+ <source_model>adminhtml/system_config_source_yesno</source_model>
534
+ <sort_order>35</sort_order>
535
+ <show_in_default>1</show_in_default>
536
+ <show_in_website>1</show_in_website>
537
+ <show_in_store>1</show_in_store>
538
+ </enablebaypay>
539
+ <messagebaypay translate="label comment">
540
+ <label>Enter the Message For Payment</label>
541
+ <comment>Your Message Content, (Max 918 characters. Text over 160 characters may incur multiple credit charges)</comment>
542
+ <validate>required-entry validate-length minimum-length-1 maximum-length-918</validate>
543
+ <tooltip>Enter your default message. You can use {{ebay_order_id}} {{email}} {{name}} {{amount}} {{currency}} {{city}} {{country_code}} {{country_name}} {{state}} {{postal_code}} {{phone}} {{street}} {{service}} {{shipping_price}} {{payment_method}}</tooltip>
544
+ <frontend_type>textarea</frontend_type>
545
+ <sort_order>40</sort_order>
546
+ <show_in_default>1</show_in_default>
547
+ <show_in_website>1</show_in_website>
548
+ <show_in_store>1</show_in_store>
549
+ <depends>
550
+ <enablebay>1</enablebay>
551
+ <enablebaypay>1</enablebaypay>
552
+ </depends>
553
+ </messagebaypay>
554
+ <enablebayship translate="label comment">
555
+ <label>Enable Message on Shipment</label>
556
+ <comment>This option will send SMS when an Order is Shipped</comment>
557
+ <frontend_type>select</frontend_type>
558
+ <source_model>adminhtml/system_config_source_yesno</source_model>
559
+ <sort_order>45</sort_order>
560
+ <show_in_default>1</show_in_default>
561
+ <show_in_website>1</show_in_website>
562
+ <show_in_store>1</show_in_store>
563
+ </enablebayship>
564
+ <messagebayship translate="label comment">
565
+ <label>Enter the Message For Shipment</label>
566
+ <comment>Your Message Content, (Max 918 characters. Text over 160 characters may incur multiple credit charges)</comment>
567
+ <validate>required-entry validate-length minimum-length-1 maximum-length-918</validate>
568
+ <tooltip>Enter your default message. You can use Enter your default message. You can use {{ebay_order_id}} {{email}} {{name}} {{amount}} {{currency}} {{city}} {{country_code}} {{country_name}} {{state}} {{postal_code}} {{phone}} {{street}} {{service}} {{shipping_price}} {{payment_method}}</tooltip>
569
+ <frontend_type>textarea</frontend_type>
570
+ <sort_order>50</sort_order>
571
+ <show_in_default>1</show_in_default>
572
+ <show_in_website>1</show_in_website>
573
+ <show_in_store>1</show_in_store>
574
+ <depends>
575
+ <enablebay>1</enablebay>
576
+ <enablebayship>1</enablebayship>
577
+ </depends>
578
+ </messagebayship>
579
+ </fields>
580
+ </mtwoe>
581
  <footer>
582
  <frontend_model>voodoo/backend_page_footer</frontend_model>
583
  <sort_order>71</sort_order>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>TGM_Voodoo_Ext</name>
4
- <version>3.2.2</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
@@ -37,9 +37,9 @@ Release Stability: 'Stable'</description>
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>2015-11-03</date>
41
- <time>11:31:13</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="e8b0815fbf42d2fa46e4a189ec9ef9b2"/></dir></dir><file name="Credits-bkp.php" hash="f4473f43731901738a4cf079b2338e18"/><file name="Credits.php" hash="985372b01f30961fda66cc3ee97c5fe6"/><file name="GrabAccount.php" hash="3cd93790751c055d2bbb3a8498f25671"/><file name="GrabApiAccount.php" hash="79850ed22302447ac5e3a4ca905a1f55"/><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="79fd7a0cb9d8b2bcb4f3ebf24407eaf6"/></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="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="2e777d3efc9676523b7f0e27de7572f8"/><dir name="Type"><file name="Onepage.php" hash="769b2910e6d213436ed04f137b0ca184"/></dir><file name="Voodoo.php" hash="c5772968994ecbfe0390ba858a393fdb"/></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="a3bde2945c9e3dbe38cee28ac964a2f2"/><file name="system.xml" hash="0440e4acf86149d319bd333e44018ebb"/></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>3.3.8</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
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:22:40</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="6ca188e49ec0e715f30002d47a695dd9"/></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="7df769113d85779cc87f877cb34060b2"/><file name="system.xml" hash="c2813783f20dc178f88b09d077cf5304"/></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>