V1.13

.travis.yml

@@ -45,7 +45,6 @@ env:
   global:
     - MAGENTO_DB_ALLOWSAME=1
     - SKIP_CLEANUP=1
-    - TEST_BASEDIR=.modman/oyst-magento/app/code/community/Oyst/Oyst/Test
   matrix:
     - MAGENTO_VERSION="magento-mirror-1.6.2.0"
     - MAGENTO_VERSION="magento-mirror-1.7.0.2"
@@ -67,7 +66,7 @@ install:
 
 script:
   - mkdir -p build/logs
-  - curl --retry 2 --retry-delay 5 -H "Authorization":"token $GITHUB_TOKEN" -f -sSL https://raw.githubusercontent.com/mehdichaouch/MageTestStand/master/setup.sh | bash
+  - curl --retry 2 --retry-delay 5 -H "Authorization":"token $GITHUB_TOKEN" -f -sSL https://raw.githubusercontent.com/AOEpeople/MageTestStand//master/setup.sh | bash
   ## PHP CodeSniffer disable error on exit
   - vendor/bin/phpcs --config-set ignore_warnings_on_exit 1
   ## PHP Copy/Paste Detector

README.md

@@ -1,7 +1,7 @@
 # Oyst 1-Click plugin for Magento
 
 [![Build Status](https://travis-ci.org/oystparis/oyst-1click-magento.svg?branch=master)](https://travis-ci.org/oystparis/oyst-1click-magento)
-[![Latest Stable Version](https://img.shields.io/badge/latest-1.12.0-green.svg)](https://github.com/oystparis/oyst-1click-magento/releases)
+[![Latest Stable Version](https://img.shields.io/badge/latest-1.13.0-green.svg)](https://github.com/oystparis/oyst-1click-magento/releases/latest)
 [![Magento = 1.7.x.x](https://img.shields.io/badge/magento-1.7-blue.svg)](#)
 [![Magento = 1.8.x.x](https://img.shields.io/badge/magento-1.8-blue.svg)](#)
 [![Magento = 1.9.x.x](https://img.shields.io/badge/magento-1.9-blue.svg)](#)

app/code/community/Oyst/OneClick/Block/Adminhtml/Field/LogActions.php

@@ -35,7 +35,7 @@ class Oyst_OneClick_Block_Adminhtml_Field_LogActions extends Mage_Adminhtml_Bloc
      */
     public function __construct(array $args = array())
     {
-        $this->_logFiles = array('system.log', 'exception.log', Oyst_OneClick_Helper_Data::MODULE_NAME . '.log');
+        $this->_logFiles = array('system.log', 'exception.log', Oyst_OneClick_Helper_Data::MODULE_NAME . '.log', 'error_oyst.log');
         parent::__construct($args);
     }
 

app/code/community/Oyst/OneClick/Block/Adminhtml/System/Config/Form/Fieldset/Carrier/Mapping.php

@@ -30,22 +30,26 @@ class Oyst_OneClick_Block_Adminhtml_System_Config_Form_Fieldset_Carrier_Mapping
      */
     public function render(Varien_Data_Form_Element_Abstract $element)
     {
-        $html = $this->_getHeaderHtml($element);
-        $val = $this->getAllCarrierCode();
-        if (isset($val) && !empty($val)) {
-            foreach ($val as $v) {
-                if (false !== strpos($v['value'], '_about')) {
-                    continue;
-                }
+        try {
+            $html = $this->_getHeaderHtml($element);
+            $val = $this->getAllCarrierCode();
+            if (isset($val) && !empty($val)) {
+                foreach ($val as $v) {
+                    if (false !== strpos($v['value'], '_about')) {
+                        continue;
+                    }
 
-                $html .= $this->getHeadingFieldHtml($element, $v);
-                $html .= $this->getMappingFieldHtml($element, $v);
-                $html .= $this->getDelayFieldHtml($element, $v);
-                $html .= $this->getNameFieldHtml($element, $v);
+                    $html .= $this->getHeadingFieldHtml($element, $v);
+                    $html .= $this->getMappingFieldHtml($element, $v);
+                    $html .= $this->getDelayFieldHtml($element, $v);
+                    $html .= $this->getNameFieldHtml($element, $v);
+                }
             }
-        }
 
-        $html .= $this->_getFooterHtml($element);
+            $html .= $this->_getFooterHtml($element);
+        } catch (Exception $e) {
+            $html = '';
+        }
 
         return $html;
     }
@@ -185,7 +189,7 @@ protected function getDelayFieldHtml($fieldset, $group)
                     'default' => 1,
                     'inherit' => $inherit,
                     'value' => $data,
-                    'class' => 'validate-number validate-oyst-shipment-delay',
+                    //'class' => 'validate-number validate-oyst-shipment-delay',
                     'comment' => Mage::helper('oyst_oneclick')->__('Value in hours'),
                     'can_use_default_value' => $this->getForm()->canUseDefaultValue($e),
                     'can_use_website_value' => $this->getForm()->canUseWebsiteValue($e),

app/code/community/Oyst/OneClick/Block/Checkout/Tracking.php

@@ -0,0 +1,83 @@
+<?php
+/**
+ * This file is part of Oyst_OneClick for Magento.
+ *
+ * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
+ * @author Oyst <plugin@oyst.com> <@oyst>
+ * @category Oyst
+ * @package Oyst_OneClick
+ * @copyright Copyright (c) 2017 Oyst (http://www.oyst.com)
+ */
+
+/**
+ * Checkout Tracking Block
+ */
+class Oyst_OneClick_Block_Checkout_Tracking extends Mage_Core_Block_Abstract
+{
+    protected $_order;
+
+    protected function _toHtml()
+    {
+        if (!$this->getOrder()->getId()) {
+            return '';
+        }
+
+        return '<img src="'.$this->getTrackerBaseUrl().'?'.$this->getParameters().'&'.$this->getExtraParameters().'"/>';
+    }
+
+    protected function getOrder()
+    {
+        if (!isset($this->_order)) {
+            $this->_order = Mage::getModel('sales/order')->load(Mage::getSingleton('checkout/session')->getLastOrderId());
+        }
+
+        return $this->_order;
+    }
+
+    protected function getTrackerBaseUrl()
+    {
+        $isCustomEnvProd = Mage::getStoreConfig('oyst/oneclick/mode') == 'custom';
+
+        foreach(array('staging', 'sandbox', 'test') as $env) {
+            if (strpos(Mage::getStoreConfig('oyst/oneclick/api_url'), $env) !== false) {
+                $isCustomEnvProd = false;
+                break;
+            }
+        }
+
+        if (Mage::getStoreConfig('oyst/oneclick/mode') == 'prod' || $isCustomEnvProd) {
+            return 'https://tkr.11rupt.io/';
+        } else {
+            return 'https://staging-tkr.11rupt.eu/';
+        }
+    }
+
+    protected function getExtraParameters()
+    {
+        $extraParameters = array(
+            'extra_parameters[amount]='.$this->getOrder()->getGrandTotal(),
+            'extra_parameters[paymentMethod]='.$this->getOrder()->getPayment()->getMethod(),
+            'extra_parameters[currency]='.$this->getOrder()->getOrderCurrencyCode(),
+            'extra_parameters[referrer]='.urlencode(Mage::helper('core/url')->getCurrentUrl()),
+            'extra_parameters[userEmail]='.urlencode($this->getOrder()->getCustomerEmail()),
+            'extra_parameters[orderId]='.$this->getOrder()->getIncrementId(),
+        );
+
+        if ($this->getOrder()->getCustomerId()) {
+            $extraParameters['extra_parameters[userId]'] = $this->getOrder()->getCustomerId();
+        }
+
+        return implode('&', $extraParameters);
+    }
+
+    protected function getParameters()
+    {
+        $parameters = array(
+            'version=1',
+            'type=track',
+            'event=Confirmation%20Displayed'
+        );
+
+        return implode('&', $parameters);
+    }
+}

app/code/community/Oyst/OneClick/Block/OneClick.php

@@ -40,8 +40,11 @@ public function isButtonEnabled()
             return false;
         }
 
-        // TODO Change code attribute to avoid confusions
-        if ($this->getProduct()->getIsOneclickActiveOnProduct()) {
+        if (Mage::getStoreConfig('oyst/oneclick/force_button_display_on_product')) {
+            return true;
+        }
+
+        if ($this->getProduct()->getIsOneclickDisableOnProduct()) {
             return false;
         }
 
@@ -92,15 +95,15 @@ public function getButtonCustomization($path = '')
     {
         $buttonCustomization = '';
 
-        $genericCustomizationAttributes = array('theme', 'color', 'rounded', 'smart');
+        $genericCustomizationAttributes = array('theme', 'color', 'rounded', 'smart', 'sticky');
 
         foreach ($genericCustomizationAttributes as $customizationAttribute) {
             $config = Mage::getStoreConfig('oyst/oneclick/button_' . $customizationAttribute);
             if (empty($config)) {
                 continue;
             }
 
-            if (in_array($customizationAttribute, array('rounded', 'smart'))) {
+            if (in_array($customizationAttribute, array('rounded', 'smart', 'sticky'))) {
                 $config = filter_var($config, FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false';
             }
 
@@ -118,17 +121,6 @@ public function getButtonCustomization($path = '')
             $buttonCustomization .= sprintf(" data-" . $customizationAttribute . "='%s'", $config);
         }
 
-        $specificCustomizationAttributes = array('height', 'width');
-
-        foreach ($specificCustomizationAttributes as $customizationAttribute) {
-            $config = Mage::getStoreConfig('oyst/oneclick/' . $path . 'button_' . $customizationAttribute);
-            if (empty($config)) {
-                continue;
-            }
-
-            $buttonCustomization .= sprintf(" data-" .  $customizationAttribute . "='%s'", $config);
-        }
-
         return $buttonCustomization;
     }
 

app/code/community/Oyst/OneClick/Helper/Data.php

@@ -26,6 +26,10 @@ class Oyst_OneClick_Helper_Data extends Mage_Core_Helper_Abstract
 
     const XML_PATH_RESTRICT_ALLOW_IPS = 'restrict_allow_ips';
 
+    const STATUS_OYST_PAYMENT_ACCEPTED = 'oyst_payment_accepted';
+
+    const STATUS_OYST_PAYMENT_FRAUD = 'oyst_payment_fraud';
+
     /**
      * Get config from Magento
      *
@@ -56,8 +60,8 @@ public function getModuleVersion()
      */
     public function getSdkVersion()
     {
-        /** @var Oyst_OneClick_Model_Api $oystModel */
-        $oystModel = Mage::getModel('oyst_oneclick/api');
+        /** @var Oyst_OneClick_Model_ApiWrapper_Client $oystModel */
+        $oystModel = Mage::getModel('oyst_oneclick/apiWrapper_client');
 
         return $oystModel->getSdkVersion();
     }
@@ -109,8 +113,8 @@ public function setIsInitialized($identifier, $isInitialized = true)
     public function isApiKeyValid()
     {
         try {
-            /** @var Oyst_OneClick_Model_Api $api */
-            $api = Mage::getModel('oyst_oneclick/api');
+            /** @var Oyst_OneClick_Model_ApiWrapper_Client $api */
+            $api = Mage::getModel('oyst_oneclick/apiWrapper_client');
             $api->isApiKeyValid();
         } catch (Exception $e) {
             /** @var Oyst_OneClick_Helper_Data $oystHelper */
@@ -185,28 +189,6 @@ public function isPaymentMethodOyst(Mage_Sales_Model_Order $order)
         return false !== strpos($order->getPayment()->getMethod(), $freepayPaymentMethod->getCode());
     }
 
-    /**
-     * Get metadata string.
-     *
-     * @return null|string
-     */
-    public function getTrackingMeta()
-    {
-        return '<script src="https://trk.10ru.pt"></script>' . PHP_EOL
-            . '<meta name="oyst_tracker_info_freepay_activated" content="'
-            . (int)Mage::getStoreConfigFlag('payment/oyst_freepay/active') . '">' . PHP_EOL
-            . '<meta name="oyst_tracker_info_freepay_apikey" content="'
-            . (int)Mage::getStoreConfigFlag('payment/oyst_abstract/api_login') . '">' . PHP_EOL
-            . '<meta name="oyst_tracker_environnement_freepay" content="'
-            . Mage::getStoreConfig('payment/oyst_abstract/mode') . '">' . PHP_EOL
-            . '<meta name="oyst_tracker_info_oneclick_activated" content="'
-            . (int)Mage::getStoreConfigFlag('oyst/oneclick/enable') . '">' . PHP_EOL
-            . '<meta name="oyst_tracker_info_oneclick_apikey" content="'
-            . (int)Mage::getStoreConfigFlag('oyst/oneclick/api_login') . '">' . PHP_EOL
-            . '<meta name="oyst_tracker_environnement_1click" content="'
-            . Mage::getStoreConfig('oyst/oneclick/mode') . '">' . PHP_EOL;
-    }
-
     /**
      * Checks for open refund transaction
      *
@@ -284,4 +266,36 @@ public function isIpAllowed($storeId = null)
 
         return $allow;
     }
+
+    public function handleQuoteErrors(Mage_Sales_Model_Quote $quote)
+    {
+        if ($quote->getHasError()) {
+            $errorMessages = array();
+            foreach ($quote->getErrors() as $error) {
+                $errorMessages[] = $error->getCode();
+            }
+            throw new Mage_Checkout_Exception(implode('\n', $errorMessages));
+        }
+
+        return $this;
+    }
+
+    public function addQuoteExtraData($quote, $key, $value)
+    {
+        $extraData = json_decode($quote->getOystExtraData(), true);
+
+        if(empty($extraData)) {
+            $extraData = array();
+        }
+
+        $extraData[$key] = $value;
+
+        $quote->setOystExtraData(json_encode($extraData));
+    }
+
+    public function getSalesObjectExtraData($salesObject, $key)
+    {
+        $extraData = json_decode($salesObject->getOystExtraData(), true);
+        return isset($extraData[$key]) ? $extraData[$key] : null;
+    }
 }

app/code/community/Oyst/OneClick/Model/ApiWrapper/AbstractType.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ * This file is part of Oyst_OneClick for Magento.
+ *
+ * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
+ * @author Oyst <plugin@oyst.com> <@oyst>
+ * @category Oyst
+ * @package Oyst_OneClick
+ * @copyright Copyright (c) 2017 Oyst (http://www.oyst.com)
+ */
+
+class Oyst_OneClick_Model_ApiWrapper_AbstractType extends Mage_Core_Model_Abstract
+{
+    /** @var Oyst_OneClick_Model_ApiWrapper_Client $_oystClient */
+    protected $_oystClient;
+
+    public function __construct()
+    {
+        $this->_oystClient = Mage::getModel('oyst_oneclick/apiWrapper_client');
+    }
+}

app/code/community/Oyst/OneClick/Model/Api.php → app/code/community/Oyst/OneClick/Model/ApiWrapper/Client.php

@@ -12,13 +12,11 @@
 use Oyst\Api\OystApiClientFactory;
 use Oyst\Api\OystCatalogApi;
 use Oyst\Classes\OystUserAgent;
-use Oyst\Api\OystPaymentApi;
-use Oyst\Classes\OystPrice;
 
 /**
  * API Model
  */
-class Oyst_OneClick_Model_Api extends Mage_Core_Model_Abstract
+class Oyst_OneClick_Model_ApiWrapper_Client extends Mage_Core_Model_Abstract
 {
     /*
      * API length