LoyaltyLion - Version 1.2.2

Version Notes

Add multi-website support for automatic API configuration.

Download this release

Release Info

Developer Dave Clark
Extension LoyaltyLion
Version 1.2.2
Comparing to
See all releases


Code changes from version 1.2.1 to 1.2.2

Files changed (4) hide show
  1. app/code/local/LoyaltyLion/Core/Model/Observer.php +5 -1
  2. app/code/local/LoyaltyLion/Core/etc/config.xml +1 -1
  3. app/etc/modules/LoyaltyLion_Core.xml +0 -0
  4. package.xml +1 -17
app/code/local/LoyaltyLion/Core/Model/Observer.php CHANGED
@@ -65,6 +65,9 @@ class LoyaltyLion_Core_Model_Observer {
65
 
66
  $order = $observer->getEvent()->getOrder();
67
 
 
 
 
68
  $data = array(
69
  'merchant_id' => $order->getId(),
70
  'customer_id' => $order->getCustomerId(),
@@ -89,7 +92,8 @@ class LoyaltyLion_Core_Model_Observer {
89
  $data['payment_status'] = 'paid';
90
  } else {
91
  $data['payment_status'] = 'partially_paid';
92
- $data['total_paid'] = $order->getBaseTotalPaid();
 
93
  }
94
 
95
  if ($order->getCouponCode()) {
65
 
66
  $order = $observer->getEvent()->getOrder();
67
 
68
+ # We can't track an order without a merchant_id
69
+ if (!$order || !$order->getId()) return;
70
+
71
  $data = array(
72
  'merchant_id' => $order->getId(),
73
  'customer_id' => $order->getCustomerId(),
92
  $data['payment_status'] = 'paid';
93
  } else {
94
  $data['payment_status'] = 'partially_paid';
95
+ $total_paid = $order->getBaseTotalPaid();
96
+ $data['total_paid'] = $total_paid === null ? 0 : $total_paid;
97
  }
98
 
99
  if ($order->getCouponCode()) {
app/code/local/LoyaltyLion/Core/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <LoyaltyLion_Core>
5
- <version>0.0.8</version>
6
  </LoyaltyLion_Core>
7
  </modules>
8
  <global>
2
  <config>
3
  <modules>
4
  <LoyaltyLion_Core>
5
+ <version>0.0.9</version>
6
  </LoyaltyLion_Core>
7
  </modules>
8
  <global>
app/etc/modules/LoyaltyLion_Core.xml CHANGED
File without changes
package.xml CHANGED
@@ -1,18 +1,2 @@
1
  <?xml version="1.0"?>
2
- <package>
3
- <name>LoyaltyLion</name>
4
- <version>1.2.1</version>
5
- <stability>stable</stability>
6
- <license>MIT</license>
7
- <channel>community</channel>
8
- <extends/>
9
- <summary>Use LoyaltyLion to add your own loyalty program in minutes and gain valuable customer insights.</summary>
10
- <description>Increase activity and customer happiness by offering points for signups, purchases, visits and referrals. Your customers will collect points and redeem them for rewards to use at your store, which encourages repeat visits and long term loyalty.</description>
11
- <notes>Add multi-website support for automatic API configuration.</notes>
12
- <authors><author><name>Dave Clark</name><user>clarkdave_ll</user><email>dave@loyaltylion.com</email></author><author><name>Patrick Molgaard</name><user>draaglom</user><email>patrick@loyaltylion.com</email></author></authors>
13
- <date>2016-06-28</date>
14
- <time>16:25:30</time>
15
- <contents><target name="magelocal"><dir name="LoyaltyLion"><dir><dir name="Core"><dir name="Block"><file name="Sdk.php" hash="0f1269720db26f76acf791b3e944567b"/></dir><dir name="Helper"><file name="Data.php" hash="3ac59332d4eb3469869d84a07f949d17"/></dir><dir name="Model"><file name="Observer.php" hash="26b13eb01926b6f9269c15fca603df99"/></dir><dir name="etc"><file name="config.xml" hash="f94760b90c1d49d255cbb3e3d984365e"/><file name="system.xml" hash="37d1b84b3ca2dbdc78b7194b91191de5"/></dir><dir name="lib"><dir name="loyaltylion-client"><dir name="lib"><file name="connection.php" hash="56f73205995ca0925a1b4cb6b2deb56c"/></dir><file name="main.php" hash="2dc4f4fc1caf2ece19417b44c48e21fa"/></dir></dir></dir><dir name="CouponImport"><dir name="Block"><dir name="Adminhtml"><file name="Button.php" hash="3fe32ef718f21cdbed71bd023158960a"/><file name="Rule.php" hash="05ae099e2a7d71116e2ece3bc07a6501"/></dir></dir><dir name="Model"><dir name="Api2"><dir name="Coupon"><dir name="Rest"><dir name="Admin"><file name="V1.php" hash="ed9a42c0d8945b69c7dc3436609911d1"/></dir></dir></dir><file name="Coupon.php" hash="bbaf6c59b4b132eb54a72e0688f3fab1"/><file name="PriceRule.php" hash="4b8d85f224fd5f121727977066c50cd1"/><dir name="Pricerule"><dir name="Rest"><dir name="Admin"><file name="V1.php" hash="72c2f66b0de2996a612c7509cbbd82f2"/></dir></dir></dir></dir><file name="Rule.php" hash="6ed65686220c97efbbc7316a76571305"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="QuicksetupController.php" hash="c0f2f805a309ff891e70aee205047f1f"/></dir></dir><dir name="etc"><file name="api2.xml" hash="e8ec47daccbb43584239fe3aeac9c122"/><file name="config.xml" hash="34e1654a09f5f7ee6c42b12d915e9c4f"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="loyaltylion"><dir><dir name="core"><file name="sdk.phtml" hash="5e159702c28c50236887eb31b488539a"/></dir></dir></dir></dir><dir name="layout"><file name="loyaltylion.xml" hash="f2c14ac8327d4eea6d8da6dfd61ede4c"/></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="loyaltylion"><dir><dir name="system"><dir name="config"><file name="button.phtml" hash="caa9c44d6b504f6c625f2f0aaa9a21c2"/></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="LoyaltyLion_Core.xml" hash="33446455fb634c28776a0fe45095a459"/><file name="LoyaltyLion_CouponImport.xml" hash="ff6ba2c149886ab7ee7de418619bb734"/></dir></target></contents>
16
- <compatible/>
17
- <dependencies><required><php><min>5.3.0</min><max>7.0.0</max></php></required></dependencies>
18
- </package>
1
  <?xml version="1.0"?>
2
+ <package><name>LoyaltyLion</name><version>1.2.2</version><stability>stable</stability><license>MIT</license><channel>community</channel><extends></extends><summary>Use LoyaltyLion to add your own loyalty program in minutes and gain valuable customer insights.</summary><description>Increase activity and customer happiness by offering points for signups, purchases, visits and referrals. Your customers will collect points and redeem them for rewards to use at your store, which encourages repeat visits and long term loyalty.</description><notes>Add multi-website support for automatic API configuration.</notes><authors><author><name>Dave Clark</name><user>clarkdave_ll</user><email>dave@loyaltylion.com</email></author></authors><date>2017-01-12</date><time>6:20:51</time><compatible></compatible><dependencies><required><php><min>5.3.0</min><max>7.0.0</max></php></required></dependencies><contents><target name="mage"><dir name="app"><dir name="code"><dir name="local"><dir name="LoyaltyLion"><dir name="Core"><dir name="Block"><file name="Sdk.php" hash="0f1269720db26f76acf791b3e944567b"/></dir><dir name="etc"><file name="config.xml" hash="8f9ebce4464928c5d45f9e51981952b4"/><file name="system.xml" hash="37d1b84b3ca2dbdc78b7194b91191de5"/></dir><dir name="Helper"><file name="Data.php" hash="3ac59332d4eb3469869d84a07f949d17"/></dir><dir name="lib"><dir name="loyaltylion-client"><file name="main.php" hash="2dc4f4fc1caf2ece19417b44c48e21fa"/><dir name="lib"><file name="connection.php" hash="56f73205995ca0925a1b4cb6b2deb56c"/></dir></dir></dir><dir name="Model"><file name="Observer.php" hash="293d4aed71cc3ca6d53ec51dbe21e40f"/></dir></dir><dir name="CouponImport"><dir name="Block"><dir name="Adminhtml"><file name="Button.php" hash="3fe32ef718f21cdbed71bd023158960a"/><file name="Rule.php" hash="05ae099e2a7d71116e2ece3bc07a6501"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="QuicksetupController.php" hash="c0f2f805a309ff891e70aee205047f1f"/></dir></dir><dir name="etc"><file name="api2.xml" hash="e8ec47daccbb43584239fe3aeac9c122"/><file name="config.xml" hash="34e1654a09f5f7ee6c42b12d915e9c4f"/></dir><dir name="Model"><file name="Rule.php" hash="6ed65686220c97efbbc7316a76571305"/><dir name="Api2"><file name="Coupon.php" hash="bbaf6c59b4b132eb54a72e0688f3fab1"/><file name="PriceRule.php" hash="4b8d85f224fd5f121727977066c50cd1"/><dir name="Coupon"><dir name="Rest"><dir name="Admin"><file name="V1.php" hash="ed9a42c0d8945b69c7dc3436609911d1"/></dir></dir></dir><dir name="Pricerule"><dir name="Rest"><dir name="Admin"><file name="V1.php" hash="72c2f66b0de2996a612c7509cbbd82f2"/></dir></dir></dir></dir></dir></dir></dir></dir></dir><dir name="design"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="loyaltylion"><dir name="system"><dir name="config"><file name="button.phtml" hash="caa9c44d6b504f6c625f2f0aaa9a21c2"/></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="loyaltylion.xml" hash="f2c14ac8327d4eea6d8da6dfd61ede4c"/></dir><dir name="template"><dir name="loyaltylion"><dir name="core"><file name="sdk.phtml" hash="5e159702c28c50236887eb31b488539a"/></dir></dir></dir></dir></dir></dir></dir><dir name="etc"><dir name="modules"><file name="LoyaltyLion_Core.xml" hash="33446455fb634c28776a0fe45095a459"/><file name="LoyaltyLion_CouponImport.xml" hash="ff6ba2c149886ab7ee7de418619bb734"/></dir></dir></dir></target></contents></package>