Version Notes
Kleinere Fehlerbehebungen
Download this release
Release Info
Developer | smilla AG |
Extension | Smilla_Sobuintegration |
Version | 1.0.5 |
Comparing to | |
See all releases |
Code changes from version 1.0.4 to 1.0.5
- app/code/local/Smilla/Sobuintegration/Helper/Data.php +9 -6
- app/code/local/Smilla/Sobuintegration/controllers/ShareController.php +5 -1
- app/code/local/Smilla/Sobuintegration/etc/system.xml +10 -0
- app/locale/de_CH/Smilla_Sobuintegration.csv +2 -0
- app/locale/de_DE/Smilla_Sobuintegration.csv +2 -0
- package.xml +4 -4
app/code/local/Smilla/Sobuintegration/Helper/Data.php
CHANGED
@@ -33,14 +33,17 @@ class Smilla_Sobuintegration_Helper_Data extends Mage_Core_Helper_Abstract
|
|
33 |
// Get all Labels from Store views
|
34 |
foreach($storeViews as $storeId => $store) {
|
35 |
$locale = substr(Mage::getStoreConfig('general/locale/code', $storeId), 0, 2);
|
36 |
-
Mage::app()->setCurrentStore($storeId);
|
37 |
|
38 |
-
|
39 |
-
$
|
40 |
-
|
41 |
-
"message" => sprintf(Mage::helper('sobuintegration')->__('Ich habe gerade das Produkt "%s" gekauft.'), $product->getName()),
|
42 |
-
);
|
43 |
|
|
|
|
|
|
|
|
|
|
|
|
|
44 |
}
|
45 |
|
46 |
$result['items'][] = $itemarray;
|
33 |
// Get all Labels from Store views
|
34 |
foreach($storeViews as $storeId => $store) {
|
35 |
$locale = substr(Mage::getStoreConfig('general/locale/code', $storeId), 0, 2);
|
|
|
36 |
|
37 |
+
// Only supported localizations
|
38 |
+
if(in_array($locale, array('de', 'en', 'fr', 'it'))){
|
39 |
+
Mage::app()->setCurrentStore($storeId);
|
|
|
|
|
40 |
|
41 |
+
$product = Mage::getModel('catalog/product')->load($item->getProductId());
|
42 |
+
$itemarray["product"]["languageVersions"][$locale] = array(
|
43 |
+
"name" => $product->getName(),
|
44 |
+
"message" => sprintf(Mage::helper('sobuintegration')->__('Ich habe gerade das Produkt "%s" gekauft.'), $product->getName()),
|
45 |
+
);
|
46 |
+
}
|
47 |
}
|
48 |
|
49 |
$result['items'][] = $itemarray;
|
app/code/local/Smilla/Sobuintegration/controllers/ShareController.php
CHANGED
@@ -24,7 +24,11 @@ class Smilla_Sobuintegration_ShareController extends Mage_Core_Controller_Front_
|
|
24 |
// Save ClickId to Session
|
25 |
Mage::getSingleton('core/session')->setSobuClickId($this->getRequest()->getParam('sobuClickId'));
|
26 |
|
27 |
-
|
|
|
|
|
|
|
|
|
28 |
} else {
|
29 |
// Show Info Page
|
30 |
$this->loadLayout();
|
24 |
// Save ClickId to Session
|
25 |
Mage::getSingleton('core/session')->setSobuClickId($this->getRequest()->getParam('sobuClickId'));
|
26 |
|
27 |
+
if(strlen(Mage::getStoreConfig('sobuintegration/settings/promotion_redirect')) > 0){
|
28 |
+
$this->_redirect(Mage::getStoreConfig('sobuintegration/settings/promotion_redirect'));
|
29 |
+
} else {
|
30 |
+
$this->_redirect('sobu/share/link');
|
31 |
+
}
|
32 |
} else {
|
33 |
// Show Info Page
|
34 |
$this->loadLayout();
|
app/code/local/Smilla/Sobuintegration/etc/system.xml
CHANGED
@@ -146,6 +146,15 @@
|
|
146 |
<show_in_website>1</show_in_website>
|
147 |
<show_in_store>1</show_in_store>
|
148 |
</provision>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
149 |
<privatekey translate="label">
|
150 |
<label></label>
|
151 |
<frontend_type>hidden</frontend_type>
|
@@ -154,6 +163,7 @@
|
|
154 |
<show_in_website>1</show_in_website>
|
155 |
<show_in_store>1</show_in_store>
|
156 |
</privatekey>
|
|
|
157 |
</fields>
|
158 |
</settings>
|
159 |
</groups>
|
146 |
<show_in_website>1</show_in_website>
|
147 |
<show_in_store>1</show_in_store>
|
148 |
</provision>
|
149 |
+
<promotion_redirect translate="label">
|
150 |
+
<label>Promotion Redirect Target (optional)</label>
|
151 |
+
<comment>Redirect incoming Sobu Links to this Page. Example: product-123.html</comment>
|
152 |
+
<frontend_type>text</frontend_type>
|
153 |
+
<sort_order>120</sort_order>
|
154 |
+
<show_in_default>1</show_in_default>
|
155 |
+
<show_in_website>1</show_in_website>
|
156 |
+
<show_in_store>1</show_in_store>
|
157 |
+
</promotion_redirect>
|
158 |
<privatekey translate="label">
|
159 |
<label></label>
|
160 |
<frontend_type>hidden</frontend_type>
|
163 |
<show_in_website>1</show_in_website>
|
164 |
<show_in_store>1</show_in_store>
|
165 |
</privatekey>
|
166 |
+
|
167 |
</fields>
|
168 |
</settings>
|
169 |
</groups>
|
app/locale/de_CH/Smilla_Sobuintegration.csv
CHANGED
@@ -8,6 +8,8 @@
|
|
8 |
"Run in Testmode?","Soll die Anbindung im Testmodus laufen?"
|
9 |
"Generate Key","Key generieren"
|
10 |
"Generate RSA Key","RSA Key generieren"
|
|
|
|
|
11 |
"sobu Benefit Code","sobu Gutschrift Code"
|
12 |
"sobu Benefit","sobu Gutschrift"
|
13 |
"sobu Benefit was successfully applied","sobu Gutschrift erfolgreich angewendet"
|
8 |
"Run in Testmode?","Soll die Anbindung im Testmodus laufen?"
|
9 |
"Generate Key","Key generieren"
|
10 |
"Generate RSA Key","RSA Key generieren"
|
11 |
+
"Promotion Redirect Target (optional)","Promotion Weiterleitungsziel (optional)"
|
12 |
+
"Redirect incoming Sobu Links to this Page. Example: product-123.html","Eingehende Sobu Links auf diese Seite Weiterleiten. Bsp.: produkt-123.html"
|
13 |
"sobu Benefit Code","sobu Gutschrift Code"
|
14 |
"sobu Benefit","sobu Gutschrift"
|
15 |
"sobu Benefit was successfully applied","sobu Gutschrift erfolgreich angewendet"
|
app/locale/de_DE/Smilla_Sobuintegration.csv
CHANGED
@@ -8,6 +8,8 @@
|
|
8 |
"Run in Testmode?","Soll die Anbindung im Testmodus laufen?"
|
9 |
"Generate Key","Key generieren"
|
10 |
"Generate RSA Key","RSA Key generieren"
|
|
|
|
|
11 |
"sobu Benefit Code","sobu Gutschrift Code"
|
12 |
"sobu Benefit","sobu Gutschrift"
|
13 |
"sobu Benefit was successfully applied","sobu Gutschrift erfolgreich angewendet"
|
8 |
"Run in Testmode?","Soll die Anbindung im Testmodus laufen?"
|
9 |
"Generate Key","Key generieren"
|
10 |
"Generate RSA Key","RSA Key generieren"
|
11 |
+
"Promotion Redirect Target (optional)","Promotion Weiterleitungsziel (optional)"
|
12 |
+
"Redirect incoming Sobu Links to this Page. Example: product-123.html","Eingehende Sobu Links auf diese Seite Weiterleiten. Bsp.: produkt-123.html"
|
13 |
"sobu Benefit Code","sobu Gutschrift Code"
|
14 |
"sobu Benefit","sobu Gutschrift"
|
15 |
"sobu Benefit was successfully applied","sobu Gutschrift erfolgreich angewendet"
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Smilla_Sobuintegration</name>
|
4 |
-
<version>1.0.
|
5 |
<stability>stable</stability>
|
6 |
<license>GNU General Public License (GPL)</license>
|
7 |
<channel>community</channel>
|
@@ -11,9 +11,9 @@
|
|
11 |
Vorraussetzung ist eine Magento Installation sowie ein gültiger Vertrag mit der sobu-Plattform. Weitere Informationen dazu finden Sie unter: https://www.sobu.ch/de/partner</description>
|
12 |
<notes>Kleinere Fehlerbehebungen</notes>
|
13 |
<authors><author><name>smilla AG</name><user>smilla</user><email>hendrik.unkenholz@smilla.com</email></author></authors>
|
14 |
-
<date>2014-
|
15 |
-
<time>
|
16 |
-
<contents><target name="magelocal"><dir name="Smilla"><dir name="PostChShippingLabel"><dir name="Block"><dir name="Sales"><dir name="Order"><file name="Grid.php" hash="b28a6d60ecebf1df36a323717630f852"/></dir></dir><dir name="View"><file name="Postchshippinglabel.php" hash="2ba040c5f973d8f5287dbe64e29e3950"/></dir></dir><dir name="Helper"><file name="Data.php" hash="e821c705ee985f2fd6606b724dd999e0"/></dir><dir name="Model"><dir name="Source"><file name="Codeoptions.php" hash="4f73854bde626b90fcfcb568f2931857"/><file name="Formatoptions.php" hash="0dbe915bd42b21f17abbcbfb758dc741"/></dir></dir><dir name="controllers"><file name="PostchshippinglabelController.php" hash="9b83ae915a3cf3b7e5cea5cdde88f085"/></dir><dir name="etc"><file name="config.xml" hash="e8d9455d7111a3bea63ee942f48170b4"/><file name="system.xml" hash="b7f321041ca485bfeea6059da3690b19"/></dir></dir><dir name="RicardoIntegration"><dir name="Block"><dir name="Adminhtml"><dir name="Log"><file name="Grid.php" hash="858a47ef63ab3c30717183ae30df5b54"/></dir><file name="Log.php" hash="a31fd35c41c13932cd096dfd53a0cfb4"/><dir name="Options"><file name="Abstract.php" hash="e7636146ce09f7172a70998ac68a94dc"/></dir><file name="Options.php" hash="b59dd5a984c9c12a296543a0a377c049"/><file name="Productxml.php" hash="0ff6f735f75854bfe91a0d283ebcc72a"/><file name="RicardoIntegrationbackend.php" hash="a4c9dfc16a12688cda604d549c8da6a0"/></dir></dir><dir name="Helper"><file name="Data.php" hash="87e7e45c2581c3d320c2c1c4ad126792"/><file name="Sftp.php" hash="23e40ca497940cc762f5230a4edd1774"/><file name="Xml.php" hash="f00956a0d4fe6cba592b808a34c01f89"/></dir><dir name="Model"><file name="Cron.php" hash="4d733059b3f248c0faca7aff625b00cf"/><dir name="Entity"><file name="Attribute.php" hash="6e449b11ce6a18bdffbc2f982109d899"/></dir><file name="Log.php" hash="98f40c774baf75020b4edac574160550"/><dir name="Mysql4"><dir name="Log"><file name="Collection.php" hash="b00f4b299ecd1ff488f227fb93df0e12"/></dir><file name="Log.php" hash="841dcf2f9d488b89b37cd498a5e997da"/></dir><file name="Observer.php" hash="c7fc47483ea0f2c89923ea243d401f37"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="LogController.php" hash="7541aeaafd51789e09df8b07528484da"/><file name="RicardointegrationbackendController.php" hash="186dd23afa037d86c931d0b693e9fbb7"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="51cc2c3c5693e3efaefade943d0112ec"/><file name="config.xml" hash="197dc60c3ec9b5ac51774ba499f5b9e0"/><file name="system.xml" hash="a3860eedd89aab0c1edb3662089f37c1"/></dir><dir name="sql"><dir name="attributericardo_setup"><file name="mysql4-install-0.1.0.php" hash="81130e87f55c2e8fe40bc092fad189c7"/></dir><dir name="categoryattributericardo_setup"><file name="mysql4-install-0.1.0.php" hash="877d494dd26214a5dc0f744f0f587e23"/></dir><dir name="logtablericardo_setup"><file name="mysql4-install-0.1.0.php" hash="dc4907e1dda0613903855dd22b093600"/></dir><dir name="productattributericardo_setup"><file name="mysql4-install-0.1.0.php" hash="d06a6879352e9e3d95218d02d0f8a36a"/></dir><dir name="salesattributericardo_setup"><file name="mysql4-install-0.1.0.php" hash="b33c68a4d1873638861da53556251f84"/></dir></dir><dir name="xsd"><file name="orderImport.xsd" hash="8464a2d14f9f1e24524207ffac416bb2"/><file name="productImport.xsd" hash="d7fed24985319a7172ea1e77c78c075a"/></dir></dir><dir name="Sobuintegration"><dir name="Block"><file name="Generatebutton.php" hash="74084f97064fa5806d715ead2ffef14d"/><file name="Share.php" hash="266f41ed10e3e7aca0281ca130e534c1"/></dir><dir name="Helper"><file name="Data.php" hash="
|
17 |
<compatible/>
|
18 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
19 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Smilla_Sobuintegration</name>
|
4 |
+
<version>1.0.5</version>
|
5 |
<stability>stable</stability>
|
6 |
<license>GNU General Public License (GPL)</license>
|
7 |
<channel>community</channel>
|
11 |
Vorraussetzung ist eine Magento Installation sowie ein gültiger Vertrag mit der sobu-Plattform. Weitere Informationen dazu finden Sie unter: https://www.sobu.ch/de/partner</description>
|
12 |
<notes>Kleinere Fehlerbehebungen</notes>
|
13 |
<authors><author><name>smilla AG</name><user>smilla</user><email>hendrik.unkenholz@smilla.com</email></author></authors>
|
14 |
+
<date>2014-06-24</date>
|
15 |
+
<time>14:51:37</time>
|
16 |
+
<contents><target name="magelocal"><dir name="Smilla"><dir name="PostChShippingLabel"><dir name="Block"><dir name="Sales"><dir name="Order"><file name="Grid.php" hash="b28a6d60ecebf1df36a323717630f852"/></dir></dir><dir name="View"><file name="Postchshippinglabel.php" hash="2ba040c5f973d8f5287dbe64e29e3950"/></dir></dir><dir name="Helper"><file name="Data.php" hash="e821c705ee985f2fd6606b724dd999e0"/></dir><dir name="Model"><dir name="Source"><file name="Codeoptions.php" hash="4f73854bde626b90fcfcb568f2931857"/><file name="Formatoptions.php" hash="0dbe915bd42b21f17abbcbfb758dc741"/></dir></dir><dir name="controllers"><file name="PostchshippinglabelController.php" hash="9b83ae915a3cf3b7e5cea5cdde88f085"/></dir><dir name="etc"><file name="config.xml" hash="e8d9455d7111a3bea63ee942f48170b4"/><file name="system.xml" hash="b7f321041ca485bfeea6059da3690b19"/></dir></dir><dir name="RicardoIntegration"><dir name="Block"><dir name="Adminhtml"><dir name="Log"><file name="Grid.php" hash="858a47ef63ab3c30717183ae30df5b54"/></dir><file name="Log.php" hash="a31fd35c41c13932cd096dfd53a0cfb4"/><dir name="Options"><file name="Abstract.php" hash="e7636146ce09f7172a70998ac68a94dc"/></dir><file name="Options.php" hash="b59dd5a984c9c12a296543a0a377c049"/><file name="Productxml.php" hash="0ff6f735f75854bfe91a0d283ebcc72a"/><file name="RicardoIntegrationbackend.php" hash="a4c9dfc16a12688cda604d549c8da6a0"/></dir></dir><dir name="Helper"><file name="Data.php" hash="87e7e45c2581c3d320c2c1c4ad126792"/><file name="Sftp.php" hash="23e40ca497940cc762f5230a4edd1774"/><file name="Xml.php" hash="f00956a0d4fe6cba592b808a34c01f89"/></dir><dir name="Model"><file name="Cron.php" hash="4d733059b3f248c0faca7aff625b00cf"/><dir name="Entity"><file name="Attribute.php" hash="6e449b11ce6a18bdffbc2f982109d899"/></dir><file name="Log.php" hash="98f40c774baf75020b4edac574160550"/><dir name="Mysql4"><dir name="Log"><file name="Collection.php" hash="b00f4b299ecd1ff488f227fb93df0e12"/></dir><file name="Log.php" hash="841dcf2f9d488b89b37cd498a5e997da"/></dir><file name="Observer.php" hash="c7fc47483ea0f2c89923ea243d401f37"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="LogController.php" hash="7541aeaafd51789e09df8b07528484da"/><file name="RicardointegrationbackendController.php" hash="186dd23afa037d86c931d0b693e9fbb7"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="51cc2c3c5693e3efaefade943d0112ec"/><file name="config.xml" hash="197dc60c3ec9b5ac51774ba499f5b9e0"/><file name="system.xml" hash="a3860eedd89aab0c1edb3662089f37c1"/></dir><dir name="sql"><dir name="attributericardo_setup"><file name="mysql4-install-0.1.0.php" hash="81130e87f55c2e8fe40bc092fad189c7"/></dir><dir name="categoryattributericardo_setup"><file name="mysql4-install-0.1.0.php" hash="877d494dd26214a5dc0f744f0f587e23"/></dir><dir name="logtablericardo_setup"><file name="mysql4-install-0.1.0.php" hash="dc4907e1dda0613903855dd22b093600"/></dir><dir name="productattributericardo_setup"><file name="mysql4-install-0.1.0.php" hash="d06a6879352e9e3d95218d02d0f8a36a"/></dir><dir name="salesattributericardo_setup"><file name="mysql4-install-0.1.0.php" hash="b33c68a4d1873638861da53556251f84"/></dir></dir><dir name="xsd"><file name="orderImport.xsd" hash="8464a2d14f9f1e24524207ffac416bb2"/><file name="productImport.xsd" hash="d7fed24985319a7172ea1e77c78c075a"/></dir></dir><dir name="Sobuintegration"><dir name="Block"><file name="Generatebutton.php" hash="74084f97064fa5806d715ead2ffef14d"/><file name="Share.php" hash="266f41ed10e3e7aca0281ca130e534c1"/></dir><dir name="Helper"><file name="Data.php" hash="42ac5a75aa3b3862a09f0c15d4e1b51e"/></dir><dir name="Model"><dir name="Condition"><file name="Benefit.php" hash="c852f11bad38a4c257c55da1e04800c5"/></dir><file name="Observer.php" hash="caf15474f209dda6d05b051774d46556"/></dir><dir name="controllers"><file name="AdminController.php" hash="d3848d4ed2e3cbb5fa6ff0f78518c43e"/><file name="ShareController.php" hash="e8750a8e9e7689fd1424f23f6c80c98a"/></dir><dir name="etc"><file name="config.xml" hash="3c778cedc46f383fdd1cf5534d016b1c"/><file name="system.xml" hash="9ff2a8916a6d5a61c69dc543858fb0ae"/></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="sobu"><dir name="checkout"><file name="share.phtml" hash="98885793a3bb35964fd64297f8c0f89f"/></dir><dir name="order"><file name="share.phtml" hash="1465ed5efb372a26e9d85b70c8aa5472"/></dir><dir name="sales"><dir name="order"><file name="share.phtml" hash="1b1556f175008a1114fa933cad2500d6"/><file name="totals.phtml" hash="60a502bfd89474dfa57bc799a4f4e504"/></dir></dir><dir name="share"><file name="info.phtml" hash="fdcd922d8f651b11714251ddef64abf9"/><file name="link.phtml" hash="f9f8f4708750fd2852f0d0ec42ceff83"/></dir></dir></dir><dir name="layout"><file name="sobuintegration.xml" hash="139553188e2acb3fe61d9b4d4079e679"/></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="images"><dir name="sobu"><file name="banner_share.png" hash="f5a41a1af0a68d368ab048d138c28e5c"/><file name="banner_share_01.png" hash="045706753e361031b5a93ac38ebe1cfb"/><file name="banner_share_02.png" hash="75857a645c0a81d51975c10df8afd999"/><file name="banner_share_04.png" hash="9246b8dfbaefe3c89ead9d0ab3110fb2"/><file name="banner_share_04_de_CH.png" hash="9246b8dfbaefe3c89ead9d0ab3110fb2"/><file name="banner_share_04_en_US.png" hash="20f56f02dfc8310c9bb5d2fc7a31fab1"/><file name="banner_share_04_fr_FR.png" hash="752b197fad998b2b67cdaadc51cfa1b7"/><file name="banner_share_04_it_CH.png" hash="ff866ad36a170366544fb0fc202ecfe9"/><file name="banner_share_05.png" hash="a6ae54c9e1c7fd1d5f940cf77d8640a3"/><file name="infobanner_de_CH.png" hash="61a07e90f4c73b357efb2bfa478d3e83"/><file name="infobanner_en_US.png" hash="a2b7d488f8a860ddcfaf153b864f5cd2"/><file name="infobanner_fr_FR.png" hash="8b34ce6774dbb17c80b9dfdf32b3897c"/><file name="infobanner_it_CH.png" hash="a6ef1614f657b9cbe56be4e3f8ac4493"/><file name="sobu_image_de_CH.png" hash="be62ec89cb228685809b21b313e2f6e4"/><file name="sobu_image_de_DE.png" hash="be62ec89cb228685809b21b313e2f6e4"/><file name="sobu_image_en_US.png" hash="bf60e9823c3604c5a71a28db6a49d506"/><file name="sobu_image_fr_FR.png" hash="9d5492a4575127c1fe607360baac2de7"/><file name="sobu_image_it_CH.png" hash="8c3a8d776857fdff4e8938280a96d692"/><file name="sobulogo_de_CH.png" hash="fa4206c0e37b7dc3273c281e90e824be"/><file name="sobulogo_de_DE.png" hash="fa4206c0e37b7dc3273c281e90e824be"/><file name="sobulogo_en_US.png" hash="c3ec67330d2fb72e7acc7e7d3ca24640"/><file name="sobulogo_fr_FR.png" hash="c4eb66c697896792e8821f267f23849b"/><file name="sobulogo_it_CH.png" hash="d036e1709bca5d87059224954dce1683"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir><dir name="de_CH"><file name="Smilla_Sobuintegration.csv" hash="94fe2a9dc2252dd52546bf6d629f4df7"/></dir><dir name="de_DE"><file name="Smilla_Sobuintegration.csv" hash="94fe2a9dc2252dd52546bf6d629f4df7"/></dir><dir name="en_US"><file name="Smilla_Sobuintegration.csv" hash="d15ddb9d6ab6266654aa5fb36dbc4a2f"/></dir><dir name="fr_FR"><file name="Smilla_Sobuintegration.csv" hash="c018ec8d75f620e140336322fbd5d321"/></dir><dir name="it_CH"><file name="Smilla_Sobuintegration.csv" hash="5b736f3a4463054576d6ecc40d2c278d"/></dir><dir name="it_IT"><file name="Smilla_Sobuintegration.csv" hash="5b736f3a4463054576d6ecc40d2c278d"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Smilla_Sobuintegration.xml" hash="fee68335def2e0a2e3974f457ce34b90"/></dir></target></contents>
|
17 |
<compatible/>
|
18 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
19 |
</package>
|