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/OneClick.php

@@ -40,8 +40,7 @@ public function isButtonEnabled()
             return false;
         }
 
-        // TODO Change code attribute to avoid confusions
-        if ($this->getProduct()->getIsOneclickActiveOnProduct()) {
+        if ($this->getProduct()->getIsOneclickDisableOnProduct()) {
             return false;
         }
 
@@ -92,15 +91,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 +117,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

@@ -56,8 +56,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 +109,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 */

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 <[email protected]> <@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

app/code/community/Oyst/OneClick/Model/Catalog/ApiWrapper.php → app/code/community/Oyst/OneClick/Model/ApiWrapper/Type/Catalog.php

@@ -11,18 +11,12 @@
 
 use Oyst\Api\OystApiClientFactory;
 use Oyst\Api\OystCatalogApi;
-use Oyst\Classes\OystCarrier;
-use Oyst\Classes\OneClickShipment;
-use Oyst\Classes\ShipmentAmount;
 
 /**
- * Catalog ApiWrapper Model
+ * ApiWrapper_Type_Catalog Model
  */
-class Oyst_OneClick_Model_Catalog_ApiWrapper extends Mage_Core_Model_Abstract
+class Oyst_OneClick_Model_ApiWrapper_Type_Catalog extends Oyst_OneClick_Model_ApiWrapper_AbstractType
 {
-    /** @var Oyst_OneClick_Model_Api $_oystClient */
-    protected $_oystClient;
-
     /** @var OystCatalogApi $_catalogApi */
     protected $_catalogApi;
 
@@ -33,7 +27,7 @@ class Oyst_OneClick_Model_Catalog_ApiWrapper extends Mage_Core_Model_Abstract
 
     public function __construct()
     {
-        $this->_oystClient = Mage::getModel('oyst_oneclick/api');
+        parent::__construct();
         $this->_catalogApi = $this->_oystClient->getClient($this->_type);
     }