Version Notes
New Features:
Welcome Mat styling is more compatible with other browsers.
Removes any white space that may have been added in store id and api key.
Download this release
Release Info
Developer | Brian Olsen |
Extension | Iglobal_Main |
Version | 1.5.2 |
Comparing to | |
See all releases |
Code changes from version 1.5.1 to 1.5.2
- app/code/community/Iglobal/Stores/Helper/Data.php +2 -1
- app/code/community/Iglobal/Stores/Model/International/International.php +3 -1
- app/code/community/Iglobal/Stores/Model/Rest.php +6 -0
- app/code/community/Iglobal/Stores/etc/.config.xml.swp +0 -0
- app/code/community/Iglobal/Stores/etc/config.xml +23 -23
- js/iGlobal/ig_welcome_mat_default.css +6 -21
- js/iGlobal/ig_welcome_mat_default.js +3 -2
- package.xml +27 -30
app/code/community/Iglobal/Stores/Helper/Data.php
CHANGED
@@ -126,6 +126,7 @@ class Iglobal_Stores_Helper_Data extends Mage_Core_Helper_Abstract
|
|
126 |
public function getCheckoutUrl($tempCart){
|
127 |
$subdomain = (Mage::getStoreConfig('iglobal_integration/apireqs/igsubdomain') ? Mage::getStoreConfig('iglobal_integration/apireqs/igsubdomain') : "checkout");
|
128 |
$storeNumber = (Mage::getStoreConfig('iglobal_integration/apireqs/iglobalid') ? Mage::getStoreConfig('iglobal_integration/apireqs/iglobalid') : "3");
|
|
|
129 |
$countryCode = (isset($_COOKIE['igCountry']) ? $_COOKIE['igCountry'] : "");
|
130 |
$url = 'https://' . $subdomain . '.iglobalstores.com/?store=' . $storeNumber . '&tempCartUUID=' . $tempCart . '&country=' . $countryCode;
|
131 |
|
@@ -218,7 +219,7 @@ class Iglobal_Stores_Helper_Data extends Mage_Core_Helper_Abstract
|
|
218 |
}
|
219 |
|
220 |
protected function getProductAttribute($product, $attributeName) {
|
221 |
-
$value = Mage::
|
222 |
if($value) {
|
223 |
return $product->getData($value);
|
224 |
}
|
126 |
public function getCheckoutUrl($tempCart){
|
127 |
$subdomain = (Mage::getStoreConfig('iglobal_integration/apireqs/igsubdomain') ? Mage::getStoreConfig('iglobal_integration/apireqs/igsubdomain') : "checkout");
|
128 |
$storeNumber = (Mage::getStoreConfig('iglobal_integration/apireqs/iglobalid') ? Mage::getStoreConfig('iglobal_integration/apireqs/iglobalid') : "3");
|
129 |
+
$storeNumber = trim($storeNumber, ' ');
|
130 |
$countryCode = (isset($_COOKIE['igCountry']) ? $_COOKIE['igCountry'] : "");
|
131 |
$url = 'https://' . $subdomain . '.iglobalstores.com/?store=' . $storeNumber . '&tempCartUUID=' . $tempCart . '&country=' . $countryCode;
|
132 |
|
219 |
}
|
220 |
|
221 |
protected function getProductAttribute($product, $attributeName) {
|
222 |
+
$value = Mage::getStoreConfig('iglobal_integration/ig_item_attribute/' . $attributeName);
|
223 |
if($value) {
|
224 |
return $product->getData($value);
|
225 |
}
|
app/code/community/Iglobal/Stores/Model/International/International.php
CHANGED
@@ -24,8 +24,10 @@ class Iglobal_Stores_Model_International_International extends Mage_Core_Model_A
|
|
24 |
);
|
25 |
}
|
26 |
$rest = Mage::getModel('stores/rest');
|
|
|
|
|
27 |
$response = $rest->createTempCart(array(
|
28 |
-
"storeId" =>
|
29 |
"referenceId" => $cart->getId(),
|
30 |
"externalConfirmationPageURL" => MAge::getUrl('iglobal/success', array('_secure'=> true)),
|
31 |
"misc6" => "iGlobal v".Mage::getConfig()->getModuleConfig("Iglobal_Stores")->version. ", Magento v".Mage::getVersion(),
|
24 |
);
|
25 |
}
|
26 |
$rest = Mage::getModel('stores/rest');
|
27 |
+
$storeId = Mage::getStoreConfig('iglobal_integration/apireqs/iglobalid');
|
28 |
+
$storeId = trim($storeId, ' ');
|
29 |
$response = $rest->createTempCart(array(
|
30 |
+
"storeId" => $storeId,
|
31 |
"referenceId" => $cart->getId(),
|
32 |
"externalConfirmationPageURL" => MAge::getUrl('iglobal/success', array('_secure'=> true)),
|
33 |
"misc6" => "iGlobal v".Mage::getConfig()->getModuleConfig("Iglobal_Stores")->version. ", Magento v".Mage::getVersion(),
|
app/code/community/Iglobal/Stores/Model/Rest.php
CHANGED
@@ -11,10 +11,16 @@ class Iglobal_Stores_Model_Rest extends Mage_Core_Model_Abstract
|
|
11 |
//set store ID
|
12 |
if (Mage::getStoreConfig('iglobal_integration/apireqs/iglobalid')) {
|
13 |
$this->_store = Mage::getStoreConfig('iglobal_integration/apireqs/iglobalid');
|
|
|
|
|
|
|
14 |
}
|
15 |
//Set API Key
|
16 |
if (Mage::getStoreConfig('iglobal_integration/apireqs/secret')) {
|
17 |
$this->_key = Mage::getStoreConfig('iglobal_integration/apireqs/secret');
|
|
|
|
|
|
|
18 |
}
|
19 |
}
|
20 |
|
11 |
//set store ID
|
12 |
if (Mage::getStoreConfig('iglobal_integration/apireqs/iglobalid')) {
|
13 |
$this->_store = Mage::getStoreConfig('iglobal_integration/apireqs/iglobalid');
|
14 |
+
print_r($this->_store);
|
15 |
+
$this->_store = trim($this->_store, ' ');
|
16 |
+
print_r($this->_store);
|
17 |
}
|
18 |
//Set API Key
|
19 |
if (Mage::getStoreConfig('iglobal_integration/apireqs/secret')) {
|
20 |
$this->_key = Mage::getStoreConfig('iglobal_integration/apireqs/secret');
|
21 |
+
print_r($this->_key);
|
22 |
+
$this->_key = trim($this->_key, ' ');
|
23 |
+
print_r($this->_key);
|
24 |
}
|
25 |
}
|
26 |
|
app/code/community/Iglobal/Stores/etc/.config.xml.swp
ADDED
Binary file
|
app/code/community/Iglobal/Stores/etc/config.xml
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Iglobal_Stores>
|
5 |
-
<version>1.5.
|
6 |
<currencies>
|
7 |
<AED></AED>
|
8 |
<ARS>&#8371;</ARS>
|
@@ -43,7 +43,7 @@
|
|
43 |
<AW label="Aruba">USD</AW>
|
44 |
<AU label="Australia">AUD</AU>
|
45 |
<AT label="Austria">EUR</AT>
|
46 |
-
|
47 |
<BS label="Bahamas">USD</BS>
|
48 |
<BB label="Barbados">USD</BB>
|
49 |
<BE label="Belgium">EUR</BE>
|
@@ -52,7 +52,7 @@
|
|
52 |
<BQ label="Bonaire, Sint Eustatius and Saba">USD</BQ>
|
53 |
<BR label="Brazil">BRL</BR>
|
54 |
<BG label="Bulgaria">USD</BG>
|
55 |
-
|
56 |
<KH label="Cambodia">USD</KH>
|
57 |
<CA label="Canada">CAD</CA>
|
58 |
<IC label="Canary Islands">EUR</IC>
|
@@ -62,23 +62,23 @@
|
|
62 |
<CR label="Costa Rica">USD</CR>
|
63 |
<CK label="Cook Islands">NZD</CK>
|
64 |
<CY label="Cyprus">EUR</CY>
|
65 |
-
|
66 |
<DK label="Denmark">DKK</DK>
|
67 |
<DM label="Dominica">USD</DM>
|
68 |
<DO label="Dominican Republic">USD</DO>
|
69 |
-
|
70 |
<EC label="Ecuador">USD</EC>
|
71 |
<SV label="El Salvador">USD</SV>
|
72 |
<ER label="Eritrea">USD</ER>
|
73 |
<EE label="Estonia">EUR</EE>
|
74 |
<ET label="Ethiopia">USD</ET>
|
75 |
-
|
76 |
<FO label="Faroe Islands">DKK</FO>
|
77 |
<FI label="Finland">EUR</FI>
|
78 |
<FR label="France">EUR</FR>
|
79 |
<GF label="French Guiana">EUR</GF>
|
80 |
<PF label="French Polynesia">USD</PF>
|
81 |
-
|
82 |
<DE label="Germany">EUR</DE>
|
83 |
<GR label="Greece">EUR</GR>
|
84 |
<GL label="Greenland">DKK</GL>
|
@@ -87,26 +87,26 @@
|
|
87 |
<GU label="Guam">USD</GU>
|
88 |
<GT label="Guatemala">USD</GT>
|
89 |
<GY label="Guyana">USD</GY>
|
90 |
-
|
91 |
<HK label="Hong Kong">HKD</HK>
|
92 |
<HU label="Hungary">HUF</HU>
|
93 |
-
|
94 |
<IS label="Iceland">USD</IS>
|
95 |
<IN label="India">INR</IN>
|
96 |
<IE label="Ireland">EUR</IE>
|
97 |
<IL label="Israel">ILS</IL>
|
98 |
<IT label="Italy">EUR</IT>
|
99 |
-
|
100 |
<JM label="Jamaica">USD</JM>
|
101 |
<JP label="Japan">JPY</JP>
|
102 |
<JO label="Jordan">USD</JO>
|
103 |
-
|
104 |
<KI label="Kiribati">AUD</KI>
|
105 |
<KW label="Kuwait">KWD</KW>
|
106 |
-
|
107 |
<LT label="Lithuania">USD</LT>
|
108 |
<LU label="Luxembourg">EUR</LU>
|
109 |
-
|
110 |
<MY label="Malaysia">MYR</MY>
|
111 |
<MV label="Maldives">USD</MV>
|
112 |
<MT label="Malta">EUR</MT>
|
@@ -118,12 +118,12 @@
|
|
118 |
<MD label="Moldova, Republic of">USD</MD>
|
119 |
<MC label="Monaco">EUR</MC>
|
120 |
<MS label="Montserrat">USD</MS>
|
121 |
-
|
122 |
<NL label="Netherlands">EUR</NL>
|
123 |
<NZ label="New Zealand">NZD</NZ>
|
124 |
<NI label="Nicaragua">USD</NI>
|
125 |
<NO label="Norway">NOK</NO>
|
126 |
-
|
127 |
<PK label="Pakistan">USD</PK>
|
128 |
<PW label="Palau">USD</PW>
|
129 |
<PA label="Panama">USD</PA>
|
@@ -131,17 +131,17 @@
|
|
131 |
<PL label="Poland">USD</PL>
|
132 |
<PT label="Portugal">EUR</PT>
|
133 |
<PR label="Puerto Rico">USD</PR>
|
134 |
-
|
135 |
<RO label="Romania">USD</RO>
|
136 |
<RU label="Russia">RUB</RU>
|
137 |
-
|
138 |
<BL label="Saint Barthélemy">EUR</BL>
|
139 |
<KN label="Saint Kitts and Nevis">USD</KN>
|
140 |
<LC label="Saint Lucia">USD</LC>
|
141 |
<SX label="Saint Maarten">USD</SX>
|
142 |
<VC label="Saint Vincent and the Grenadines">USD</VC>
|
143 |
<WS label="Samoa">USD</WS>
|
144 |
-
<SM label="San Marino">EUR</SM>
|
145 |
<ST label="Sao Tome and Principe">USD</ST>
|
146 |
<SC label="Seychelles">USD</SC>
|
147 |
<SG label="Singapore">SGD</SG>
|
@@ -150,21 +150,21 @@
|
|
150 |
<ES label="Spain">EUR</ES>
|
151 |
<SE label="Sweden">SEK</SE>
|
152 |
<CH label="Switzerland">CHF</CH>
|
153 |
-
|
154 |
<TW label="Taiwan">TWD</TW>
|
155 |
<TH label="Thailand">THB</TH>
|
156 |
<TC label="Turks and Caicos Islands">USD</TC>
|
157 |
-
|
158 |
<AE label="United Arab Emirates">AED</AE>
|
159 |
<GB label="United Kingdom">GBP</GB>
|
160 |
<US label="United States">USD</US>
|
161 |
<UY label="Uruguay">USD</UY>
|
162 |
-
|
163 |
<VU label="Vanuatu">USD</VU>
|
164 |
<VE label="Venezuela, Bolivarian Republic of">USD</VE>
|
165 |
<VN label="Viet Nam">USD</VN>
|
166 |
<VI label="Virgin Islands, U.S.">USD</VI>
|
167 |
-
|
168 |
<!--<KY>KYD</KY>-->
|
169 |
</countries>
|
170 |
</Iglobal_Stores>
|
@@ -329,7 +329,7 @@
|
|
329 |
<ig_domestic_countries>US</ig_domestic_countries>
|
330 |
</country>
|
331 |
</general>
|
332 |
-
|
333 |
</default>
|
334 |
<adminhtml>
|
335 |
<acl>
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Iglobal_Stores>
|
5 |
+
<version>1.5.2</version>
|
6 |
<currencies>
|
7 |
<AED></AED>
|
8 |
<ARS>&#8371;</ARS>
|
43 |
<AW label="Aruba">USD</AW>
|
44 |
<AU label="Australia">AUD</AU>
|
45 |
<AT label="Austria">EUR</AT>
|
46 |
+
|
47 |
<BS label="Bahamas">USD</BS>
|
48 |
<BB label="Barbados">USD</BB>
|
49 |
<BE label="Belgium">EUR</BE>
|
52 |
<BQ label="Bonaire, Sint Eustatius and Saba">USD</BQ>
|
53 |
<BR label="Brazil">BRL</BR>
|
54 |
<BG label="Bulgaria">USD</BG>
|
55 |
+
|
56 |
<KH label="Cambodia">USD</KH>
|
57 |
<CA label="Canada">CAD</CA>
|
58 |
<IC label="Canary Islands">EUR</IC>
|
62 |
<CR label="Costa Rica">USD</CR>
|
63 |
<CK label="Cook Islands">NZD</CK>
|
64 |
<CY label="Cyprus">EUR</CY>
|
65 |
+
|
66 |
<DK label="Denmark">DKK</DK>
|
67 |
<DM label="Dominica">USD</DM>
|
68 |
<DO label="Dominican Republic">USD</DO>
|
69 |
+
|
70 |
<EC label="Ecuador">USD</EC>
|
71 |
<SV label="El Salvador">USD</SV>
|
72 |
<ER label="Eritrea">USD</ER>
|
73 |
<EE label="Estonia">EUR</EE>
|
74 |
<ET label="Ethiopia">USD</ET>
|
75 |
+
|
76 |
<FO label="Faroe Islands">DKK</FO>
|
77 |
<FI label="Finland">EUR</FI>
|
78 |
<FR label="France">EUR</FR>
|
79 |
<GF label="French Guiana">EUR</GF>
|
80 |
<PF label="French Polynesia">USD</PF>
|
81 |
+
|
82 |
<DE label="Germany">EUR</DE>
|
83 |
<GR label="Greece">EUR</GR>
|
84 |
<GL label="Greenland">DKK</GL>
|
87 |
<GU label="Guam">USD</GU>
|
88 |
<GT label="Guatemala">USD</GT>
|
89 |
<GY label="Guyana">USD</GY>
|
90 |
+
|
91 |
<HK label="Hong Kong">HKD</HK>
|
92 |
<HU label="Hungary">HUF</HU>
|
93 |
+
|
94 |
<IS label="Iceland">USD</IS>
|
95 |
<IN label="India">INR</IN>
|
96 |
<IE label="Ireland">EUR</IE>
|
97 |
<IL label="Israel">ILS</IL>
|
98 |
<IT label="Italy">EUR</IT>
|
99 |
+
|
100 |
<JM label="Jamaica">USD</JM>
|
101 |
<JP label="Japan">JPY</JP>
|
102 |
<JO label="Jordan">USD</JO>
|
103 |
+
|
104 |
<KI label="Kiribati">AUD</KI>
|
105 |
<KW label="Kuwait">KWD</KW>
|
106 |
+
|
107 |
<LT label="Lithuania">USD</LT>
|
108 |
<LU label="Luxembourg">EUR</LU>
|
109 |
+
|
110 |
<MY label="Malaysia">MYR</MY>
|
111 |
<MV label="Maldives">USD</MV>
|
112 |
<MT label="Malta">EUR</MT>
|
118 |
<MD label="Moldova, Republic of">USD</MD>
|
119 |
<MC label="Monaco">EUR</MC>
|
120 |
<MS label="Montserrat">USD</MS>
|
121 |
+
|
122 |
<NL label="Netherlands">EUR</NL>
|
123 |
<NZ label="New Zealand">NZD</NZ>
|
124 |
<NI label="Nicaragua">USD</NI>
|
125 |
<NO label="Norway">NOK</NO>
|
126 |
+
|
127 |
<PK label="Pakistan">USD</PK>
|
128 |
<PW label="Palau">USD</PW>
|
129 |
<PA label="Panama">USD</PA>
|
131 |
<PL label="Poland">USD</PL>
|
132 |
<PT label="Portugal">EUR</PT>
|
133 |
<PR label="Puerto Rico">USD</PR>
|
134 |
+
|
135 |
<RO label="Romania">USD</RO>
|
136 |
<RU label="Russia">RUB</RU>
|
137 |
+
|
138 |
<BL label="Saint Barthélemy">EUR</BL>
|
139 |
<KN label="Saint Kitts and Nevis">USD</KN>
|
140 |
<LC label="Saint Lucia">USD</LC>
|
141 |
<SX label="Saint Maarten">USD</SX>
|
142 |
<VC label="Saint Vincent and the Grenadines">USD</VC>
|
143 |
<WS label="Samoa">USD</WS>
|
144 |
+
<SM label="San Marino">EUR</SM>
|
145 |
<ST label="Sao Tome and Principe">USD</ST>
|
146 |
<SC label="Seychelles">USD</SC>
|
147 |
<SG label="Singapore">SGD</SG>
|
150 |
<ES label="Spain">EUR</ES>
|
151 |
<SE label="Sweden">SEK</SE>
|
152 |
<CH label="Switzerland">CHF</CH>
|
153 |
+
|
154 |
<TW label="Taiwan">TWD</TW>
|
155 |
<TH label="Thailand">THB</TH>
|
156 |
<TC label="Turks and Caicos Islands">USD</TC>
|
157 |
+
|
158 |
<AE label="United Arab Emirates">AED</AE>
|
159 |
<GB label="United Kingdom">GBP</GB>
|
160 |
<US label="United States">USD</US>
|
161 |
<UY label="Uruguay">USD</UY>
|
162 |
+
|
163 |
<VU label="Vanuatu">USD</VU>
|
164 |
<VE label="Venezuela, Bolivarian Republic of">USD</VE>
|
165 |
<VN label="Viet Nam">USD</VN>
|
166 |
<VI label="Virgin Islands, U.S.">USD</VI>
|
167 |
+
|
168 |
<!--<KY>KYD</KY>-->
|
169 |
</countries>
|
170 |
</Iglobal_Stores>
|
329 |
<ig_domestic_countries>US</ig_domestic_countries>
|
330 |
</country>
|
331 |
</general>
|
332 |
+
|
333 |
</default>
|
334 |
<adminhtml>
|
335 |
<acl>
|
js/iGlobal/ig_welcome_mat_default.css
CHANGED
@@ -9,16 +9,13 @@
|
|
9 |
#igFlag { width: 30px; }
|
10 |
#igFlag img { max-width: 25px; margin-bottom: -3px; cursor: pointer; margin-left: 5px;}
|
11 |
|
12 |
-
/* Background blur effect */
|
13 |
-
body.welcome-mat-blur > *:not(#igSplashElement) { -webkit-filter: blur(8px); -moz-filter: blur(8px); -o-filter: blur(8px); -ms-filter: blur(8px); filter: blur(8px); }
|
14 |
-
|
15 |
/* Begin Modal Styles */
|
16 |
#igSplashElement {
|
17 |
-
position:
|
18 |
max-width: 500px;
|
19 |
background-color: #fff;
|
20 |
-
top:
|
21 |
-
left:
|
22 |
width: 100%;
|
23 |
-webkit-box-shadow: 0px 0px 60px 0px rgba(0, 0, 0, 0.5);
|
24 |
box-shadow: 0px 0px 60px 0px rgba(0, 0, 0, 0.5);
|
@@ -26,19 +23,14 @@ body.welcome-mat-blur > *:not(#igSplashElement) { -webkit-filter: blur(8px); -m
|
|
26 |
font-size: 14px;
|
27 |
font-family: 'Roboto', Helvetica, Arial, sans-serif;
|
28 |
/* The CSS below is for the opening and closing animation */
|
29 |
-
-webkit-transform: translateY(20%) translateX(-50%);
|
30 |
-
-moz-transform: translateY(20%) translateX(-50%);
|
31 |
-
-ms-transform: translateY(20%) translateX(-50%);
|
32 |
-
transform: translateY(20%) translateX(-50%);
|
33 |
-
opacity: 0;
|
34 |
-webkit-transition: all 0.3s;
|
35 |
-moz-transition: all 0.3s;
|
36 |
transition: all 0.3s;
|
37 |
z-index: 2001;
|
38 |
}
|
39 |
.closeButton { position: absolute; top: 3px; right: 3px; }
|
40 |
-
.
|
41 |
-
.
|
42 |
.igModalHeader {background-color: #fff;text-align: center;color: rgba(0,0,0,.87);box-sizing: border-box;}
|
43 |
.logoWrapper { width: 100%; padding: 30px; text-align: center; float: none; border-bottom: 1px solid #eee; box-sizing: border-box; }
|
44 |
.messageWrapper { width: 100%; padding: 30px 30px 10px; box-sizing: border-box; }
|
@@ -51,7 +43,7 @@ body.welcome-mat-blur > *:not(#igSplashElement) { -webkit-filter: blur(8px); -m
|
|
51 |
.igModalBody {background-color: white;width: 100%;}
|
52 |
.countryDropDownWrapper {width: 100%;min-height: 25px;-webkit-border-radius: 2px;border-radius: 2px;background: #eee;border: 0px; /* Set the color of your choice here */margin: 0 auto;padding: 0px;cursor: pointer;position: relative;}
|
53 |
.countryDropDownWrapper i { position: absolute; right: 10px; top: 10px; color: rgba(0,0,0,.3); }
|
54 |
-
#countrySelect { width:100%; position: relative; box-shadow: 0px 0px 0px; padding: 10px 15px;margin: 0px;font-size: 14px;line-height: 14px;color: #333 !important;cursor: pointer;-webkit-user-select: none;-moz-user-select: none;-ms-user-select: none;-o-user-select: none;user-select: none;background: none !important;border: 0 !important;-webkit-appearance: none;-moz-appearance: window;appearance: none;ms-appearance: none;overflow: hidden;height: 44px;text-align:
|
55 |
select::-ms-expand { display: none; }
|
56 |
ul.featureList { padding: 30px; margin: 20px 0px 30px; background-color: #eee; display: none !important; }
|
57 |
ul.featureList li { list-style-type: none; padding: 5px 0px; }
|
@@ -59,13 +51,6 @@ ul.featureList li i { position: relative; top: 6px; }
|
|
59 |
.igWelcomeCTAButton { width: 100%;padding: 0px 30px 30px; box-sizing: border-box;}
|
60 |
.igWelcomeCTAButton button {width: 100%;height: 44px;-webkit-border-radius: 2px;border-radius: 2px;color: white;margin: 0 auto;border: none;font-size: 14px;font-weight: normal; background-color: #333;opacity: 1;text-shadow: none;float: none;text-transform: uppercase;text-align: center;}
|
61 |
.igWelcomeCTAButton button:hover { color: white; background-color: #666; opacity: 1; }
|
62 |
-
.modal-open {
|
63 |
-
-webkit-transform: translateY(-50%) translateX(-50%) !important;
|
64 |
-
-moz-transform: translateY(-50%) translateX(-50%) !important;
|
65 |
-
-ms-transform: translateY(-50%) translateX(-50%) !important;
|
66 |
-
transform: translateY(-50%) translateX(-50%) !important;
|
67 |
-
opacity: 1 !important;
|
68 |
-
}
|
69 |
|
70 |
@media screen and (max-width: 600px) { /* Responsive design sets a width of 400px for all devices <= 600px */
|
71 |
#igSplashElement { width: 95%; top: 10px; }
|
9 |
#igFlag { width: 30px; }
|
10 |
#igFlag img { max-width: 25px; margin-bottom: -3px; cursor: pointer; margin-left: 5px;}
|
11 |
|
|
|
|
|
|
|
12 |
/* Begin Modal Styles */
|
13 |
#igSplashElement {
|
14 |
+
position: fixed;
|
15 |
max-width: 500px;
|
16 |
background-color: #fff;
|
17 |
+
top: 30%;
|
18 |
+
left: 37%;
|
19 |
width: 100%;
|
20 |
-webkit-box-shadow: 0px 0px 60px 0px rgba(0, 0, 0, 0.5);
|
21 |
box-shadow: 0px 0px 60px 0px rgba(0, 0, 0, 0.5);
|
23 |
font-size: 14px;
|
24 |
font-family: 'Roboto', Helvetica, Arial, sans-serif;
|
25 |
/* The CSS below is for the opening and closing animation */
|
|
|
|
|
|
|
|
|
|
|
26 |
-webkit-transition: all 0.3s;
|
27 |
-moz-transition: all 0.3s;
|
28 |
transition: all 0.3s;
|
29 |
z-index: 2001;
|
30 |
}
|
31 |
.closeButton { position: absolute; top: 3px; right: 3px; }
|
32 |
+
.igClose { padding: 5px 8px; background: #eee; text-align: right; }
|
33 |
+
.igClose i { cursor: pointer; }
|
34 |
.igModalHeader {background-color: #fff;text-align: center;color: rgba(0,0,0,.87);box-sizing: border-box;}
|
35 |
.logoWrapper { width: 100%; padding: 30px; text-align: center; float: none; border-bottom: 1px solid #eee; box-sizing: border-box; }
|
36 |
.messageWrapper { width: 100%; padding: 30px 30px 10px; box-sizing: border-box; }
|
43 |
.igModalBody {background-color: white;width: 100%;}
|
44 |
.countryDropDownWrapper {width: 100%;min-height: 25px;-webkit-border-radius: 2px;border-radius: 2px;background: #eee;border: 0px; /* Set the color of your choice here */margin: 0 auto;padding: 0px;cursor: pointer;position: relative;}
|
45 |
.countryDropDownWrapper i { position: absolute; right: 10px; top: 10px; color: rgba(0,0,0,.3); }
|
46 |
+
#countrySelect { width:100%; position: relative; box-shadow: 0px 0px 0px; padding: 10px 15px; padding-left: 60px; margin: 0px;font-size: 14px;line-height: 14px;color: #333 !important;cursor: pointer;-webkit-user-select: none;-moz-user-select: none;-ms-user-select: none;-o-user-select: none;user-select: none;background: none !important;border: 0 !important;-webkit-appearance: none;-moz-appearance: window;appearance: none;ms-appearance: none;overflow: hidden;height: 44px;text-align: left;}
|
47 |
select::-ms-expand { display: none; }
|
48 |
ul.featureList { padding: 30px; margin: 20px 0px 30px; background-color: #eee; display: none !important; }
|
49 |
ul.featureList li { list-style-type: none; padding: 5px 0px; }
|
51 |
.igWelcomeCTAButton { width: 100%;padding: 0px 30px 30px; box-sizing: border-box;}
|
52 |
.igWelcomeCTAButton button {width: 100%;height: 44px;-webkit-border-radius: 2px;border-radius: 2px;color: white;margin: 0 auto;border: none;font-size: 14px;font-weight: normal; background-color: #333;opacity: 1;text-shadow: none;float: none;text-transform: uppercase;text-align: center;}
|
53 |
.igWelcomeCTAButton button:hover { color: white; background-color: #666; opacity: 1; }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
54 |
|
55 |
@media screen and (max-width: 600px) { /* Responsive design sets a width of 400px for all devices <= 600px */
|
56 |
#igSplashElement { width: 95%; top: 10px; }
|
js/iGlobal/ig_welcome_mat_default.js
CHANGED
@@ -87,7 +87,7 @@ function ig_createSplashHtml() {
|
|
87 |
|
88 |
function ig_createSplashContentsHtml() { // Feel free to edit the HTML below to match your site
|
89 |
var ig_splashHtml = '' +
|
90 |
-
'<div class="
|
91 |
'<i class="material-icons"></i>' +
|
92 |
'</div>' +
|
93 |
'<div class="igModalHeader">' +
|
@@ -135,7 +135,7 @@ function ig_createSplashContentsHtml() { // Feel free to edit the HTML below to
|
|
135 |
|
136 |
ig_splashHtml += '' +
|
137 |
'<div class="igWelcomeCTAButton">' +
|
138 |
-
'<button class="
|
139 |
'</div><!--/.igWelcomeCTAButton -->' +
|
140 |
'</div><!--/.igModalBody -->' +
|
141 |
'<div class="igModalFooter">' +
|
@@ -158,6 +158,7 @@ function ig_showTheSplash() {
|
|
158 |
|
159 |
//init easyModal.js modal, after modal content was placed on the page (line above)
|
160 |
igJq("#igSplashElement").easyModal({
|
|
|
161 |
onClose: function(myModal){
|
162 |
//on close, let's remove the modal contents and the modal smokescreen created by easyModal.js
|
163 |
igJq("#igSplashElement").remove();
|
87 |
|
88 |
function ig_createSplashContentsHtml() { // Feel free to edit the HTML below to match your site
|
89 |
var ig_splashHtml = '' +
|
90 |
+
'<div class="igClose">' +
|
91 |
'<i class="material-icons"></i>' +
|
92 |
'</div>' +
|
93 |
'<div class="igModalHeader">' +
|
135 |
|
136 |
ig_splashHtml += '' +
|
137 |
'<div class="igWelcomeCTAButton">' +
|
138 |
+
'<button class="igClose">Start Shopping</button>' +
|
139 |
'</div><!--/.igWelcomeCTAButton -->' +
|
140 |
'</div><!--/.igModalBody -->' +
|
141 |
'<div class="igModalFooter">' +
|
158 |
|
159 |
//init easyModal.js modal, after modal content was placed on the page (line above)
|
160 |
igJq("#igSplashElement").easyModal({
|
161 |
+
closeButtonClass: '.igClose',
|
162 |
onClose: function(myModal){
|
163 |
//on close, let's remove the modal contents and the modal smokescreen created by easyModal.js
|
164 |
igJq("#igSplashElement").remove();
|
package.xml
CHANGED
@@ -1,46 +1,43 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Iglobal_Main</name>
|
4 |
-
<version>1.5.
|
5 |
<stability>stable</stability>
|
6 |
<license>OSL</license>
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
-
<summary>Leverage iGlobal Stores
|
10 |
<description>International eCommerce Done Right
|
11 |
-
Thanks for checking out the iGlobal Stores extension for Magento Community Edition! This extension gives you access to the many features of iGlobal Stores services. For more information on this extension and iGlobal
|
12 |
-
|
13 |
-
|
14 |
-
|
15 |
-
|
16 |
-
|
17 |
-
|
18 |
-
|
19 |
-

|
20 |
-
Your Shipping Carriers - Work with the shipping carriers of your choice, at your rates.
|
21 |
-

|
22 |
-
Direct Shipping to the World- Ship directly from your warehouse to anywhere in the world with iGlobal Stores' easy print and ship technology. We'll take care of the paperwork
|
23 |
-

|
24 |
-
Their Currency - Show customers their order totals in their local currency, making the buying decision that much easier
|
25 |
-

|
26 |
-
Your Payment Processor or Ours - Use your own payment processor or leverage the integrated payment system to settle in foreign currencies - it's up to you.
|
27 |
-

|
28 |
-
Before You Install
|
29 |
-
The iGlobal Stores extension will have limited use for stores that are not set up with an iGlobal Stores account. In order to accept orders internationally through iGlobal Stores, please contact us at 1-800-942-0721, at www.iglobalstores.com or at info@iglobalstores.com.</description>
|
30 |
-
<notes>New Features:
|
31 |

|
32 |
-
|
33 |

|
34 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
35 |

|
36 |
-
|
37 |

|
38 |
-
|
39 |
</notes>
|
40 |
-
<authors><author><name>Brian Olsen</name><user>brianolsen</user><email>
|
41 |
-
<date>2017-
|
42 |
-
<time>
|
43 |
-
<contents><target name="mageetc"><dir name="modules"><file name="Iglobal_Stores.xml" hash="56839ad045b6a99f97564de63ebed700"/><file name="Iglobal_Ship.xml" hash="6d40f1c84e29bb7d8b70eadd77a03917"/></dir></target><target name="magecommunity"><dir name="Iglobal"><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="d1814260e342346b74d7ff3543499d4f"/></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="5d288c6bc298db3bdc86adcdd036bdd6"/><file name="Cart.php" hash="a162e67a8c445b911dd25897e4d886a3"/><file name="Includes.php" hash="8214ef5eae6a83e2909f8ebeee6ea1f7"/><file name="Link.php" hash="69b0efcc8d2ffd6ca9daed407260d793"/></dir><dir name="Helper"><file name="Configoptions.php" hash="b129e55b21f845a20d6e7fdb3b532be3"/><file name="Data.php" hash="
|
44 |
<compatible/>
|
45 |
<dependencies><required><php><min>5.2.0</min><max>7.0.7</max></php></required></dependencies>
|
46 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Iglobal_Main</name>
|
4 |
+
<version>1.5.2</version>
|
5 |
<stability>stable</stability>
|
6 |
<license>OSL</license>
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
+
<summary>Leverage iGlobal Stores’ technology for international eCommerce</summary>
|
10 |
<description>International eCommerce Done Right
|
11 |
+
Thanks for checking out the iGlobal Stores extension for Magento Community Edition! This extension gives you access to the many features of iGlobal Stores services. For more information on this extension and iGlobal’s services, please visit http://www.iglobalstores.com/magento
|
12 |
+

|
13 |
+

|
14 |
+
Improved Global Conversion Rates - Direct international visitors to the iGlobal checkout to keep your conversion rates at their highest
|
15 |
+

|
16 |
+
Worldwide Geolocation- Automatically detect international visitors (by IP address) and show them a welcome mat, letting them know about all the ways you make ordering easy for them
|
17 |
+

|
18 |
+
Duty, Tax, VAT? Done. - Calculate customs, duties, taxes and VAT and let your customers prepay them right in the checkout!
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
19 |

|
20 |
+
Your Shipping Carriers - Work with the shipping carriers of your choice, at your rates.
|
21 |

|
22 |
+
Direct Shipping to the World- Ship directly from your warehouse to anywhere in the world with iGlobal Stores’ easy print and ship technology. We’ll take care of the paperwork
|
23 |
+

|
24 |
+
Their Currency - Show customers their order totals in their local currency, making the buying decision that much easier
|
25 |
+

|
26 |
+
Your Payment Processor or Ours - Use your own payment processor or leverage the integrated payment system to settle in foreign currencies - it’s up to you.
|
27 |
+

|
28 |
+
Before You Install
|
29 |
+
The iGlobal Stores extension will have limited use for stores that are not set up with an iGlobal Stores account. In order to accept orders internationally through iGlobal Stores, please contact us at 1-800-942-0721, at www.iglobalstores.com or at info@iglobalstores.com.
|
30 |
+
</description>
|
31 |
+
<notes>New Features:
|
32 |

|
33 |
+
Welcome Mat styling is more compatible with other browsers.
|
34 |

|
35 |
+
Removes any white space that may have been added in store id and api key.
|
36 |
</notes>
|
37 |
+
<authors><author><name>Brian Olsen</name><user>brianolsen</user><email>brain@iglobalstores.com</email></author></authors>
|
38 |
+
<date>2017-07-24</date>
|
39 |
+
<time>20:38:46</time>
|
40 |
+
<contents><target name="mageetc"><dir name="modules"><file name="Iglobal_Stores.xml" hash="56839ad045b6a99f97564de63ebed700"/><file name="Iglobal_Ship.xml" hash="6d40f1c84e29bb7d8b70eadd77a03917"/></dir></target><target name="magecommunity"><dir name="Iglobal"><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="d1814260e342346b74d7ff3543499d4f"/></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="5d288c6bc298db3bdc86adcdd036bdd6"/><file name="Cart.php" hash="a162e67a8c445b911dd25897e4d886a3"/><file name="Includes.php" hash="8214ef5eae6a83e2909f8ebeee6ea1f7"/><file name="Link.php" hash="69b0efcc8d2ffd6ca9daed407260d793"/></dir><dir name="Helper"><file name="Configoptions.php" hash="b129e55b21f845a20d6e7fdb3b532be3"/><file name="Data.php" hash="95b0a619bff6bfd288a748aca65cdba9"/><file name="Url.php" hash="e430471ab463e1fc7812c4a96d5f3208"/></dir><dir name="Model"><file name="Configoptions.php" hash="2cbd3eb8357f80c2de5a48f32709b1c5"/><dir name="International"><file name="International.php" hash="afe4d55d944b7883fb9a14ded44d767a"/></dir><file name="Observer.php" hash="8bca52293f76cab0c92e8e30ada75662"/><file name="Order.php" hash="f880f8edd039bcfa878804b9c03a02ba"/><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="f725924af461644af75a455210097a53"/></dir><file name="Rest.php" hash="43cebd79bc4ae865b67e4a7efb384058"/><dir name="Service"><file name="Quote.php" hash="bae0e5a710b9e3aa1427bb78a08fbfd8"/></dir><file name="Tax.php" hash="9645d04415913bea333b5aba99b1909c"/></dir><dir name="controllers"><file name="AjaxController.php" hash="62228ca95872788a18256bbf20839a07"/><file name="CheckoutController.php" hash="dc79a1b3d6734051ea0081f272432911"/><file name="SuccessController.php" hash="ed6df1368ce185de7bf6c557e55d2339"/></dir><dir name="etc"><file name="adminhtml.xml" hash="7f10c9724b1294a506df47cf569bc9e6"/><file name="config.xml" hash="2da68ac84a35fd01af4b493659269845"/><file name="system.xml" hash="c916869addc050f6b2e4d7b01cc7a6b2"/><file name=".config.xml.swp" hash="95b91a35220b969d02d96bc60bada9e2"/></dir><dir name="sql"><dir name="iglobal_stores_setup"><file name="mysql4-install-0.1.0.php" hash="72c543090fe27608e582d22494b65d75"/><file name="mysql4-upgrade-0.1.0-0.1.1.php" hash="51e83dd266d7b232d42f03cac66350df"/><file name="mysql4-upgrade-0.1.1-0.1.2.php" hash="4dc024ad63d7a7ea20697ddef4b60a29"/><file name="mysql4-upgrade-0.1.2-0.1.3.php" hash="51e83dd266d7b232d42f03cac66350df"/><file name="mysql4-upgrade-0.1.3-1.0.0.php" hash="829b7c08d5bce22b5c1750a3d72e21ca"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><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></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="iglobal.xml" hash="d49680762997b0480aaaeae331dc4695"/></dir><dir name="template"><dir name="iglobal"><dir name="checkout"><dir name="cart"><dir name="item"><dir name="configure"><file name="updatecart.phtml" hash="9eaac8c650b6986db7c0a5005966c4ee"/></dir></dir></dir><dir name="onepage"><file name="link.phtml" hash="12a68b6580f9441bc0400b72c66b8358"/></dir></dir><dir name="stores"><file name="cart.phtml" hash="6afb67cae6995499ad5d13bbf56b1b0a"/><file name="igcincludes.phtml" hash="43752aafba25bc795f9f708c0d470181"/></dir></dir></dir></dir></dir></dir></target><target name="mage"><dir name="js"><dir name="iGlobal"><file name="ig_welcome_mat_default.css" hash="0cc7e4da2d6adae94e53326e5bae369a"/><file name="ig_welcome_mat_default.js" hash="27e179a7509505c6feee121b46298b88"/><file name="igc.cs.magento_default_ice.js" hash="eb2507a442883dda09975301455877a7"/><dir name="jquery"><file name="jquery.js" hash="6903c661e9db496b11e737478528318f"/><file name="jquery.noconflict.js" hash="09bfdd3b964eb2b17b5d6caa1d20a607"/></dir></dir></dir></target></contents>
|
41 |
<compatible/>
|
42 |
<dependencies><required><php><min>5.2.0</min><max>7.0.7</max></php></required></dependencies>
|
43 |
</package>
|