Iglobal_Main - Version 1.0.4

Version Notes

a few bug fixes

Download this release

Release Info

Developer Matt Flamm
Extension Iglobal_Main
Version 1.0.4
Comparing to
See all releases


Code changes from version 1.0.3 to 1.0.4

Files changed (5) hide show
  1. app/code/community/Iglobal/Stores/etc/config.xml +1 -1
  2. app/design/frontend/base/default/template/iglobal/stores/cart.phtml +4 -2
  3. js/iGlobal/ig_welcome_mat_default.js +1 -1
  4. js/iGlobal/igc.cs.magento_default_ice.js +2 -2
  5. package.xml +5 -5
app/code/community/Iglobal/Stores/etc/config.xml CHANGED
@@ -4,7 +4,7 @@
4
  <config>
5
  <modules>
6
  <Iglobal_Stores>
7
- <version>1.0.3</version>
8
  <currencies>
9
  <AED></AED>
10
  <ARS>&amp;#8371;</ARS>
4
  <config>
5
  <modules>
6
  <Iglobal_Stores>
7
+ <version>1.0.4</version>
8
  <currencies>
9
  <AED></AED>
10
  <ARS>&amp;#8371;</ARS>
app/design/frontend/base/default/template/iglobal/stores/cart.phtml CHANGED
@@ -18,7 +18,9 @@
18
 
19
  echo '<div class="igItemDetails">';
20
 
21
- $options = $item->getOptionByCode('simple_product')->getProduct()->getTypeInstance(true)->getOrderOptions($item->getProduct());
 
 
22
  if ($options){
23
 
24
 
@@ -35,7 +37,7 @@
35
  echo '</dl></span>';
36
  }
37
 
38
- }
39
 
40
 
41
 
18
 
19
  echo '<div class="igItemDetails">';
20
 
21
+ /* figure this item type problem out, okay?
22
+
23
+ $options = $item->getOptionByCode('simple_product')->getProduct()->getTypeInstance(true)->getOrderOptions($item->getProduct());
24
  if ($options){
25
 
26
 
37
  echo '</dl></span>';
38
  }
39
 
40
+ } */
41
 
42
 
43
 
js/iGlobal/ig_welcome_mat_default.js CHANGED
@@ -16,7 +16,7 @@ var ig_flagLocation = "body";
16
  var ig_flagMethod = "prepend";
17
  var ig_flagCode = '<div id="igFlag"></div>';
18
  var ajaxPath = window.location.href.replace(window.location.origin, '')
19
- ajaxPath = ajaxPath.substring(0, ajaxPath.indexOf("/",1)) + '/iglobal/ajax/matdata'; //parses the uri to figure out how to get to the right controller
20
 
21
  /* TODO: this method was taking too long. still promising route. check into it again.
22
  if (window.location.href.indexOf("index.php") != -1){
16
  var ig_flagMethod = "prepend";
17
  var ig_flagCode = '<div id="igFlag"></div>';
18
  var ajaxPath = window.location.href.replace(window.location.origin, '')
19
+ ajaxPath ='/iglobal/ajax/matdata';// ajaxPath.substring(0, ajaxPath.indexOf("/",1)) + '/iglobal/ajax/matdata'; //parses the uri to figure out how to get to the right controller
20
 
21
  /* TODO: this method was taking too long. still promising route. check into it again.
22
  if (window.location.href.indexOf("index.php") != -1){
js/iGlobal/igc.cs.magento_default_ice.js CHANGED
@@ -7,7 +7,7 @@ $igc =jQuery
7
  var igSubdomain = "checkout"; //this can be set by updating the "iGlobal Hosted Checkout Subdomain" in Magento conficuration options
8
  var igCartUrl = "/magento/index.php/checkout/cart";
9
  var ajaxPath = window.location.href.replace(window.location.origin, '')
10
- ajaxPath = ajaxPath.substring(0, ajaxPath.indexOf("/",1)) + '/iglobal/ajax/icedata'; //parses the uri to figure out how to get to the right controller
11
  //ajaxPath = ajaxPath.substring(0, ajaxPath.indexOf("index.php")+9) + '/iglobal/ajax/icedata'; //parses the url to figure out how to get to the right controller
12
 
13
 
@@ -61,7 +61,7 @@ function igcGetItems() {
61
  var price = $igc(this).find('.igPrice').text();
62
  var imgURL = $igc(this).find('.igImage').text();
63
  var itemURL = $igc(this).find('.igUrl').text();
64
- var descTxt = '<span class="itemDescription">' + $igc(this).find('.igName').text() + '</span>' + $igc(this).find('.igItemOptions').html();
65
  var sku = $igc(this).find('.igSku').text();
66
  var pid =$igc(this).find('.igID').text();
67
  var weight = $igc(this).find('.ig_itemWeight').text();
7
  var igSubdomain = "checkout"; //this can be set by updating the "iGlobal Hosted Checkout Subdomain" in Magento conficuration options
8
  var igCartUrl = "/magento/index.php/checkout/cart";
9
  var ajaxPath = window.location.href.replace(window.location.origin, '')
10
+ ajaxPath = '/iglobal/ajax/icedata'; //parses the uri to figure out how to get to the right controller
11
  //ajaxPath = ajaxPath.substring(0, ajaxPath.indexOf("index.php")+9) + '/iglobal/ajax/icedata'; //parses the url to figure out how to get to the right controller
12
 
13
 
61
  var price = $igc(this).find('.igPrice').text();
62
  var imgURL = $igc(this).find('.igImage').text();
63
  var itemURL = $igc(this).find('.igUrl').text();
64
+ var descTxt = '<span class="itemDescription">' + $igc(this).find('.igName').text() + '</span>';// + $igc(this).find('.igItemOptions').html();
65
  var sku = $igc(this).find('.igSku').text();
66
  var pid =$igc(this).find('.igID').text();
67
  var weight = $igc(this).find('.ig_itemWeight').text();
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Iglobal_Main</name>
4
- <version>1.0.3</version>
5
  <stability>stable</stability>
6
  <license>OSL</license>
7
  <channel>community</channel>
@@ -55,11 +55,11 @@ Installation Instructions&#xD;
55
  &lt;li&gt;&lt;strong&gt;iGlobal Dimension Units&lt;/strong&gt; &#x2013; Unit of measure for the iGlobal Dimensional attributes. (CM / IN)&lt;/li&gt;&#xD;
56
  &lt;/ul&gt;&#xD;
57
  &lt;/ol&gt;</description>
58
- <notes>Added a cool new feature to make integration easier. You'll totally love it.</notes>
59
  <authors><author><name>Matt Flamm</name><user>mattflamm</user><email>matt@iglobalstores.com</email></author><author><name>Judd Flamm</name><user>UnkUser1</user><email>judd@iglobalstores.com</email></author><author><name>Dustin Dwyer</name><user>UnkUser2</user><email>dustin@iglobalstores.com</email></author><author><name>Dave Meads</name><user>unkuser3</user><email>dave@iglobalstores.com</email></author></authors>
60
- <date>2014-08-20</date>
61
- <time>16:07:55</time>
62
- <contents><target name="magecommunity"><dir name="Iglobal"><dir name="Fee"><dir name="Block"><dir name="Sales"><dir name="Order"><file name="Total.php" hash="0e9e1537fd6cedc9a2b4a3efdf3f769d"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="406a814f1216d736e8661a32c833a15e"/></dir><dir name="Model"><file name="Fee.php" hash="29729703293e6fa5af6527708d67d97f"/><file name="Observer.php" hash="a9ec09a49108625f592f8ef00bcba842"/><dir name="Sales"><dir name="Order"><dir name="Total"><dir name="Creditmemo"><file name="Fee.php" hash="048c8a97de6d884d3b95e0345c1cb75a"/></dir><dir name="Invoice"><file name="Fee.php" hash="fc98218c9a421b95af9f5f0ca062e1d8"/></dir></dir></dir><dir name="Quote"><dir name="Address"><dir name="Total"><file name="Fee.php" hash="bc925a41535068fb0a94c57183dd2027"/></dir></dir></dir></dir></dir><dir name="etc"><file name="config.xml" hash="4cf60a3913d56196b169dd2dffa85e12"/></dir><dir name="sql"><dir name="fee_setup"><file name="mysql4-install-0.1.0.php" hash="8327866f66c8bff7fcbb0305385a6f93"/></dir></dir></dir><dir name="Ship"><dir name="Block"><file name="Ship.php" hash="a802b4d42e72997ec4ab466dec75b743"/></dir><dir name="Helper"><file name="Data.php" hash="fe9f074c1cb74260fa134efa94eb67c9"/></dir><dir name="Model"><dir name="Carrier"><file name="Excellence.php" hash="1cf0b2e1716d3f726f4e974f02267b53"/></dir></dir><dir name="controllers"><file name="IndexController.php" hash="3355a75caf30f4ff96499da3d8a4102a"/></dir><dir name="etc"><file name="config.xml" hash="adecbc76332ffb4b0f8918d3166c655c"/><file name="system.xml" hash="fea6b2ed9b7fdf5748cb57e53fe1301b"/></dir></dir><dir name="Stores"><dir name="Block"><file name="Ajax.php" hash="7b71e2bc9b801138f77f5927e7a6f6ba"/><file name="Cart.php" hash="2fd47fa1ca047bbc75383c2e35dd4bf2"/><file name="Includes.php" hash="7c36803ae1a6193f7805d7ae5bef17e6"/></dir><dir name="Helper"><file name="Configoptions.php" hash="b129e55b21f845a20d6e7fdb3b532be3"/><file name="Data.php" hash="2d77637b08ac8e7dcb717d8e1571739a"/></dir><dir name="Model"><file name="Configoptions.php" hash="6da281d601b7a6ce98ebc81b398d6e54"/><file name="Observer.php" hash="24ba19336cd0fb51700069ae3d80e471"/><dir name="Payment"><file name="Iglobal.php" hash="9ac8f8d81b8f8d547831ad6db8a1c7fc"/><file name="Iglobalcreditcard.php" hash="f2f5cf4507a128fadc95071951ca2a41"/><file name="Iglobalpaypal.php" hash="3a566289db82b177ce6b52ce205728f6"/></dir><dir name="Resource"><file name="Setup.php" hash="6b05cac95a1d36deeb7e9c9bd439ad8c"/></dir><dir name="Rest"><file name="Order.php" hash="916a67634abdf48666119854a1628ac3"/></dir><dir name="Service"><file name="Quote.php" hash="bae0e5a710b9e3aa1427bb78a08fbfd8"/></dir></dir><dir name="controllers"><file name="AjaxController.php" hash="3169062e850efd55749ae8033676bf2d"/><file name="SuccessController.php" hash="38d0b1715a5b8aa30ab2cbfbee5d65d7"/><file name="TestController.php" hash="4d14668de657eaa3f32a200e35b43a37"/><file name="UpdateShippingStatusController.php" hash="77534f8cbc68f23ab3377ff1427b9300"/></dir><dir name="etc"><file name="adminhtml.xml" hash="a94aa66e4f3643fcc49fb60650fef416"/><file name="config.xml" hash="5340b67f9f52f312566db06fc4349d02"/><file name="system.xml" hash="40420c6652da8b38d181fdf57ab15720"/></dir><dir name="sql"><dir name="iglobal_stores_setup"><file name="mysql4-install-0.1.0.php" hash="8f8d6e6596d0ad98d70075f79f320cfd"/><file name="mysql4-upgrade-0.1.0-0.1.1.php" hash="1e8d0cc9906c303b99042290636faef9"/><file name="mysql4-upgrade-0.1.1-0.1.2.php" hash="d710311110eebfc65573d178e8cf5aba"/><file name="mysql4-upgrade-0.1.2-0.1.3.php" hash="1e8d0cc9906c303b99042290636faef9"/><file name="mysql4-upgrade-0.1.3-1.0.0.php" hash="ef0079b0f3b1c09b7417ff86df00ad9e"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Iglobal_Fee.xml" hash="205714b75c3b417343a6b25ecedf35c4"/><file name="Iglobal_Ship.xml" hash="6d40f1c84e29bb7d8b70eadd77a03917"/><file name="Iglobal_Stores.xml" hash="9d9c621c78a98152bf83747eeecdaf99"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="fee.xml" hash="96955d111e2a9014d5dc3d18201ddddf"/><file name="iglobal.xml" hash="6df6f5f0aceab891d0cd13061a3b5e55"/></dir><dir name="template"><dir name="iglobal"><dir name="sales"><dir name="order"><dir name="view"><file name="info.phtml" hash="06280040dd9521efcd36c12779648108"/></dir></dir></dir></dir><dir name="fee"><dir name="sales"><dir name="order"><file name="refunded.phtml" hash="f4239d313366d75907a34b3342b35eb1"/><file name="total.phtml" hash="bbb080fb20415086d72719c1f1f613d4"/></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="iglobal"><dir name="checkout"><dir name="cart"><dir name="item"><dir name="configure"><file name="updatecart.phtml" hash="0fc6cc809c88704da74a915cf7e20918"/></dir></dir></dir></dir><dir name="stores"><file name="cart.phtml" hash="53fbd6c81d74af67e38fe717a1526bfc"/><file name="igcincludes.phtml" hash="c8e7469a99a83a7ad7a884fa96899abc"/></dir></dir></dir><dir name="layout"><file name="iglobal.xml" hash="d522ac5d3cabf448736c0b593dd7536e"/><file name="fee.xml" hash="97d67fc83755f625dfe305748fca65b1"/></dir></dir></dir></dir></target><target name="mage"><dir name="js"><dir name="iGlobal"><file name="ig_welcome_mat_default.css" hash="52ddb2f596572313d7525de9b53adecb"/><file name="ig_welcome_mat_default.js" hash="704d91519b36dd4c2de5da118c30aff0"/><file name="igc.cs.magento_default_ice.js" hash="df4214409ba944166c1828a23a592d1a"/><dir name="jquery"><file name="jquery.js" hash="73a130a5693ab0a806c6d2acc8251006"/><file name="jquery.noconflict.js" hash="09bfdd3b964eb2b17b5d6caa1d20a607"/></dir></dir></dir></target></contents>
63
  <compatible/>
64
  <dependencies><required><php><min>5.0.0</min><max>7.0.0</max></php></required></dependencies>
65
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Iglobal_Main</name>
4
+ <version>1.0.4</version>
5
  <stability>stable</stability>
6
  <license>OSL</license>
7
  <channel>community</channel>
55
  &lt;li&gt;&lt;strong&gt;iGlobal Dimension Units&lt;/strong&gt; &#x2013; Unit of measure for the iGlobal Dimensional attributes. (CM / IN)&lt;/li&gt;&#xD;
56
  &lt;/ul&gt;&#xD;
57
  &lt;/ol&gt;</description>
58
+ <notes>a few bug fixes</notes>
59
  <authors><author><name>Matt Flamm</name><user>mattflamm</user><email>matt@iglobalstores.com</email></author><author><name>Judd Flamm</name><user>UnkUser1</user><email>judd@iglobalstores.com</email></author><author><name>Dustin Dwyer</name><user>UnkUser2</user><email>dustin@iglobalstores.com</email></author><author><name>Dave Meads</name><user>unkuser3</user><email>dave@iglobalstores.com</email></author></authors>
60
+ <date>2014-08-22</date>
61
+ <time>04:35:29</time>
62
+ <contents><target name="magecommunity"><dir name="Iglobal"><dir name="Fee"><dir name="Block"><dir name="Sales"><dir name="Order"><file name="Total.php" hash="0e9e1537fd6cedc9a2b4a3efdf3f769d"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="406a814f1216d736e8661a32c833a15e"/></dir><dir name="Model"><file name="Fee.php" hash="29729703293e6fa5af6527708d67d97f"/><file name="Observer.php" hash="a9ec09a49108625f592f8ef00bcba842"/><dir name="Sales"><dir name="Order"><dir name="Total"><dir name="Creditmemo"><file name="Fee.php" hash="048c8a97de6d884d3b95e0345c1cb75a"/></dir><dir name="Invoice"><file name="Fee.php" hash="fc98218c9a421b95af9f5f0ca062e1d8"/></dir></dir></dir><dir name="Quote"><dir name="Address"><dir name="Total"><file name="Fee.php" hash="bc925a41535068fb0a94c57183dd2027"/></dir></dir></dir></dir></dir><dir name="etc"><file name="config.xml" hash="4cf60a3913d56196b169dd2dffa85e12"/></dir><dir name="sql"><dir name="fee_setup"><file name="mysql4-install-0.1.0.php" hash="8327866f66c8bff7fcbb0305385a6f93"/></dir></dir></dir><dir name="Ship"><dir name="Block"><file name="Ship.php" hash="a802b4d42e72997ec4ab466dec75b743"/></dir><dir name="Helper"><file name="Data.php" hash="fe9f074c1cb74260fa134efa94eb67c9"/></dir><dir name="Model"><dir name="Carrier"><file name="Excellence.php" hash="1cf0b2e1716d3f726f4e974f02267b53"/></dir></dir><dir name="controllers"><file name="IndexController.php" hash="3355a75caf30f4ff96499da3d8a4102a"/></dir><dir name="etc"><file name="config.xml" hash="adecbc76332ffb4b0f8918d3166c655c"/><file name="system.xml" hash="fea6b2ed9b7fdf5748cb57e53fe1301b"/></dir></dir><dir name="Stores"><dir name="Block"><file name="Ajax.php" hash="7b71e2bc9b801138f77f5927e7a6f6ba"/><file name="Cart.php" hash="2fd47fa1ca047bbc75383c2e35dd4bf2"/><file name="Includes.php" hash="7c36803ae1a6193f7805d7ae5bef17e6"/></dir><dir name="Helper"><file name="Configoptions.php" hash="b129e55b21f845a20d6e7fdb3b532be3"/><file name="Data.php" hash="2d77637b08ac8e7dcb717d8e1571739a"/></dir><dir name="Model"><file name="Configoptions.php" hash="6da281d601b7a6ce98ebc81b398d6e54"/><file name="Observer.php" hash="24ba19336cd0fb51700069ae3d80e471"/><dir name="Payment"><file name="Iglobal.php" hash="9ac8f8d81b8f8d547831ad6db8a1c7fc"/><file name="Iglobalcreditcard.php" hash="f2f5cf4507a128fadc95071951ca2a41"/><file name="Iglobalpaypal.php" hash="3a566289db82b177ce6b52ce205728f6"/></dir><dir name="Resource"><file name="Setup.php" hash="6b05cac95a1d36deeb7e9c9bd439ad8c"/></dir><dir name="Rest"><file name="Order.php" hash="916a67634abdf48666119854a1628ac3"/></dir><dir name="Service"><file name="Quote.php" hash="bae0e5a710b9e3aa1427bb78a08fbfd8"/></dir></dir><dir name="controllers"><file name="AjaxController.php" hash="3169062e850efd55749ae8033676bf2d"/><file name="SuccessController.php" hash="38d0b1715a5b8aa30ab2cbfbee5d65d7"/><file name="TestController.php" hash="4d14668de657eaa3f32a200e35b43a37"/><file name="UpdateShippingStatusController.php" hash="77534f8cbc68f23ab3377ff1427b9300"/></dir><dir name="etc"><file name="adminhtml.xml" hash="a94aa66e4f3643fcc49fb60650fef416"/><file name="config.xml" hash="d224067eb392ad4f0990f9ca5f2cb1c0"/><file name="system.xml" hash="40420c6652da8b38d181fdf57ab15720"/></dir><dir name="sql"><dir name="iglobal_stores_setup"><file name="mysql4-install-0.1.0.php" hash="8f8d6e6596d0ad98d70075f79f320cfd"/><file name="mysql4-upgrade-0.1.0-0.1.1.php" hash="1e8d0cc9906c303b99042290636faef9"/><file name="mysql4-upgrade-0.1.1-0.1.2.php" hash="d710311110eebfc65573d178e8cf5aba"/><file name="mysql4-upgrade-0.1.2-0.1.3.php" hash="1e8d0cc9906c303b99042290636faef9"/><file name="mysql4-upgrade-0.1.3-1.0.0.php" hash="ef0079b0f3b1c09b7417ff86df00ad9e"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Iglobal_Fee.xml" hash="205714b75c3b417343a6b25ecedf35c4"/><file name="Iglobal_Ship.xml" hash="6d40f1c84e29bb7d8b70eadd77a03917"/><file name="Iglobal_Stores.xml" hash="9d9c621c78a98152bf83747eeecdaf99"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="fee.xml" hash="96955d111e2a9014d5dc3d18201ddddf"/><file name="iglobal.xml" hash="6df6f5f0aceab891d0cd13061a3b5e55"/></dir><dir name="template"><dir name="iglobal"><dir name="sales"><dir name="order"><dir name="view"><file name="info.phtml" hash="06280040dd9521efcd36c12779648108"/></dir></dir></dir></dir><dir name="fee"><dir name="sales"><dir name="order"><file name="refunded.phtml" hash="f4239d313366d75907a34b3342b35eb1"/><file name="total.phtml" hash="bbb080fb20415086d72719c1f1f613d4"/></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="iglobal"><dir name="checkout"><dir name="cart"><dir name="item"><dir name="configure"><file name="updatecart.phtml" hash="0fc6cc809c88704da74a915cf7e20918"/></dir></dir></dir></dir><dir name="stores"><file name="cart.phtml" hash="7f81a0edcf7658bbb62fc5138c1f87f5"/><file name="igcincludes.phtml" hash="c8e7469a99a83a7ad7a884fa96899abc"/></dir></dir></dir><dir name="layout"><file name="iglobal.xml" hash="d522ac5d3cabf448736c0b593dd7536e"/><file name="fee.xml" hash="97d67fc83755f625dfe305748fca65b1"/></dir></dir></dir></dir></target><target name="mage"><dir name="js"><dir name="iGlobal"><file name="ig_welcome_mat_default.css" hash="52ddb2f596572313d7525de9b53adecb"/><file name="ig_welcome_mat_default.js" hash="6d8567ed60a1464e738eb018e77e7874"/><file name="igc.cs.magento_default_ice.js" hash="aa8836ba720daba6b6a62130f7d6035c"/><dir name="jquery"><file name="jquery.js" hash="73a130a5693ab0a806c6d2acc8251006"/><file name="jquery.noconflict.js" hash="09bfdd3b964eb2b17b5d6caa1d20a607"/></dir></dir></dir></target></contents>
63
  <compatible/>
64
  <dependencies><required><php><min>5.0.0</min><max>7.0.0</max></php></required></dependencies>
65
  </package>