increasingly_key - Version 1.0.18

Version Notes

Added fix to support order tracking after "PageSay" payment.

Download this release

Release Info

Developer Increasingly
Extension increasingly_key
Version 1.0.18
Comparing to
See all releases


Code changes from version 1.0.17 to 1.0.18

Files changed (9) hide show
  1. app/code/community/Increasingly/Analytics/Block/Pagetype.php +1 -1
  2. app/code/community/Increasingly/Analytics/Helper/ProductFormatter.php +42 -38
  3. app/code/community/Increasingly/Analytics/Model/Observer.php +29 -34
  4. app/code/community/Increasingly/Analytics/controllers/AddbundletocartController.php +8 -8
  5. app/code/community/Increasingly/Analytics/controllers/ProductsImportApiController.php +8 -19
  6. app/code/community/Increasingly/Analytics/etc/config.xml +3 -3
  7. app/code/community/Increasingly/Analytics/sql/increasingly_analytics_setup/mysql4-install-1.0.18.php +29 -0
  8. app/design/frontend/base/default/template/increasingly/pagetype.phtml +1 -1
  9. package.xml +6 -6
app/code/community/Increasingly/Analytics/Block/Pagetype.php CHANGED
@@ -93,4 +93,4 @@ class Increasingly_Analytics_Block_Pagetype extends Mage_Core_Block_Template
93
  }
94
  return $isLoggedIn;
95
  }
96
- }
93
  }
94
  return $isLoggedIn;
95
  }
96
+ }
app/code/community/Increasingly/Analytics/Helper/ProductFormatter.php CHANGED
@@ -68,31 +68,18 @@ class Increasingly_Analytics_Helper_ProductFormatter extends Mage_Core_Helper_Ab
68
  $productData['special_price'] = $priceFormatter->format($product->getSpecialPrice());
69
  }
70
 
71
- if ($product->hasData('description'))
 
72
  {
73
- $productData['description'] = $product->getData('description');
 
74
  }
75
-
76
- if($productData['description'] == null || empty($productData['description']))
77
- {
78
- if($product->getResource()->getAttribute('description'))
79
- {
80
- $productData['description'] = $product->getDescription();
81
- }
82
- }
83
 
84
- if ($product->hasData('short_description'))
85
- {
86
- $productData['short_description'] = $product->getData('short_description');
87
- }
88
-
89
- if($productData['short_description'] == null || empty($productData['short_description']))
90
  {
91
- if($product->getResource()->getAttribute('short_description'))
92
- {
93
- $productData['short_description'] = $product->getShortDescription();
94
- }
95
- }
96
 
97
  if($product->getResource()->getAttribute('status'))
98
  {
@@ -102,15 +89,24 @@ class Increasingly_Analytics_Helper_ProductFormatter extends Mage_Core_Helper_Ab
102
  $productDefaultImage = '';
103
  if($product->getResource()->getAttribute('image'))
104
  {
105
- $productDefaultImage = $product->getData('image');
106
- if(!empty($productDefaultImage) && $productDefaultImage !== 'no_selection')
107
- {
108
- $productData['image_url'] = Mage::getModel('catalog/product_media_config')->getMediaUrl($product->getImage());
109
- }
110
- else
111
- {
112
- $productData['image_url'] = $product->getImageUrl();
113
- }
 
 
 
 
 
 
 
 
 
114
  }
115
 
116
  $productData['original_image_url'] = $this->buildImageUrl($product);
@@ -278,18 +274,26 @@ class Increasingly_Analytics_Helper_ProductFormatter extends Mage_Core_Helper_Ab
278
 
279
  protected function buildImageUrl($product)
280
  {
281
- $store = Mage::app()->getStore();
282
- $url = null;
283
- $helper = Mage::helper('increasingly_analytics');
284
- $imageVersion = $helper->getProductImageVersion($store);
285
- $img = $product->getData($imageVersion);
286
- $img = $this->isValidImage($img) ? $img : $product->getData('image');
287
- if ($this->isValidImage($img)) {
288
- // We build the image url manually in order get the correct base url
 
 
 
289
  $baseUrl = rtrim($store->getBaseUrl('media'), '/');
290
  $file = str_replace(DS, '/', $img);
291
  $file = ltrim($file, '/');
292
  $url = $baseUrl.'/catalog/product/'.$file;
 
 
 
 
 
293
  }
294
  return $url;
295
  }
68
  $productData['special_price'] = $priceFormatter->format($product->getSpecialPrice());
69
  }
70
 
71
+
72
+ if($product->getResource()->getAttribute('description'))
73
  {
74
+ $productData['description'] = Mage::getModel('catalog/product')
75
+ ->load($product->getId())->getDescription();
76
  }
 
 
 
 
 
 
 
 
77
 
78
+ if($product->getResource()->getAttribute('short_description'))
 
 
 
 
 
79
  {
80
+ $productData['short_description'] = Mage::getModel('catalog/product')
81
+ ->load($product->getId())->getShortDescription();
82
+ }
 
 
83
 
84
  if($product->getResource()->getAttribute('status'))
85
  {
89
  $productDefaultImage = '';
90
  if($product->getResource()->getAttribute('image'))
91
  {
92
+ try
93
+ {
94
+ $productDefaultImage = Mage::getModel('catalog/product_media_config')->getMediaUrl(Mage::getModel('catalog/product')
95
+ ->load($product->getId())->getImage());
96
+
97
+ if(!empty($productDefaultImage) && $productDefaultImage !== 'no_selection')
98
+ {
99
+ $productData['image_url'] = $productDefaultImage;
100
+ }
101
+ else
102
+ {
103
+ $productData['image_url'] = $product->getImageUrl();
104
+ }
105
+ }
106
+ catch(Exception $e)
107
+ {
108
+ Mage::log($e->getMessage(), null, 'Increasingly_Analytics.log');
109
+ }
110
  }
111
 
112
  $productData['original_image_url'] = $this->buildImageUrl($product);
274
 
275
  protected function buildImageUrl($product)
276
  {
277
+ $url = null;
278
+
279
+ try
280
+ {
281
+ $store = Mage::app()->getWebsite(true)->getDefaultGroup()->getDefaultStore();
282
+ $helper = Mage::helper('increasingly_analytics');
283
+ $imageVersion = $helper->getProductImageVersion($store);
284
+ $img = $product->getData($imageVersion);
285
+ $img = $this->isValidImage($img) ? $img : Mage::getModel('catalog/product')->load($product->getId())->getImage();
286
+
287
+ if ($this->isValidImage($img)) {
288
  $baseUrl = rtrim($store->getBaseUrl('media'), '/');
289
  $file = str_replace(DS, '/', $img);
290
  $file = ltrim($file, '/');
291
  $url = $baseUrl.'/catalog/product/'.$file;
292
+ }
293
+ }
294
+ catch(Exception $e)
295
+ {
296
+ Mage::log($e->getMessage(), null, 'Increasingly_Analytics.log');
297
  }
298
  return $url;
299
  }
app/code/community/Increasingly/Analytics/Model/Observer.php CHANGED
@@ -290,27 +290,35 @@ class Increasingly_Analytics_Model_Observer
290
  * @return void
291
  */
292
  public function applyCartDiscount(Varien_Event_Observer $observer)
293
- {
294
  try
295
  {
296
  $bundle_product_ids = [];
297
  $quote_product_ids = [];
 
298
  $cookieValue = Mage::getModel('core/cookie')->get('ivid');
 
 
 
299
  $userBundleCollection = Mage::getModel('increasingly_analytics/bundle')->getCollection()->addFieldToFilter('increasingly_visitor_id',$cookieValue);
 
300
  $items = $observer->getEvent()->getQuote()->getAllItems();
301
  $eligibleProducts = [];
302
  $discount = 0;
 
303
  foreach ($items as $item) {
304
  array_push($quote_product_ids, $item->getProductId());
305
  }
 
306
  foreach ($userBundleCollection as $bundle) {
307
  //First Bundle products
308
  $bundle_product_ids = explode(',', $bundle->getProductIds());
 
309
  $productsIds = array_intersect($quote_product_ids, $bundle_product_ids);
310
  if(count($productsIds) == count($bundle_product_ids) )
311
  $discount += $bundle->getDiscountPrice();
312
  }
313
-
314
  if($discount > 0){
315
  $quote=$observer->getEvent()->getQuote();
316
  $quoteid=$quote->getId();
@@ -341,26 +349,27 @@ class Increasingly_Analytics_Model_Observer
341
 
342
  $quote->setSubtotal((float) $quote->getSubtotal() + $address->getSubtotal());
343
  $quote->setBaseSubtotal((float) $quote->getBaseSubtotal() + $address->getBaseSubtotal());
344
-
345
  $quote->setSubtotalWithDiscount(
346
  (float) $quote->getSubtotalWithDiscount() + $address->getSubtotalWithDiscount()
347
  );
 
348
  $quote->setBaseSubtotalWithDiscount(
349
  (float) $quote->getBaseSubtotalWithDiscount() + $address->getBaseSubtotalWithDiscount()
350
  );
351
 
352
  $quote->setGrandTotal((float) $quote->getGrandTotal() + $address->getGrandTotal());
353
  $quote->setBaseGrandTotal((float) $quote->getBaseGrandTotal() + $address->getBaseGrandTotal());
354
-
355
  $quote ->save();
356
-
357
  $quote->setGrandTotal($quote->getBaseSubtotal()-$discountAmount)
358
  ->setBaseGrandTotal($quote->getBaseSubtotal()-$discountAmount)
359
  ->setSubtotalWithDiscount($quote->getBaseSubtotal()-$discountAmount)
360
  ->setBaseSubtotalWithDiscount($quote->getBaseSubtotal()-$discountAmount)
361
  ->save();
362
 
363
-
364
  if($address->getAddressType()==$canAddItems) {
365
  //echo $address->setDiscountAmount; exit;
366
  $address->setSubtotalWithDiscount((float) $address->getSubtotalWithDiscount()-$discountAmount);
@@ -381,7 +390,7 @@ class Increasingly_Analytics_Model_Observer
381
  } //end: foreach
382
  //echo $quote->getGrandTotal();
383
 
384
- foreach($quote->getAllItems() as $item){
385
  //We apply discount amount based on the ratio between the GrandTotal and the RowTotal
386
  $rat=$item->getPriceInclTax()/$total;
387
  $ratdisc=$discountAmount*$rat;
@@ -393,15 +402,8 @@ class Increasingly_Analytics_Model_Observer
393
  }
394
  }
395
  catch(Exception $e)
396
- {
397
- Mage::log("Apply discount method - " . $e->getMessage(), null, 'Increasingly_Analytics.log');
398
- $error_info = array(
399
- 'method' => 'ApplyDiscountMethod',
400
- 'error_message' => $e->getMessage()
401
- );
402
-
403
- $helper = Mage::helper('increasingly_analytics');
404
- $helper->addEvent('track', 'track_error', $error_info);
405
  }
406
 
407
  }
@@ -413,33 +415,26 @@ class Increasingly_Analytics_Model_Observer
413
  */
414
  public function trackNewOrder(Varien_Event_Observer $observer)
415
  {
416
- $helper = Mage::helper('increasingly_analytics');
417
  try
418
  {
419
 
420
-
421
 
422
  if ($helper->isEnabled())
423
- {
424
- $data = array();
425
- $order = $observer->getOrder();
426
 
427
- if ($order->getId())
428
- {
429
- $data = $helper->buildOrderDetailsData($order);
430
- $helper->addEvent('track', 'order', $data);
431
- $helper->deleteBundleOnPurchase();
432
- }
433
  }
434
- }
435
  catch(Exception $e)
436
- {
437
  Mage::log("New order tracking - " . $e->getMessage(), null, 'Increasingly_Analytics.log');
438
- $error_info = array(
439
- 'method' => 'trackNewOrderMethod',
440
- 'error_message' => $e->getMessage()
441
- );
442
- $helper->addEvent('track', 'track_error', $error_info);
443
  }
444
  }
445
 
290
  * @return void
291
  */
292
  public function applyCartDiscount(Varien_Event_Observer $observer)
293
+ {
294
  try
295
  {
296
  $bundle_product_ids = [];
297
  $quote_product_ids = [];
298
+ //Increasingly Cookie
299
  $cookieValue = Mage::getModel('core/cookie')->get('ivid');
300
+ // Database table - "BundleCollection" that stores bundled products in Magento along with discount
301
+ // An entry is added to this table when user adds a bundle to the cart
302
+ // Colums Bundle ID,Product IDs,Discount
303
  $userBundleCollection = Mage::getModel('increasingly_analytics/bundle')->getCollection()->addFieldToFilter('increasingly_visitor_id',$cookieValue);
304
+ //Get all Quote Products
305
  $items = $observer->getEvent()->getQuote()->getAllItems();
306
  $eligibleProducts = [];
307
  $discount = 0;
308
+ //Get all the Quote Product Ids
309
  foreach ($items as $item) {
310
  array_push($quote_product_ids, $item->getProductId());
311
  }
312
+ //Get the discount from the Bundle's collection to apply to the subtotal
313
  foreach ($userBundleCollection as $bundle) {
314
  //First Bundle products
315
  $bundle_product_ids = explode(',', $bundle->getProductIds());
316
+ //Get discount amount for all the products in the quote
317
  $productsIds = array_intersect($quote_product_ids, $bundle_product_ids);
318
  if(count($productsIds) == count($bundle_product_ids) )
319
  $discount += $bundle->getDiscountPrice();
320
  }
321
+ //If the quote products has discount,apply the discount
322
  if($discount > 0){
323
  $quote=$observer->getEvent()->getQuote();
324
  $quoteid=$quote->getId();
349
 
350
  $quote->setSubtotal((float) $quote->getSubtotal() + $address->getSubtotal());
351
  $quote->setBaseSubtotal((float) $quote->getBaseSubtotal() + $address->getBaseSubtotal());
352
+ //Update Subtotal with the Discount
353
  $quote->setSubtotalWithDiscount(
354
  (float) $quote->getSubtotalWithDiscount() + $address->getSubtotalWithDiscount()
355
  );
356
+ //Update Base Subtotal with Discount
357
  $quote->setBaseSubtotalWithDiscount(
358
  (float) $quote->getBaseSubtotalWithDiscount() + $address->getBaseSubtotalWithDiscount()
359
  );
360
 
361
  $quote->setGrandTotal((float) $quote->getGrandTotal() + $address->getGrandTotal());
362
  $quote->setBaseGrandTotal((float) $quote->getBaseGrandTotal() + $address->getBaseGrandTotal());
363
+ //Save the Quote
364
  $quote ->save();
365
+ //Set Grand Total,Base Grand Toal,Subtotal and Base Subtotal with the discounted amount
366
  $quote->setGrandTotal($quote->getBaseSubtotal()-$discountAmount)
367
  ->setBaseGrandTotal($quote->getBaseSubtotal()-$discountAmount)
368
  ->setSubtotalWithDiscount($quote->getBaseSubtotal()-$discountAmount)
369
  ->setBaseSubtotalWithDiscount($quote->getBaseSubtotal()-$discountAmount)
370
  ->save();
371
 
372
+ //Display the discount applied with the Custom Discount attribute in the cart page
373
  if($address->getAddressType()==$canAddItems) {
374
  //echo $address->setDiscountAmount; exit;
375
  $address->setSubtotalWithDiscount((float) $address->getSubtotalWithDiscount()-$discountAmount);
390
  } //end: foreach
391
  //echo $quote->getGrandTotal();
392
 
393
+ foreach($quote->getAllItems() as $item){
394
  //We apply discount amount based on the ratio between the GrandTotal and the RowTotal
395
  $rat=$item->getPriceInclTax()/$total;
396
  $ratdisc=$discountAmount*$rat;
402
  }
403
  }
404
  catch(Exception $e)
405
+ {
406
+ Mage::log("Remove from cart tracking - " . $e->getMessage(), null, 'Increasingly_Analytics.log');
 
 
 
 
 
 
 
407
  }
408
 
409
  }
415
  */
416
  public function trackNewOrder(Varien_Event_Observer $observer)
417
  {
 
418
  try
419
  {
420
 
421
+ $helper = Mage::helper('increasingly_analytics');
422
 
423
  if ($helper->isEnabled())
424
+ {
425
+ $data = array();
426
+ $order = $observer->getOrder();
427
 
428
+ if ($order->getId())
429
+ {
430
+ $data = $helper->buildOrderDetailsData($order);
431
+ $helper->addEvent('track', 'order', $data);
432
+ }
 
433
  }
434
+ }
435
  catch(Exception $e)
436
+ {
437
  Mage::log("New order tracking - " . $e->getMessage(), null, 'Increasingly_Analytics.log');
 
 
 
 
 
438
  }
439
  }
440
 
app/code/community/Increasingly/Analytics/controllers/AddbundletocartController.php CHANGED
@@ -155,7 +155,7 @@ class Increasingly_Analytics_AddbundletocartController extends Mage_Core_Control
155
  for ($x = 0; $x < count($data[0]["params"]); $x++) {
156
  $productIds[$x] = trim($data[0]["params"][$x]["product_id"]);
157
  }
158
- $productIdsStr = implode(',',$productIds);
159
 
160
  $cookieValue = Mage::getModel('core/cookie')->get('ivid');
161
  $userBundleCollection = Mage::getModel('increasingly_analytics/bundle')->getCollection()
@@ -206,7 +206,7 @@ class Increasingly_Analytics_AddbundletocartController extends Mage_Core_Control
206
  $productSuccessStr = "";
207
  $quantity = 1;
208
  $cart_bundle_data['bundle_id'] = $bundle_id;
209
- $cart_bundle_data['discountPrice'] = $discountPrice;
210
 
211
  for ($x = 0; $x < count($data[0]["params"]); $x++) {
212
  $productIds[$x] = trim($data[0]["params"][$x]["product_id"]);
@@ -276,7 +276,7 @@ class Increasingly_Analytics_AddbundletocartController extends Mage_Core_Control
276
 
277
  //Set cart was updated flag
278
  Mage::getSingleton('checkout/session')->setCartWasUpdated(true);
279
- $hasBundleAddedToCartSuccessfully = true;
280
  $helper->addEvent('track', 'bundle_add_to_cart', $cart_bundle_data);
281
  }
282
 
@@ -286,7 +286,7 @@ class Increasingly_Analytics_AddbundletocartController extends Mage_Core_Control
286
  //Error message for the out of stock products
287
  if($productErrorStr != "")
288
  Mage::getSingleton('core/session')->addNotice($productErrorStr.' is out of stock');
289
-
290
  //Redirect to the cart
291
  $this->_redirect('checkout/cart');
292
 
@@ -294,7 +294,7 @@ class Increasingly_Analytics_AddbundletocartController extends Mage_Core_Control
294
 
295
  if($hasBundleAddedToCartSuccessfully == false)
296
  {
297
- $cart_bundle_data['bundle_data'] = $data;
298
  $helper->addEvent('track', 'bundle_add_to_cart_failuer', $cart_bundle_data);
299
  }
300
  }
@@ -303,13 +303,13 @@ class Increasingly_Analytics_AddbundletocartController extends Mage_Core_Control
303
  Mage::log("Increasingly addToCart controller - " . $e->getMessage(), null, 'Increasingly_Analytics.log');
304
  Mage::getSingleton('core/session')->addNotice($e->getMessage());
305
  $error_info = array(
306
- 'method' => 'AddBundleToCartMethod',
307
  'error_message' => $e->getMessage()
308
- );
309
 
310
  $helper->addEvent('track', 'track_error', $error_info);
311
  $this->_redirectUrl($redirectUrl);
312
  }
313
 
314
  }
315
- }
155
  for ($x = 0; $x < count($data[0]["params"]); $x++) {
156
  $productIds[$x] = trim($data[0]["params"][$x]["product_id"]);
157
  }
158
+ $productIdsStr = implode(',',$productIds);
159
 
160
  $cookieValue = Mage::getModel('core/cookie')->get('ivid');
161
  $userBundleCollection = Mage::getModel('increasingly_analytics/bundle')->getCollection()
206
  $productSuccessStr = "";
207
  $quantity = 1;
208
  $cart_bundle_data['bundle_id'] = $bundle_id;
209
+ $cart_bundle_data['discountPrice'] = $discountPrice;
210
 
211
  for ($x = 0; $x < count($data[0]["params"]); $x++) {
212
  $productIds[$x] = trim($data[0]["params"][$x]["product_id"]);
276
 
277
  //Set cart was updated flag
278
  Mage::getSingleton('checkout/session')->setCartWasUpdated(true);
279
+ $hasBundleAddedToCartSuccessfully = true;
280
  $helper->addEvent('track', 'bundle_add_to_cart', $cart_bundle_data);
281
  }
282
 
286
  //Error message for the out of stock products
287
  if($productErrorStr != "")
288
  Mage::getSingleton('core/session')->addNotice($productErrorStr.' is out of stock');
289
+
290
  //Redirect to the cart
291
  $this->_redirect('checkout/cart');
292
 
294
 
295
  if($hasBundleAddedToCartSuccessfully == false)
296
  {
297
+ $cart_bundle_data['bundle_data'] = $data;
298
  $helper->addEvent('track', 'bundle_add_to_cart_failuer', $cart_bundle_data);
299
  }
300
  }
303
  Mage::log("Increasingly addToCart controller - " . $e->getMessage(), null, 'Increasingly_Analytics.log');
304
  Mage::getSingleton('core/session')->addNotice($e->getMessage());
305
  $error_info = array(
306
+ 'method' => 'AddBundleToCartMethod',
307
  'error_message' => $e->getMessage()
308
+ );
309
 
310
  $helper->addEvent('track', 'track_error', $error_info);
311
  $this->_redirectUrl($redirectUrl);
312
  }
313
 
314
  }
315
+ }
app/code/community/Increasingly/Analytics/controllers/ProductsImportApiController.php CHANGED
@@ -104,25 +104,14 @@ class Increasingly_Analytics_ProductsImportApiController extends Mage_Core_Contr
104
  }
105
  }
106
 
107
- if ($product->hasData('description'))
108
- {
109
- $productData['description'] = $product->getData('description');
110
- }
111
-
112
- if($productData['description'] == null || empty($productData['description']))
113
- {
114
- $productData['description'] = $product->getDescription();
115
- }
116
-
117
- if ($product->hasData('short_description'))
118
- {
119
- $productData['short_description'] = $product->getData('short_description');
120
- }
121
-
122
- if($productData['short_description'] == null || empty($productData['short_description']))
123
- {
124
- $productData['short_description'] = $product->getShortDescription();
125
- }
126
 
127
  if($productData['product_type_name'] == "configurable")
128
  {
104
  }
105
  }
106
 
107
+
108
+ $productData['description'] = Mage::getModel('catalog/product')
109
+ ->load($product->getId())->getDescription();
110
+
111
+
112
+ $productData['short_description'] = Mage::getModel('catalog/product')
113
+ ->load($product->getId())->getShortDescription();
114
+
 
 
 
 
 
 
 
 
 
 
 
115
 
116
  if($productData['product_type_name'] == "configurable")
117
  {
app/code/community/Increasingly/Analytics/etc/config.xml CHANGED
@@ -32,7 +32,7 @@
32
  <config>
33
  <modules>
34
  <Increasingly_Analytics>
35
- <version>1.0.17</version>
36
  </Increasingly_Analytics>
37
  </modules>
38
  <global>
@@ -64,7 +64,7 @@
64
  </remove_from_cart>
65
  </observers>
66
  </sales_quote_remove_item>
67
- <sales_order_place_after>
68
  <observers>
69
  <place_order>
70
  <type>singleton</type>
@@ -72,7 +72,7 @@
72
  <method>trackNewOrder</method>
73
  </place_order>
74
  </observers>
75
- </sales_order_place_after>
76
  <sales_quote_collect_totals_after>
77
  <observers>
78
  <apply_cart_discount>
32
  <config>
33
  <modules>
34
  <Increasingly_Analytics>
35
+ <version>1.0.18</version>
36
  </Increasingly_Analytics>
37
  </modules>
38
  <global>
64
  </remove_from_cart>
65
  </observers>
66
  </sales_quote_remove_item>
67
+ <checkout_type_onepage_save_order_after>
68
  <observers>
69
  <place_order>
70
  <type>singleton</type>
72
  <method>trackNewOrder</method>
73
  </place_order>
74
  </observers>
75
+ </checkout_type_onepage_save_order_after>
76
  <sales_quote_collect_totals_after>
77
  <observers>
78
  <apply_cart_discount>
app/code/community/Increasingly/Analytics/sql/increasingly_analytics_setup/mysql4-install-1.0.18.php ADDED
@@ -0,0 +1,29 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ $installer = $this;
4
+
5
+ $installer->startSetup();
6
+
7
+ $installer->run("
8
+
9
+ CREATE TABLE IF NOT EXISTS {$this->getTable('increasingly_analytics_bundle')} (
10
+
11
+ `id` int NOT NULL auto_increment,
12
+
13
+ `bundle_id` int NOT NULL default 0,
14
+
15
+ `product_ids` varchar(100) NOT NULL,
16
+
17
+ `increasingly_visitor_id` varchar(100) NOT NULL,
18
+
19
+ `discount_price` decimal(12,4) NULL,
20
+
21
+ `total_price` decimal(12,4) NOT NULL,
22
+
23
+ PRIMARY KEY (`id`)
24
+
25
+ );
26
+
27
+ ");
28
+
29
+ $installer->endSetup();
app/design/frontend/base/default/template/increasingly/pagetype.phtml CHANGED
@@ -64,4 +64,4 @@
64
  <div id="increasingly-api-key" content="<?php echo $helper->getApiToken(); ?>"></div>
65
  <div id="increasingly-form-key" content="<?php echo $this->getFormKey(); ?>"></div>
66
  <div id="increasingly-store-url" content="<?php echo $this->getStoreDetails(); ?>"></div>
67
- <div id="increasingly-userloggedin" content="<?php echo $this->getUserLoggedIn(); ?>"></div>
64
  <div id="increasingly-api-key" content="<?php echo $helper->getApiToken(); ?>"></div>
65
  <div id="increasingly-form-key" content="<?php echo $this->getFormKey(); ?>"></div>
66
  <div id="increasingly-store-url" content="<?php echo $this->getStoreDetails(); ?>"></div>
67
+ <div id="increasingly-userloggedin" content="<?php echo $this->getUserLoggedIn(); ?>"></div>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>increasingly_key</name>
4
- <version>1.0.17</version>
5
  <stability>stable</stability>
6
  <license uri="https://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
7
  <channel>community</channel>
@@ -44,11 +44,11 @@ It's free to try &amp; we have a 14-day trial where you can test it for no-risk
44
  &#xD;
45
  We have a dashboard which provides you with in depth analytics and insights on what's sells together &amp; allows you to administer and manage your bundles.&#xD;
46
  </description>
47
- <notes>Added code to fix the issue - "Increasingly tab" being invisible to new user role.</notes>
48
  <authors><author><name>Increasingly</name><user>Increasingly</user><email>renu@increasingly.co</email></author><author><name>Increasingly</name><user>Increasingly</user><email>shree@increasingly.co</email></author><author><name>Increasingly</name><user>Increasingly</user><email>satish@increasingly.co</email></author></authors>
49
- <date>2016-11-15</date>
50
- <time>06:05:44</time>
51
- <contents><target name="magecommunity"><dir name="Increasingly"><dir name="Analytics"><dir name="Block"><file name="Addtocart.php" hash="3429b60b501c7681a3c79fd46138b787"/><dir name="Adminhtml"><file name="DataIntegration.php" hash="b7c543b33f563ef458d403df94c62a4c"/></dir><file name="Cart.php" hash="56c9f503b7c55d835cbd93c675dcc338"/><file name="Category.php" hash="3b87f305e0957dd1fdace455c1f0fa7c"/><file name="Element.php" hash="8d533705e7a3c1ada7d775a6d9282f43"/><file name="Embed.php" hash="5ba08a6642ed22d8bb1a84ab0501f8dc"/><file name="Pagetype.php" hash="7fbe186468b5fef3b8db46a803dc92d6"/><file name="Product.php" hash="2da759eb9bd2bf13e5a8a92087981206"/><file name="Track.php" hash="aa6a9d870f14c4e3721675658dfb276e"/></dir><dir name="Helper"><file name="Data.php" hash="7f5907151d6bc2427ac1455081516c88"/><file name="DateFormatter.php" hash="d8f963bd1f9fe390e038a2065fd5c4c4"/><file name="PriceFormatter.php" hash="9bc46d3afb4612131a29b9a1c2b82fad"/><file name="ProductFormatter.php" hash="2fc9d9e7de186379737b477b166e8bf5"/></dir><dir name="Model"><file name="Base.php" hash="957cc5bb083e9b49b5468c986a1e846a"/><file name="Bundle.php" hash="767a26eaefaed893d163737d64930933"/><file name="DataIntegration.php" hash="ff9dc202ea17e49ceaba09c6190492cd"/><dir name="Meta"><file name="Product.php" hash="6a037e5325193fae3147fc1a9891606c"/></dir><dir name="Mysql4"><dir name="Bundle"><file name="Collection.php" hash="021c49a92767b78e238477a3dc8da783"/></dir><file name="Bundle.php" hash="83ad548248f3ebcfc73158ab672cb683"/><file name="Setup.php" hash="664019080c6c0ebdbc50b889eac1e1e0"/></dir><file name="Observer.php" hash="7529c60558f607aa7e479c546995d711"/><file name="Product.php" hash="f473c25a470a2509b00a4a15ed8b857f"/></dir><dir name="controllers"><file name="AddbundletocartController.php" hash="005680ac4e204669f5d12940799ede59"/><dir name="Adminhtml"><file name="DataIntegrationController.php" hash="2423cb2cd6e00e2924dd989aef058907"/></dir><file name="ImportLogsController.php" hash="035f739ed0727685f47e7d8405b4448c"/><file name="OrdersApiController.php" hash="30195b469077e96f012538899f7d4f27"/><file name="ProductsApiController.php" hash="5ac96ef4089b835968acdbca3539172a"/><file name="ProductsImportApiController.php" hash="edc2b98fd0cd339c58bbba452f1953e4"/></dir><dir name="etc"><file name="config.xml" hash="9e7bccd29a19fcf4dad49e562b18df3e"/></dir><dir name="sql"><dir name="increasingly_analytics_setup"><file name="mysql-install-1.0.0.php" hash="bddf4e67e7b69c5604b448e3b1fa27a0"/><file name="mysql4-install-1.0.10.php" hash="e857df177cfbb887cece6de0ff5498b6"/><file name="mysql4-install-1.0.11.php" hash="e857df177cfbb887cece6de0ff5498b6"/><file name="mysql4-install-1.0.12.php" hash="e857df177cfbb887cece6de0ff5498b6"/><file name="mysql4-install-1.0.13.php" hash="e857df177cfbb887cece6de0ff5498b6"/><file name="mysql4-install-1.0.14.php" hash="e857df177cfbb887cece6de0ff5498b6"/><file name="mysql4-install-1.0.15.php" hash="e857df177cfbb887cece6de0ff5498b6"/><file name="mysql4-install-1.0.16.php" hash="e857df177cfbb887cece6de0ff5498b6"/><file name="mysql4-install-1.0.17.php" hash="e857df177cfbb887cece6de0ff5498b6"/><file name="mysql4-install-1.0.3.php" hash="e857df177cfbb887cece6de0ff5498b6"/><file name="mysql4-install-1.0.4.php" hash="e857df177cfbb887cece6de0ff5498b6"/><file name="mysql4-install-1.0.5.php" hash="e857df177cfbb887cece6de0ff5498b6"/><file name="mysql4-install-1.0.6.php" hash="e857df177cfbb887cece6de0ff5498b6"/><file name="mysql4-install-1.0.7.php" hash="e857df177cfbb887cece6de0ff5498b6"/><file name="mysql4-install-1.0.8.php" hash="e857df177cfbb887cece6de0ff5498b6"/><file name="mysql4-install-1.0.9.php" hash="e857df177cfbb887cece6de0ff5498b6"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="increasingly"><file name="dataintegration.phtml" hash="8a730e566c21b2155d6f3e4ca73a1b6d"/></dir></dir><dir name="layout"><file name="increasingly_analytics.xml" hash="d859a26dba5142f02e514f28f507891c"/></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="increasingly"><file name="addtocart.phtml" hash="e3af2445ac014887b3072cf85dd81d4f"/><file name="cart.phtml" hash="1c5ee986109cfb4600d3e15057263d36"/><file name="category.phtml" hash="75e77b9d1cbbd1e0129c0c10737461e6"/><file name="element.phtml" hash="c5f1cbbc02801009247409890172ca4e"/><file name="embed.phtml" hash="52cde76a239e3084ce3a1254b004a742"/><file name="pagetype.phtml" hash="18a45f54e7214f18cd33a568c9159441"/><file name="product.phtml" hash="14d24b0ced5abc85619aa3538b21f2f7"/><file name="track.phtml" hash="aed8cda5e868346a974799a52b99ece1"/></dir></dir><dir name="layout"><file name="increasingly_analytics.xml" hash="8fdd89adb4a85e83237ada872ba43f88"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Increasingly_Analytics.xml" hash="d285a9ae62b5b0624b727e341fe8e005"/></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="increasingly"><file name="loader.gif" hash="a51c5608d01acf32df728f299767f82b"/></dir></dir></dir></dir></target></contents>
52
  <compatible/>
53
- <dependencies><required><php><min>5.2.0</min><max>7.0.7</max></php></required></dependencies>
54
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>increasingly_key</name>
4
+ <version>1.0.18</version>
5
  <stability>stable</stability>
6
  <license uri="https://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
7
  <channel>community</channel>
44
  &#xD;
45
  We have a dashboard which provides you with in depth analytics and insights on what's sells together &amp; allows you to administer and manage your bundles.&#xD;
46
  </description>
47
+ <notes>Added fix to support order tracking after "PageSay" payment.</notes>
48
  <authors><author><name>Increasingly</name><user>Increasingly</user><email>renu@increasingly.co</email></author><author><name>Increasingly</name><user>Increasingly</user><email>shree@increasingly.co</email></author><author><name>Increasingly</name><user>Increasingly</user><email>satish@increasingly.co</email></author></authors>
49
+ <date>2017-03-10</date>
50
+ <time>06:29:42</time>
51
+ <contents><target name="magecommunity"><dir name="Increasingly"><dir name="Analytics"><dir name="Block"><file name="Addtocart.php" hash="3429b60b501c7681a3c79fd46138b787"/><dir name="Adminhtml"><file name="DataIntegration.php" hash="b7c543b33f563ef458d403df94c62a4c"/></dir><file name="Cart.php" hash="56c9f503b7c55d835cbd93c675dcc338"/><file name="Category.php" hash="3b87f305e0957dd1fdace455c1f0fa7c"/><file name="Element.php" hash="8d533705e7a3c1ada7d775a6d9282f43"/><file name="Embed.php" hash="5ba08a6642ed22d8bb1a84ab0501f8dc"/><file name="Pagetype.php" hash="4695821cbacb666ae25402212d86d4bd"/><file name="Product.php" hash="2da759eb9bd2bf13e5a8a92087981206"/><file name="Track.php" hash="aa6a9d870f14c4e3721675658dfb276e"/></dir><dir name="Helper"><file name="Data.php" hash="7f5907151d6bc2427ac1455081516c88"/><file name="DateFormatter.php" hash="d8f963bd1f9fe390e038a2065fd5c4c4"/><file name="PriceFormatter.php" hash="9bc46d3afb4612131a29b9a1c2b82fad"/><file name="ProductFormatter.php" hash="7452461ffcfd0bd9a0f9070b224332cf"/></dir><dir name="Model"><file name="Base.php" hash="957cc5bb083e9b49b5468c986a1e846a"/><file name="Bundle.php" hash="767a26eaefaed893d163737d64930933"/><file name="DataIntegration.php" hash="ff9dc202ea17e49ceaba09c6190492cd"/><dir name="Meta"><file name="Product.php" hash="6a037e5325193fae3147fc1a9891606c"/></dir><dir name="Mysql4"><dir name="Bundle"><file name="Collection.php" hash="021c49a92767b78e238477a3dc8da783"/></dir><file name="Bundle.php" hash="83ad548248f3ebcfc73158ab672cb683"/><file name="Setup.php" hash="664019080c6c0ebdbc50b889eac1e1e0"/></dir><file name="Observer.php" hash="108557c8caee747912342487823587e3"/><file name="Product.php" hash="f473c25a470a2509b00a4a15ed8b857f"/></dir><dir name="controllers"><file name="AddbundletocartController.php" hash="7b54aad55d895f9ef6f49781274daf86"/><dir name="Adminhtml"><file name="DataIntegrationController.php" hash="2423cb2cd6e00e2924dd989aef058907"/></dir><file name="ImportLogsController.php" hash="035f739ed0727685f47e7d8405b4448c"/><file name="OrdersApiController.php" hash="30195b469077e96f012538899f7d4f27"/><file name="ProductsApiController.php" hash="5ac96ef4089b835968acdbca3539172a"/><file name="ProductsImportApiController.php" hash="f7d6bcc7bc3a8f89a74bd8dbc01527e7"/></dir><dir name="etc"><file name="config.xml" hash="d8eccedfb9eb66ff73a373e8126a8a71"/></dir><dir name="sql"><dir name="increasingly_analytics_setup"><file name="mysql-install-1.0.0.php" hash="bddf4e67e7b69c5604b448e3b1fa27a0"/><file name="mysql4-install-1.0.10.php" hash="e857df177cfbb887cece6de0ff5498b6"/><file name="mysql4-install-1.0.11.php" hash="e857df177cfbb887cece6de0ff5498b6"/><file name="mysql4-install-1.0.12.php" hash="e857df177cfbb887cece6de0ff5498b6"/><file name="mysql4-install-1.0.13.php" hash="e857df177cfbb887cece6de0ff5498b6"/><file name="mysql4-install-1.0.14.php" hash="e857df177cfbb887cece6de0ff5498b6"/><file name="mysql4-install-1.0.15.php" hash="e857df177cfbb887cece6de0ff5498b6"/><file name="mysql4-install-1.0.16.php" hash="e857df177cfbb887cece6de0ff5498b6"/><file name="mysql4-install-1.0.17.php" hash="e857df177cfbb887cece6de0ff5498b6"/><file name="mysql4-install-1.0.18.php" hash="e857df177cfbb887cece6de0ff5498b6"/><file name="mysql4-install-1.0.3.php" hash="e857df177cfbb887cece6de0ff5498b6"/><file name="mysql4-install-1.0.4.php" hash="e857df177cfbb887cece6de0ff5498b6"/><file name="mysql4-install-1.0.5.php" hash="e857df177cfbb887cece6de0ff5498b6"/><file name="mysql4-install-1.0.6.php" hash="e857df177cfbb887cece6de0ff5498b6"/><file name="mysql4-install-1.0.7.php" hash="e857df177cfbb887cece6de0ff5498b6"/><file name="mysql4-install-1.0.8.php" hash="e857df177cfbb887cece6de0ff5498b6"/><file name="mysql4-install-1.0.9.php" hash="e857df177cfbb887cece6de0ff5498b6"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="increasingly"><file name="dataintegration.phtml" hash="8a730e566c21b2155d6f3e4ca73a1b6d"/></dir></dir><dir name="layout"><file name="increasingly_analytics.xml" hash="d859a26dba5142f02e514f28f507891c"/></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="increasingly"><file name="addtocart.phtml" hash="e3af2445ac014887b3072cf85dd81d4f"/><file name="cart.phtml" hash="1c5ee986109cfb4600d3e15057263d36"/><file name="category.phtml" hash="75e77b9d1cbbd1e0129c0c10737461e6"/><file name="element.phtml" hash="c5f1cbbc02801009247409890172ca4e"/><file name="embed.phtml" hash="52cde76a239e3084ce3a1254b004a742"/><file name="pagetype.phtml" hash="29221d2e3ef9d5fa3db11c7646d80c5d"/><file name="product.phtml" hash="14d24b0ced5abc85619aa3538b21f2f7"/><file name="track.phtml" hash="aed8cda5e868346a974799a52b99ece1"/></dir></dir><dir name="layout"><file name="increasingly_analytics.xml" hash="8fdd89adb4a85e83237ada872ba43f88"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Increasingly_Analytics.xml" hash="d285a9ae62b5b0624b727e341fe8e005"/></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="increasingly"><file name="loader.gif" hash="a51c5608d01acf32df728f299767f82b"/></dir></dir></dir></dir></target></contents>
52
  <compatible/>
53
+ <dependencies><required><php><min>5.2.0</min><max>7.0.15</max></php></required></dependencies>
54
  </package>