Iglobal_Main - Version 1.0.01

Version Notes

Initial stable release of iGlobal's integration extension. For problems contact support at iglobalstores.com

Download this release

Release Info

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


Code changes from version 1.0.0 to 1.0.01

Files changed (6) hide show
  1. app/code/community/Iglobal/Stores/controllers/AjaxController.php +4 -4
  2. app/code/community/Iglobal/Stores/controllers/TestController.php +3 -3
  3. app/code/community/Iglobal/Stores/etc/config.xml +1 -1
  4. js/iGlobal/ig_welcome_mat_default.js +7 -7
  5. js/iGlobal/igc.cs.magento_default_ice.js +4 -0
  6. package.xml +3 -3
app/code/community/Iglobal/Stores/controllers/AjaxController.php CHANGED
@@ -45,14 +45,14 @@ class Iglobal_Stores_AjaxController extends Mage_Core_Controller_Front_Action
45
  $matData['flag_parent'] = Mage::getStoreConfig('iglobal_integration/igmat/flag_parent');
46
  }
47
 
48
- // TODO: flag placement method
49
  if (Mage::getStoreConfig('iglobal_integration/igmat/flag_method')) {
50
  $matData['flag_method'] = Mage::getStoreConfig('iglobal_integration/igmat/flag_method');
51
  }
52
 
53
- // TODO: flag placement code
54
- if (Mage::getStoreConfig('iglobal_integration/igmat/flag_code')) {
55
- $matData['flag_method'] = Mage::getStoreConfig('iglobal_integration/igmat/flag_code');
56
  }
57
 
58
  //figure out what countries are serviced
45
  $matData['flag_parent'] = Mage::getStoreConfig('iglobal_integration/igmat/flag_parent');
46
  }
47
 
48
+ // flag placement method
49
  if (Mage::getStoreConfig('iglobal_integration/igmat/flag_method')) {
50
  $matData['flag_method'] = Mage::getStoreConfig('iglobal_integration/igmat/flag_method');
51
  }
52
 
53
+ // flag placement code
54
+ if (true || Mage::getStoreConfig('iglobal_integration/igmat/flag_code')) {
55
+ $matData['flag_code'] = Mage::getStoreConfig('iglobal_integration/igmat/flag_code');
56
  }
57
 
58
  //figure out what countries are serviced
app/code/community/Iglobal/Stores/controllers/TestController.php CHANGED
@@ -6,9 +6,9 @@ class Iglobal_Stores_TestController extends Mage_Core_Controller_Front_Action
6
  {
7
 
8
  echo "in the controller <br/>";
9
-
10
 
11
- $_order = $this->getRequest()->getParam('orderId', null);
12
 
13
 
14
 
@@ -33,7 +33,7 @@ class Iglobal_Stores_TestController extends Mage_Core_Controller_Front_Action
33
  if ($data['testOrder'] = true) {
34
  echo "stuff <br />";
35
  }
36
-
37
  }
38
 
39
  }
6
  {
7
 
8
  echo "in the controller <br/>";
9
+ echo Mage::getStoreConfig('iglobal_integration/igmat/flag_code');
10
 
11
+ /* $_order = $this->getRequest()->getParam('orderId', null);
12
 
13
 
14
 
33
  if ($data['testOrder'] = true) {
34
  echo "stuff <br />";
35
  }
36
+ */
37
  }
38
 
39
  }
app/code/community/Iglobal/Stores/etc/config.xml CHANGED
@@ -4,7 +4,7 @@
4
  <config>
5
  <modules>
6
  <Iglobal_Stores>
7
- <version>1.0.0</version>
8
  <currencies>
9
  <AED></AED>
10
  <ARS>&amp;#8371;</ARS>
4
  <config>
5
  <modules>
6
  <Iglobal_Stores>
7
+ <version>1.0.01</version>
8
  <currencies>
9
  <AED></AED>
10
  <ARS>&amp;#8371;</ARS>
js/iGlobal/ig_welcome_mat_default.js CHANGED
@@ -46,7 +46,7 @@ var ajaxResult = igJq.ajax({
46
  var ajaxResult = eval("(" + data + ")");
47
  //console.log(ajaxResult);
48
  //store ID
49
- if (ajaxResult.storeId){
50
  // store ID is set
51
  ig_storeId = ajaxResult.storeId;
52
  }
@@ -96,7 +96,7 @@ var ajaxResult = igJq.ajax({
96
  });
97
 
98
 
99
- //console.log('outside: id: ' + ig_storeId + ' || flag: ' + ig_flagLocation + ' || Logo: ' + ig_logoUrl + ' || Domestic countries: ' + ig_domestic + " || Serviced Countries: " + ig_countries);
100
 
101
 
102
 
@@ -126,17 +126,17 @@ igJq(function(){
126
  */
127
 
128
  igJq(function(){
129
- if (ig_flagMethod = "prepend"){
130
  igJq(ig_flagLocation).prepend(ig_flagCode);
131
  }
132
- else if (ig_flagMethod = "append"){
133
  igJq(ig_flagLocation).append(ig_flagCode);
134
  }
135
- else if (ig_flagMethod = "before"){
136
  igJq(ig_flagLocation).before(ig_flagCode);
137
  }
138
- else if (ig_flagMethod = "after"){
139
- igJq(ig_flagLocation).pafter(ig_flagCode);
140
  }
141
  else {
142
  igJq(ig_flagLocation).prepend(ig_flagCode);
46
  var ajaxResult = eval("(" + data + ")");
47
  //console.log(ajaxResult);
48
  //store ID
49
+ if (ajaxResult.storeId && ajaxResult.storeId != "Your Store ID Goes Here"){
50
  // store ID is set
51
  ig_storeId = ajaxResult.storeId;
52
  }
96
  });
97
 
98
 
99
+ console.log('outside: method: ' + ig_flagMethod + ' || flag: ' + ig_flagLocation + ' || code: ' + ig_flagCode + ' || Domestic countries: ' + ig_domestic + " || Serviced Countries: " + ig_countries);
100
 
101
 
102
 
126
  */
127
 
128
  igJq(function(){
129
+ if (ig_flagMethod == "prepend"){
130
  igJq(ig_flagLocation).prepend(ig_flagCode);
131
  }
132
+ else if (ig_flagMethod == "append"){
133
  igJq(ig_flagLocation).append(ig_flagCode);
134
  }
135
+ else if (ig_flagMethod == "before"){
136
  igJq(ig_flagLocation).before(ig_flagCode);
137
  }
138
+ else if (ig_flagMethod == "after"){
139
+ igJq(ig_flagLocation).after(ig_flagCode);
140
  }
141
  else {
142
  igJq(ig_flagLocation).prepend(ig_flagCode);
js/iGlobal/igc.cs.magento_default_ice.js CHANGED
@@ -43,6 +43,10 @@ function igcCheckout() {
43
  igcGoToCheckout(igStoreId);
44
  }
45
 
 
 
 
 
46
  function getSubDomain() {
47
  return igSubdomain;
48
  }
43
  igcGoToCheckout(igStoreId);
44
  }
45
 
46
+ function getSelectedCountry() {
47
+ return ig_country;
48
+ }
49
+
50
  function getSubDomain() {
51
  return igSubdomain;
52
  }
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Iglobal_Main</name>
4
- <version>1.0.0</version>
5
  <stability>stable</stability>
6
  <license>OSL</license>
7
  <channel>community</channel>
@@ -58,8 +58,8 @@ Installation Instructions&#xD;
58
  <notes>Initial stable release of iGlobal's integration extension. For problems contact support at iglobalstores.com</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-08</date>
61
- <time>12:54:46</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="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="ada167f56ba84bc2307e3089c110aec1"/><file name="SuccessController.php" hash="dd7fcdd708cb71e83c20e56ca508bd78"/><file name="TestController.php" hash="ab0539c10f084999dead4a8a9bc0b65d"/><file name="UpdateShippingStatusController.php" hash="77534f8cbc68f23ab3377ff1427b9300"/></dir><dir name="etc"><file name="adminhtml.xml" hash="a94aa66e4f3643fcc49fb60650fef416"/><file name="config.xml" hash="05844372dbed1bbf5d3c3e9866a6a843"/><file name="system.xml" hash="1771e3fc5060dcbfe25981a44d7e02bb"/></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"><file name="default-old.phtml" hash="4299590da70f857c1746770a6d6f71a0"/><file name="default.phtml" hash="bef6a2e20b4a6d9e203042007e36c3d1"/></dir></dir></dir><dir name="stores"><file name="igcincludes.phtml" hash="c8e7469a99a83a7ad7a884fa96899abc"/></dir></dir></dir><dir name="layout"><file name="iglobal.xml" hash="4db43aceceaf9a0cbd912a443073874b"/><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="64f799a0c34606c49b05b02617e89720"/><file name="igc.cs.magento_default_ice.js" hash="ce8d5fe81514a8e1d41439a096bc9c08"/><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.01</version>
5
  <stability>stable</stability>
6
  <license>OSL</license>
7
  <channel>community</channel>
58
  <notes>Initial stable release of iGlobal's integration extension. For problems contact support at iglobalstores.com</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-08</date>
61
+ <time>14:45:18</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="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="dd7fcdd708cb71e83c20e56ca508bd78"/><file name="TestController.php" hash="6b5fac179a605abf3c7a36612049caf0"/><file name="UpdateShippingStatusController.php" hash="77534f8cbc68f23ab3377ff1427b9300"/></dir><dir name="etc"><file name="adminhtml.xml" hash="a94aa66e4f3643fcc49fb60650fef416"/><file name="config.xml" hash="b3432cf61923c4ab1d7d31cd1e087aeb"/><file name="system.xml" hash="1771e3fc5060dcbfe25981a44d7e02bb"/></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"><file name="default-old.phtml" hash="4299590da70f857c1746770a6d6f71a0"/><file name="default.phtml" hash="bef6a2e20b4a6d9e203042007e36c3d1"/></dir></dir></dir><dir name="stores"><file name="igcincludes.phtml" hash="c8e7469a99a83a7ad7a884fa96899abc"/></dir></dir></dir><dir name="layout"><file name="iglobal.xml" hash="4db43aceceaf9a0cbd912a443073874b"/><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="26a78a131967a1d339f5385b681cbefb"/><file name="igc.cs.magento_default_ice.js" hash="dcb23a396816bac19c28294dbe5fbb96"/><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>