Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: LokeyCoding/Mediaburst_Sms
base: a101587ba4
...
head fork: LokeyCoding/Mediaburst_Sms
compare: aadfedab7a
  • 2 commits
  • 7 files changed
  • 0 commit comments
  • 1 contributor
View
1  .gitignore
@@ -1,2 +1,3 @@
/app/etc/local.xml
/media
+/var
View
10 app/code/community/Mediaburst/Sms/Helper/Data.php
@@ -1,6 +1,6 @@
<?php
/**
- * MediaBurst SMS Magento Integration
+ * Mediaburst SMS Magento Integration
*
* Copyright © 2011 by Mediaburst Limited
*
@@ -17,7 +17,7 @@
* OF THIS SOFTWARE.
*
* @category Mage
- * @package MediaBurst_Sms
+ * @package Mediaburst_Sms
* @license http://opensource.org/licenses/isc-license.txt
* @copyright Copyright © 2011 by Mediaburst Limited
* @author Lee Saferite <lee.saferite@lokeycoding.com>
@@ -26,7 +26,7 @@
/**
* Helper
*/
-class MediaBurst_Sms_Helper_Data extends Mage_Core_Helper_Abstract implements MediaBurst_Sms_Model_ApiConfig
+class Mediaburst_Sms_Helper_Data extends Mage_Core_Helper_Abstract implements Mediaburst_Sms_Model_ApiConfig
{
const XML_CONFIG_BASE_PATH = 'mediaburst_sms/';
@@ -280,7 +280,7 @@ public function generateOrderUnheldContent(Mage_Sales_Model_Order $order)
* Convert a result array into a series of session messages
*
* @param Mage_Core_Model_Session_Abstract $session
- * @return MediaBurst_Sms_Helper_Data
+ * @return Mediaburst_Sms_Helper_Data
*/
public function reportResults(Mage_Core_Model_Session_Abstract $session, array $result)
{
@@ -341,7 +341,7 @@ public function getTelephone(Mage_Sales_Model_Order $order)
*
* @param Mage_Sales_Model_Order $order
* @param string $comment
- * @return MediaBurst_Sms_Helper_Data
+ * @return Mediaburst_Sms_Helper_Data
*/
public function addOrderComment(Mage_Sales_Model_Order $order, $comment)
{
View
8 app/code/community/Mediaburst/Sms/etc/adminhtml.xml
@@ -9,22 +9,22 @@
<children>
<pending translate="title">
<title>Pending</title>
- <action>adminhtml/mediaBurst_sms/pending</action>
+ <action>adminhtml/mediaburst_sms/pending</action>
<sort_order>100</sort_order>
</pending>
<sent translate="title">
<title>Sent</title>
- <action>adminhtml/mediaBurst_sms/sent</action>
+ <action>adminhtml/mediaburst_sms/sent</action>
<sort_order>200</sort_order>
</sent>
<failed translate="title">
<title>Failed</title>
- <action>adminhtml/mediaBurst_sms/failed</action>
+ <action>adminhtml/mediaburst_sms/failed</action>
<sort_order>300</sort_order>
</failed>
<check translate="title">
<title>View/Buy Credits</title>
- <action>adminhtml/mediaBurst_sms/check</action>
+ <action>adminhtml/mediaburst_sms/check</action>
<sort_order>400</sort_order>
</check>
</children>
View
2  app/code/community/Mediaburst/Sms/etc/config.xml
@@ -2,7 +2,7 @@
<config>
<modules>
<Mediaburst_Sms>
- <version>1.1.4</version>
+ <version>1.1.5</version>
</Mediaburst_Sms>
</modules>
<global>
View
0  ...l/MediaBurst_Sms/mysql4-install-1.0.0.php → ...l/Mediaburst_Sms/mysql4-install-1.0.0.php
File renamed without changes
View
0  ...aBurst_Sms/mysql4-upgrade-1.0.0-1.1.2.php → ...aburst_Sms/mysql4-upgrade-1.0.0-1.1.2.php
File renamed without changes
View
22 app/design/adminhtml/default/default/layout/mediaburst/sms.xml
@@ -2,16 +2,16 @@
<layout>
<adminhtml_mediaburst_sms_pending>
<reference name="content">
- <block type="MediaBurst_Sms/GridContainer" name="mediaburst_sms.gridcontainer">
+ <block type="Mediaburst_Sms/GridContainer" name="mediaburst_sms.gridcontainer">
<action method="setHeaderText">
<param>Pending SMS Messages</param>
</action>
<action method="removeButton">
<param>add</param>
</action>
- <block type="MediaBurst_Sms/PendingGrid" name="mediaburst_sms.grid" as="grid">
+ <block type="Mediaburst_Sms/PendingGrid" name="mediaburst_sms.grid" as="grid">
<action method="setCollectionResourceModel">
- <param>MediaBurst_Sms/Message_Collection</param>
+ <param>Mediaburst_Sms/Message_Collection</param>
</action>
<action method="setDefaultDir">
<param>DESC</param>
@@ -22,16 +22,16 @@
</adminhtml_mediaburst_sms_pending>
<adminhtml_mediaburst_sms_sent>
<reference name="content">
- <block type="MediaBurst_Sms/GridContainer" name="mediaburst_sms.gridcontainer">
+ <block type="Mediaburst_Sms/GridContainer" name="mediaburst_sms.gridcontainer">
<action method="setHeaderText">
<param>Sent SMS Messages</param>
</action>
<action method="removeButton">
<param>add</param>
</action>
- <block type="MediaBurst_Sms/SentGrid" name="mediaburst_sms.grid" as="grid">
+ <block type="Mediaburst_Sms/SentGrid" name="mediaburst_sms.grid" as="grid">
<action method="setCollectionResourceModel">
- <param>MediaBurst_Sms/Message_Collection</param>
+ <param>Mediaburst_Sms/Message_Collection</param>
</action>
<action method="setDefaultDir">
<param>DESC</param>
@@ -42,16 +42,16 @@
</adminhtml_mediaburst_sms_sent>
<adminhtml_mediaburst_sms_failed>
<reference name="content">
- <block type="MediaBurst_Sms/GridContainer" name="mediaburst_sms.gridcontainer">
+ <block type="Mediaburst_Sms/GridContainer" name="mediaburst_sms.gridcontainer">
<action method="setHeaderText">
<param>Failed SMS Messages</param>
</action>
<action method="removeButton">
<param>add</param>
</action>
- <block type="MediaBurst_Sms/FailedGrid" name="mediaburst_sms.grid" as="grid">
+ <block type="Mediaburst_Sms/FailedGrid" name="mediaburst_sms.grid" as="grid">
<action method="setCollectionResourceModel">
- <param>MediaBurst_Sms/Message_Collection</param>
+ <param>Mediaburst_Sms/Message_Collection</param>
</action>
<action method="setDefaultDir">
<param>DESC</param>
@@ -62,14 +62,14 @@
</adminhtml_mediaburst_sms_failed>
<adminhtml_mediaburst_sms_check>
<reference name="content">
- <block type="MediaBurst_Sms/GridContainer" name="mediaburst_sms.gridcontainer">
+ <block type="Mediaburst_Sms/GridContainer" name="mediaburst_sms.gridcontainer">
<action method="setHeaderText">
<param>Remaining Credits</param>
</action>
<action method="removeButton">
<param>add</param>
</action>
- <block type="MediaBurst_Sms/CreditReportGrid" name="mediaburst_sms.grid" as="grid">
+ <block type="Mediaburst_Sms/CreditReportGrid" name="mediaburst_sms.grid" as="grid">
<action method="registerBuyButton" />
</block>
</block>

No commit comments for this range

Something went wrong with that request. Please try again.