Merge pull request #2 from trustpilot/Extract-brand-from-product

Extract brand from product
trustpilot · Dec 18, 2017 · dab8990 · dab8990
2 parents 42c517f + 29d0a7b
commit dab8990
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 21 deletions.
diff --git a/Block/Head.php b/Block/Head.php
@@ -1,9 +1,9 @@
 <?php
-namespace Trustpilot\Invitation\Block;
+namespace Trustpilot\Reviews\Block;
 
 use Magento\Framework\View\Element\Template\Context;
 use Magento\Framework\View\Element\Template;
-use Trustpilot\Invitation\Helper\Data;
+use Trustpilot\Reviews\Helper\Data;
 
 class Head extends Template
 {
@@ -23,7 +23,7 @@ public function __construct(
 
     public function renderScript()
     {
-        $key = str_replace(' ', '', $this->_helper->getConfigValue('key'));
+        $key = trim($this->_helper->getConfigValue('key'));
         return '
         <script type="text/javascript">
             (function(w,d,s,r,n){w.TrustpilotObject=n;w[n]=w[n]||function(){(w[n].q=w[n].q||[]).push(arguments)};

diff --git a/Block/Success.php b/Block/Success.php
@@ -1,5 +1,5 @@
 <?php
-namespace Trustpilot\Invitation\Block;
+namespace Trustpilot\Reviews\Block;
 
 use Magento\Framework\View\Element\Template\Context;
 use Magento\Sales\Model\Order;
@@ -33,7 +33,7 @@ public function __construct(
         $this->_checkoutSession = $checkoutSession;
         $this->_product = $product;
         $this->_productMetadata = $productMetadata;
-        $this->_version = '1.0.8';
+        $this->_version = '1.0.14';
         parent::__construct($context, $data);
     }
 
@@ -57,12 +57,13 @@ private function getOrder()
 
         foreach ($items as $i) {
             $product = $this->_product->load($i->getProductId());
+            $brand = $product->getAttributeText('manufacturer');
             array_push(
                 $products,
                 array(
                     'productUrl' => $product->getProductUrl(),
                     'name' => $product->getName(),
-                    //'brand' => $brand
+                    'brand' => $brand ? $brand : '',
                     'sku' => $product->getSku(),
                     //'gtin' => $gtin,
                     //'mpn' => $mpn,

diff --git a/Helper/Data.php b/Helper/Data.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Trustpilot\Invitation\Helper;
+namespace Trustpilot\Reviews\Helper;
 
 use Magento\Framework\App\Helper\AbstractHelper;
 
 class Data extends AbstractHelper
 {
-    const XML_PATH_INVITATION_GENERAL = 'invitation/general/';
+    const XML_PATH_TRUSTPILOT_GENERAL = 'trustpilot/general/';
 
     public function getConfigValue($value)
     {
-        return $this->scopeConfig->getValue(self::XML_PATH_INVITATION_GENERAL . $value, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        return $this->scopeConfig->getValue(self::XML_PATH_TRUSTPILOT_GENERAL . $value, \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE);
     }
 }
diff --git a/composer.json b/composer.json
@@ -2,11 +2,14 @@
     "name": "trustpilot/module-reviews",
     "description": "Invite customers to review your e-shop.",
     "type": "magento2-module",
-    "version": "1.0.1",
+    "version": "1.0.2",
+    "license": [
+      "OSL-3.0"
+    ],
     "autoload": {
       "files": [ "registration.php" ],
       "psr-4": {
-        "Trustpilot\\Invitation\\": ""
+        "Trustpilot\\Reviews\\": ""
       }
     }
   }
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
@@ -4,14 +4,14 @@
         <tab id="trustpilot" translate="label" sortOrder="10">
             <label>Trustpilot</label>
         </tab>
-        <section id="invitation" translate="label" sortOrder="130" showInDefault="1" showInWebsite="1" showInStore="1">
+        <section id="trustpilot" translate="label" sortOrder="130" showInDefault="0" showInWebsite="1" showInStore="0">
             <class>separator-top</class>
             <label>General</label>
             <tab>trustpilot</tab>
-            <resource>Trustpilot_Reviews::invitation_configuration</resource>
-            <group id="general" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
+            <resource>Trustpilot_Reviews::configuration</resource>
+            <group id="general" translate="label" type="text" sortOrder="10" showInDefault="0" showInWebsite="1" showInStore="0">
                 <label>General Configuration</label>
-                <field id="key" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
+                <field id="key" translate="label" type="text" sortOrder="1" showInDefault="0" showInWebsite="1" showInStore="0">
                     <label>Key</label>
                     <comment>Key which is generated during integration setup in Trustpilot business site</comment>
                 </field>

diff --git a/etc/config.xml b/etc/config.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
     <default>
-        <invitation>
+        <trustpilot>
             <general>
                 <key></key>
             </general>
-        </invitation>
+        </trustpilot>
     </default>
 </config>
diff --git a/etc/module.xml b/etc/module.xml
diff --git a/registration.php b/registration.php
diff --git a/view/frontend/layout/checkout_onepage_success.xml b/view/frontend/layout/checkout_onepage_success.xml
@@ -2,7 +2,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="content">
-            <block class="Trustpilot\Invitation\Block\Success" name="trustpilot.order.success" template="Trustpilot_Reviews::order/success.phtml" after="-"/>
+            <block class="Trustpilot\Reviews\Block\Success" name="trustpilot.order.success" template="Trustpilot_Reviews::order/success.phtml" after="-"/>
         </referenceContainer>
     </body>
 </page>
diff --git a/view/frontend/layout/default.xml b/view/frontend/layout/default.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <referenceContainer name="header.container">
-        <block class="Trustpilot\Invitation\Block\Head" name="trustpilot.header.head" as="trustpilot.header.head" template="Trustpilot_Reviews::header/head.phtml"/>
+        <block class="Trustpilot\Reviews\Block\Head" name="trustpilot.header.head" as="trustpilot.header.head" template="Trustpilot_Reviews::header/head.phtml"/>
     </referenceContainer>
 </page>
diff --git a/view/frontend/templates/header/head.phtml b/view/frontend/templates/header/head.phtml
@@ -1,2 +1,2 @@
-<?php /* @var $block \Trustpilot\Invitation\Block\Head */?>
+<?php /* @var $block \Trustpilot\Reviews\Block\Head */?>
 <?php echo $block->renderScript(); ?>
diff --git a/view/frontend/templates/order/success.phtml b/view/frontend/templates/order/success.phtml
@@ -1,2 +1,2 @@
-<?php /* @var $block \Trustpilot\Invitation\Block\Success */?>
+<?php /* @var $block \Trustpilot\Reviews\Block\Success */?>
 <?php echo $block->renderScript(); ?>