cartsguru - Version 1.3.6

Version Notes

- Fix totalET for large orders

Download this release

Release Info

Developer Maxime Pruvost
Extension cartsguru
Version 1.3.6
Comparing to
See all releases


Code changes from version 1.3.5 to 1.3.6

Files changed (6) hide show
  1. app/code/local/Cartsguru/Model/Webservice.php +3 -3
  2. app/code/local/Cartsguru/etc/config.xml +1 -1
  3. app/code/local/Cartsguru/sql/cartsguru_setup/upgrade-1.3.5-1.3.6.php +6 -0
  4. app/locale/en_US/CartsGuru.csv +0 -3
  5. app/locale/fr_FR/CartsGuru.csv +0 -3
  6. package.xml +5 -5
app/code/local/Cartsguru/Model/Webservice.php CHANGED
@@ -16,7 +16,7 @@ class Cartsguru_Model_Webservice
16
  const QUOTES_CACHE_TAG = 'cartsguru_carts';
17
  const QUOTES_CACHE_TTL = 1800; // 30min in seconds
18
 
19
- const _CARTSGURU_VERSION_ = '1.3.5';
20
 
21
  public function isStoreConfigured($store = null)
22
  {
@@ -202,7 +202,7 @@ class Cartsguru_Model_Webservice
202
  'isNewCustomer' => $helper->isNewCustomer($email)
203
  );
204
  // We do this to include the discounts in the totalET
205
- $totalET = number_format((float)($order->getGrandTotal() - $order->getShippingAmount() - $order->getTaxAmount()), 2);
206
 
207
  return array(
208
  'siteId' => $helper->getStoreConfig('siteid', $store), // SiteId is part of plugin configuration
@@ -351,7 +351,7 @@ class Cartsguru_Model_Webservice
351
  'id' => $quote->getId(), // Order reference, the same display to the buyer
352
  'creationDate' => $this->formatDate($quote->getCreatedAt()), // Date of the order as string in json format
353
  'totalET' => (float)$quote->getSubtotal(), // Amount excluded taxes and excluded shipping
354
- 'totalATI' => $this->getTotalATI($items), // Amount included taxes and excluded shipping
355
  'currency' => $quote->getQuoteCurrencyCode(), // Currency as USD, EUR
356
  'ip' => $quote->getRemoteIp(), // User IP
357
  'accountId' => $email, // Account id of the buyer
16
  const QUOTES_CACHE_TAG = 'cartsguru_carts';
17
  const QUOTES_CACHE_TTL = 1800; // 30min in seconds
18
 
19
+ const _CARTSGURU_VERSION_ = '1.3.6';
20
 
21
  public function isStoreConfigured($store = null)
22
  {
202
  'isNewCustomer' => $helper->isNewCustomer($email)
203
  );
204
  // We do this to include the discounts in the totalET
205
+ $totalET = number_format((float)($order->getGrandTotal() - $order->getShippingAmount() - $order->getTaxAmount()), 2, '.', '');
206
 
207
  return array(
208
  'siteId' => $helper->getStoreConfig('siteid', $store), // SiteId is part of plugin configuration
351
  'id' => $quote->getId(), // Order reference, the same display to the buyer
352
  'creationDate' => $this->formatDate($quote->getCreatedAt()), // Date of the order as string in json format
353
  'totalET' => (float)$quote->getSubtotal(), // Amount excluded taxes and excluded shipping
354
+ 'totalATI' => (float)$this->getTotalATI($items), // Amount included taxes and excluded shipping
355
  'currency' => $quote->getQuoteCurrencyCode(), // Currency as USD, EUR
356
  'ip' => $quote->getRemoteIp(), // User IP
357
  'accountId' => $email, // Account id of the buyer
app/code/local/Cartsguru/etc/config.xml CHANGED
@@ -3,7 +3,7 @@
3
  <!-- plugin name -->
4
  <modules>
5
  <Cartsguru>
6
- <version>1.3.5</version>
7
  </Cartsguru>
8
  </modules>
9
  <global>
3
  <!-- plugin name -->
4
  <modules>
5
  <Cartsguru>
6
+ <version>1.3.6</version>
7
  </Cartsguru>
8
  </modules>
9
  <global>
app/code/local/Cartsguru/sql/cartsguru_setup/upgrade-1.3.5-1.3.6.php ADDED
@@ -0,0 +1,6 @@
 
 
 
 
 
 
1
+ <?php
2
+ /* @var $installer Mage_Core_Model_Resource_Setup */
3
+ $installer = $this;
4
+
5
+ $installer->startSetup();
6
+ $installer->endSetup();
app/locale/en_US/CartsGuru.csv DELETED
@@ -1,3 +0,0 @@
1
- "Extension Options","Extension Options"
2
- "API auth key","API auth key"
3
- "Site Id","Site Id"
 
 
 
app/locale/fr_FR/CartsGuru.csv DELETED
@@ -1,3 +0,0 @@
1
- "Extension Options","Options"
2
- "API auth key","Clef d'authentification"
3
- "Site Id","Identifiant du site"
 
 
 
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>cartsguru</name>
4
- <version>1.3.5</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/gpl-license.php">GPL</license>
7
  <channel>community</channel>
@@ -16,11 +16,11 @@ Effortlessly reduce the number of abandoned shopping carts by automating telepho
16
  &#xD;
17
  - SMS Callback &amp; Push SMS&#xD;
18
  Send to your prospective customers having abandoned a cart, an SMS suggesting a free call back from your customer relations service, a straightforward SMS reminder or an SMS offering a personalized discount</description>
19
- <notes>- Improve compatibility with 1.9.0.x</notes>
20
  <authors><author><name>Maxime Pruvost</name><user>cgmaximepruvost</user><email>maxime@carts.guru</email></author></authors>
21
- <date>2017-05-19</date>
22
- <time>09:20:13</time>
23
- <contents><target name="magelocal"><dir name="Cartsguru"><dir name="Block"><file name="Pixel.php" hash="8ea68eb970f1ed7f91060980e74422ee"/></dir><dir name="Helper"><file name="Data.php" hash="373fe1f83d1cfa5b18a3b2f36bd1d10b"/><file name="Tools.php" hash="27ebd500bc026f43fab3088242e68eb8"/></dir><dir name="Model"><file name="Catalog.php" hash="c20f73f2d595e6047d0649cc26b4c152"/><file name="Observer.php" hash="24b02ee36824d72c3b4d48a98053bfe0"/><file name="Webservice.php" hash="e7ddcd2937e76bd1722a20ba3ca5f0ae"/></dir><dir name="controllers"><file name="AdminController.php" hash="be9ac89db2a881bcfcc16b8a459cbcea"/><file name="CatalogController.php" hash="2d051f18a991124ea6334782e339b89c"/><file name="IndexController.php" hash="98cdc6eeca4d9162d4f447b5c3523f1e"/><file name="RecovercartController.php" hash="b247e0a3b828d6e1af39a0d8e213e2bf"/><file name="SaveaccountController.php" hash="a4afe20c0d1fbe33589da80f54dc3748"/></dir><dir name="etc"><file name="config.xml" hash="d8078dd0287730298cbd590c3036654b"/><file name="system.xml" hash="cb0fbf86d2be47dbd719739ee79c4cba"/></dir><dir name="sql"><dir name="cartsguru_setup"><file name="install-1.0.0.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.0.0-1.0.1.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.0.1-1.0.2.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.0.2-1.1.0.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.1.0-1.1.1.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.1.1-1.1.2.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.1.2-1.1.3.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.1.3-1.1.4 .php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.1.4-1.1.5.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.1.5-1.2.0.php" hash="45dbf71b12ca70bd4d994296ba0624d6"/><file name="upgrade-1.2.0-1.2.1.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.2.1-1.2.2.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.2.10-1.2.11.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.2.11-1.2.12.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.2.12-1.2.13.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.2.13-1.2.14.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.2.14-1.2.15.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.2.15-1.2.16.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.2.16-1.3.0.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.2.2-1.2.3.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.2.3-1.2.4.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.2.4-1.2.5.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.2.5-1.2.6.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.2.6-1.2.7.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.2.7-1.2.8.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.2.8-1.2.9.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.2.9-1.2.10.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.3.0-1.3.1.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.3.1-1.3.2.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.3.2-1.3.3.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.3.3-1.3.4.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.3.4-1.3.5.php" hash="84cb92331d31afda4f06aca50dbd597e"/></dir></dir></dir></target><target name="magelocale"><dir name="fr_FR"><file name="CartsGuru.csv" hash="b6d51893c33ddef1d53372d3a23b036c"/></dir><dir name="en_US"><file name="CartsGuru.csv" hash="921cb4133db47471456759443bb269f5"/></dir></target><target name="mageetc"><dir name="modules"><file name="Cartsguru.xml" hash="32bfa7d63b1a5b6b8f7977bf31af4e28"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="cartsguru.xml" hash="a886b0c3b06fdc08d1602c3f1fa0eff0"/></dir><dir name="template"><dir name="cartsguru"><dir name="checkout"><file name="purchase.phtml" hash="1035c7fed71153aa4c9f5e2d765deb7a"/></dir><file name="pixel.phtml" hash="58cbe4af75828b12325251cb4cf1d594"/><dir name="product"><file name="view.phtml" hash="9ab2487a583615c61e85a96ee0795ad3"/></dir></dir></dir></dir></dir></dir></target><target name="mageweb"><dir name="js"><dir name="cartsguru"><file name="checkout.js" hash="f80f26b465eac6f702e87e05687c4bdd"/></dir></dir></target></contents>
24
  <compatible/>
25
  <dependencies><required><php><min>5.3.0</min><max>7.1.0</max></php></required></dependencies>
26
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>cartsguru</name>
4
+ <version>1.3.6</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/gpl-license.php">GPL</license>
7
  <channel>community</channel>
16
  &#xD;
17
  - SMS Callback &amp; Push SMS&#xD;
18
  Send to your prospective customers having abandoned a cart, an SMS suggesting a free call back from your customer relations service, a straightforward SMS reminder or an SMS offering a personalized discount</description>
19
+ <notes>- Fix totalET for large orders</notes>
20
  <authors><author><name>Maxime Pruvost</name><user>cgmaximepruvost</user><email>maxime@carts.guru</email></author></authors>
21
+ <date>2017-07-13</date>
22
+ <time>14:21:05</time>
23
+ <contents><target name="magelocal"><dir name="Cartsguru"><dir name="Block"><file name="Pixel.php" hash="8ea68eb970f1ed7f91060980e74422ee"/></dir><dir name="Helper"><file name="Data.php" hash="373fe1f83d1cfa5b18a3b2f36bd1d10b"/><file name="Tools.php" hash="27ebd500bc026f43fab3088242e68eb8"/></dir><dir name="Model"><file name="Catalog.php" hash="c20f73f2d595e6047d0649cc26b4c152"/><file name="Observer.php" hash="24b02ee36824d72c3b4d48a98053bfe0"/><file name="Webservice.php" hash="fbbf1548da9d35294945f6be96cf5990"/></dir><dir name="controllers"><file name="AdminController.php" hash="be9ac89db2a881bcfcc16b8a459cbcea"/><file name="CatalogController.php" hash="2d051f18a991124ea6334782e339b89c"/><file name="IndexController.php" hash="98cdc6eeca4d9162d4f447b5c3523f1e"/><file name="RecovercartController.php" hash="b247e0a3b828d6e1af39a0d8e213e2bf"/><file name="SaveaccountController.php" hash="a4afe20c0d1fbe33589da80f54dc3748"/></dir><dir name="etc"><file name="config.xml" hash="c1fa45ad2527a58c9e32881474e09567"/><file name="system.xml" hash="cb0fbf86d2be47dbd719739ee79c4cba"/></dir><dir name="sql"><dir name="cartsguru_setup"><file name="install-1.0.0.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.0.0-1.0.1.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.0.1-1.0.2.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.0.2-1.1.0.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.1.0-1.1.1.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.1.1-1.1.2.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.1.2-1.1.3.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.1.3-1.1.4 .php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.1.4-1.1.5.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.1.5-1.2.0.php" hash="45dbf71b12ca70bd4d994296ba0624d6"/><file name="upgrade-1.2.0-1.2.1.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.2.1-1.2.2.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.2.10-1.2.11.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.2.11-1.2.12.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.2.12-1.2.13.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.2.13-1.2.14.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.2.14-1.2.15.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.2.15-1.2.16.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.2.16-1.3.0.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.2.2-1.2.3.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.2.3-1.2.4.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.2.4-1.2.5.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.2.5-1.2.6.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.2.6-1.2.7.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.2.7-1.2.8.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.2.8-1.2.9.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.2.9-1.2.10.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.3.0-1.3.1.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.3.1-1.3.2.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.3.2-1.3.3.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.3.3-1.3.4.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.3.4-1.3.5.php" hash="84cb92331d31afda4f06aca50dbd597e"/><file name="upgrade-1.3.5-1.3.6.php" hash="84cb92331d31afda4f06aca50dbd597e"/></dir></dir></dir></target><target name="magelocale"><dir name="fr_FR"><file name="CartsGuru.csv" hash=""/></dir><dir name="en_US"><file name="CartsGuru.csv" hash=""/></dir></target><target name="mageetc"><dir name="modules"><file name="Cartsguru.xml" hash="32bfa7d63b1a5b6b8f7977bf31af4e28"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="cartsguru.xml" hash="a886b0c3b06fdc08d1602c3f1fa0eff0"/></dir><dir name="template"><dir name="cartsguru"><dir name="checkout"><file name="purchase.phtml" hash="1035c7fed71153aa4c9f5e2d765deb7a"/></dir><file name="pixel.phtml" hash="58cbe4af75828b12325251cb4cf1d594"/><dir name="product"><file name="view.phtml" hash="9ab2487a583615c61e85a96ee0795ad3"/></dir></dir></dir></dir></dir></dir></target><target name="mageweb"><dir name="js"><dir name="cartsguru"><file name="checkout.js" hash="f80f26b465eac6f702e87e05687c4bdd"/></dir></dir></target></contents>
24
  <compatible/>
25
  <dependencies><required><php><min>5.3.0</min><max>7.1.0</max></php></required></dependencies>
26
  </package>