diff --git a/composer.json b/composer.json index 21088460..d1d317f9 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "require-dev": { "phploc/phploc": "*", "phpmd/phpmd" : "@stable", - "phpunit/phpunit": "4.4.*", + "phpunit/phpunit": "4.4.1", "phpunit/phpunit-selenium": ">=1.2", "phpunit/dbunit": ">=1.2", "phpunit/phpunit-story": "*", diff --git a/composer.lock b/composer.lock new file mode 100644 index 00000000..bca1f3db --- /dev/null +++ b/composer.lock @@ -0,0 +1,1778 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "This file is @generated automatically" + ], + "hash": "b0dcbd828d2302b61c1c4c93209ee625", + "packages": [], + "packages-dev": [ + { + "name": "doctrine/instantiator", + "version": "1.0.4", + "source": { + "type": "git", + "url": "https://github.com/doctrine/instantiator.git", + "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f976e5de371104877ebc89bd8fecb0019ed9c119", + "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119", + "shasum": "" + }, + "require": { + "php": ">=5.3,<8.0-DEV" + }, + "require-dev": { + "athletic/athletic": "~0.1.8", + "ext-pdo": "*", + "ext-phar": "*", + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "2.0.*@ALPHA" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-0": { + "Doctrine\\Instantiator\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "http://ocramius.github.com/" + } + ], + "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", + "homepage": "https://github.com/doctrine/instantiator", + "keywords": [ + "constructor", + "instantiate" + ], + "time": "2014-10-13 12:58:55" + }, + { + "name": "nikic/php-parser", + "version": "v1.1.0", + "source": { + "type": "git", + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "ac05ef6f95bf8361549604b6031c115f92f39528" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ac05ef6f95bf8361549604b6031c115f92f39528", + "reference": "ac05ef6f95bf8361549604b6031c115f92f39528", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=5.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "files": [ + "lib/bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Nikita Popov" + } + ], + "description": "A PHP parser written in PHP", + "keywords": [ + "parser", + "php" + ], + "time": "2015-01-18 11:29:59" + }, + { + "name": "pdepend/pdepend", + "version": "2.0.4", + "source": { + "type": "git", + "url": "https://github.com/pdepend/pdepend.git", + "reference": "1b0acf162da4f30237987e61e177a57f78e3d87e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pdepend/pdepend/zipball/1b0acf162da4f30237987e61e177a57f78e3d87e", + "reference": "1b0acf162da4f30237987e61e177a57f78e3d87e", + "shasum": "" + }, + "require": { + "symfony/config": ">=2.4", + "symfony/dependency-injection": ">=2.4", + "symfony/filesystem": ">=2.4" + }, + "require-dev": { + "phpunit/phpunit": "4.*@stable", + "squizlabs/php_codesniffer": "@stable" + }, + "bin": [ + "src/bin/pdepend" + ], + "type": "library", + "autoload": { + "psr-0": { + "PDepend\\": "src/main/php/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "Official version of pdepend to be handled with Composer", + "time": "2014-12-04 12:38:39" + }, + { + "name": "phploc/phploc", + "version": "2.0.6", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phploc.git", + "reference": "322ad07c112d5c6832abed4269d648cacff5959b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phploc/zipball/322ad07c112d5c6832abed4269d648cacff5959b", + "reference": "322ad07c112d5c6832abed4269d648cacff5959b", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "sebastian/finder-facade": "~1.1", + "sebastian/git": "~1.0", + "sebastian/version": "~1.0", + "symfony/console": "~2.2" + }, + "bin": [ + "phploc" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "A tool for quickly measuring the size of a PHP project.", + "homepage": "https://github.com/sebastianbergmann/phploc", + "time": "2014-06-25 08:11:02" + }, + { + "name": "phpmd/phpmd", + "version": "2.1.3", + "source": { + "type": "git", + "url": "https://github.com/phpmd/phpmd.git", + "reference": "1a485d9db869137af5e9678bd844568c92998b25" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpmd/phpmd/zipball/1a485d9db869137af5e9678bd844568c92998b25", + "reference": "1a485d9db869137af5e9678bd844568c92998b25", + "shasum": "" + }, + "require": { + "pdepend/pdepend": "2.0.*", + "php": ">=5.3.0", + "symfony/config": "2.5.*", + "symfony/dependency-injection": "2.5.*", + "symfony/filesystem": "2.5.*" + }, + "bin": [ + "src/bin/phpmd" + ], + "type": "library", + "autoload": { + "psr-0": { + "PHPMD\\": "src/main/php" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "Official version of PHPMD handled with Composer.", + "time": "2014-09-25 15:56:22" + }, + { + "name": "phpunit/dbunit", + "version": "1.3.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/dbunit.git", + "reference": "a5891b7a9c4f21587a51f9bc4e8f7042b741b480" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/dbunit/zipball/a5891b7a9c4f21587a51f9bc4e8f7042b741b480", + "reference": "a5891b7a9c4f21587a51f9bc4e8f7042b741b480", + "shasum": "" + }, + "require": { + "ext-pdo": "*", + "ext-simplexml": "*", + "php": ">=5.3.3", + "phpunit/phpunit": ">=3.7.0@stable", + "symfony/yaml": ">=2.1.0" + }, + "bin": [ + "composer/bin/dbunit" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3.x-dev" + } + }, + "autoload": { + "classmap": [ + "PHPUnit/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "", + "../../symfony/yaml/" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "DbUnit port for PHP/PHPUnit to support database interaction testing.", + "homepage": "https://github.com/sebastianbergmann/dbunit/", + "keywords": [ + "database", + "testing", + "xunit" + ], + "time": "2014-03-26 11:25:06" + }, + { + "name": "phpunit/php-code-coverage", + "version": "2.0.14", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-code-coverage.git", + "reference": "ca158276c1200cc27f5409a5e338486bc0b4fc94" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca158276c1200cc27f5409a5e338486bc0b4fc94", + "reference": "ca158276c1200cc27f5409a5e338486bc0b4fc94", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "phpunit/php-file-iterator": "~1.3", + "phpunit/php-text-template": "~1.2", + "phpunit/php-token-stream": "~1.3", + "sebastian/environment": "~1.0", + "sebastian/version": "~1.0" + }, + "require-dev": { + "ext-xdebug": ">=2.1.4", + "phpunit/phpunit": "~4.1" + }, + "suggest": { + "ext-dom": "*", + "ext-xdebug": ">=2.2.1", + "ext-xmlwriter": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", + "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "keywords": [ + "coverage", + "testing", + "xunit" + ], + "time": "2014-12-26 13:28:33" + }, + { + "name": "phpunit/php-file-iterator", + "version": "1.3.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-file-iterator.git", + "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/acd690379117b042d1c8af1fafd61bde001bf6bb", + "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "File/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "FilterIterator implementation that filters files based on a list of suffixes.", + "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", + "keywords": [ + "filesystem", + "iterator" + ], + "time": "2013-10-10 15:34:57" + }, + { + "name": "phpunit/php-invoker", + "version": "1.1.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-invoker.git", + "reference": "8696484458cb43eed025ab46260846de5b74655c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/8696484458cb43eed025ab46260846de5b74655c", + "reference": "8696484458cb43eed025ab46260846de5b74655c", + "shasum": "" + }, + "require": { + "ext-pcntl": "*", + "php": ">=5.2.7", + "phpunit/php-timer": ">=1.0.4,<1.1.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "PHP/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Utility class for invoking callables with a timeout.", + "homepage": "https://github.com/sebastianbergmann/php-invoker/", + "keywords": [ + "process" + ], + "time": "2013-07-16 05:20:21" + }, + { + "name": "phpunit/php-text-template", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/206dfefc0ffe9cebf65c413e3d0e809c82fbf00a", + "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "Text/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", + "keywords": [ + "template" + ], + "time": "2014-01-30 17:20:04" + }, + { + "name": "phpunit/php-timer", + "version": "1.0.5", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/19689d4354b295ee3d8c54b4f42c3efb69cbc17c", + "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "PHP/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", + "keywords": [ + "timer" + ], + "time": "2013-08-02 07:42:54" + }, + { + "name": "phpunit/php-token-stream", + "version": "1.4.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-token-stream.git", + "reference": "db32c18eba00b121c145575fcbcd4d4d24e6db74" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/db32c18eba00b121c145575fcbcd4d4d24e6db74", + "reference": "db32c18eba00b121c145575fcbcd4d4d24e6db74", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Wrapper around PHP's tokenizer extension.", + "homepage": "https://github.com/sebastianbergmann/php-token-stream/", + "keywords": [ + "tokenizer" + ], + "time": "2015-01-17 09:51:32" + }, + { + "name": "phpunit/phpunit", + "version": "4.4.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "6a5e49a86ce5e33b8d0657abe145057fc513543a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6a5e49a86ce5e33b8d0657abe145057fc513543a", + "reference": "6a5e49a86ce5e33b8d0657abe145057fc513543a", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-json": "*", + "ext-pcre": "*", + "ext-reflection": "*", + "ext-spl": "*", + "php": ">=5.3.3", + "phpunit/php-code-coverage": "~2.0", + "phpunit/php-file-iterator": "~1.3.2", + "phpunit/php-text-template": "~1.2", + "phpunit/php-timer": "~1.0.2", + "phpunit/phpunit-mock-objects": "~2.3", + "sebastian/comparator": "~1.0", + "sebastian/diff": "~1.1", + "sebastian/environment": "~1.1", + "sebastian/exporter": "~1.0", + "sebastian/global-state": "~1.0", + "sebastian/version": "~1.0", + "symfony/yaml": "~2.0" + }, + "suggest": { + "phpunit/php-invoker": "~1.1" + }, + "bin": [ + "phpunit" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.4.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "The PHP Unit Testing framework.", + "homepage": "https://phpunit.de/", + "keywords": [ + "phpunit", + "testing", + "xunit" + ], + "time": "2014-12-28 07:57:05" + }, + { + "name": "phpunit/phpunit-mock-objects", + "version": "2.3.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", + "reference": "c63d2367247365f688544f0d500af90a11a44c65" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/c63d2367247365f688544f0d500af90a11a44c65", + "reference": "c63d2367247365f688544f0d500af90a11a44c65", + "shasum": "" + }, + "require": { + "doctrine/instantiator": "~1.0,>=1.0.1", + "php": ">=5.3.3", + "phpunit/php-text-template": "~1.2" + }, + "require-dev": { + "phpunit/phpunit": "~4.3" + }, + "suggest": { + "ext-soap": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Mock Object library for PHPUnit", + "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", + "keywords": [ + "mock", + "xunit" + ], + "time": "2014-10-03 05:12:11" + }, + { + "name": "phpunit/phpunit-selenium", + "version": "1.4.2", + "source": { + "type": "git", + "url": "https://github.com/giorgiosironi/phpunit-selenium.git", + "reference": "c84dd7ca214563868ce216123b7ae9c792beb262" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/giorgiosironi/phpunit-selenium/zipball/c84dd7ca214563868ce216123b7ae9c792beb262", + "reference": "c84dd7ca214563868ce216123b7ae9c792beb262", + "shasum": "" + }, + "require": { + "ext-curl": "*", + "ext-dom": "*", + "php": ">=5.3.3", + "phpunit/phpunit": "~3.7|~4.0", + "sebastian/comparator": "~1.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "PHPUnit/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + }, + { + "name": "Giorgio Sironi", + "email": "info@giorgiosironi.com", + "role": "developer" + } + ], + "description": "Selenium Server integration for PHPUnit", + "homepage": "http://www.phpunit.de/", + "keywords": [ + "selenium", + "testing", + "xunit" + ], + "time": "2014-11-02 09:23:27" + }, + { + "name": "phpunit/phpunit-story", + "version": "1.0.2", + "source": { + "type": "git", + "url": "https://github.com/phpunit/phpunit-story.git", + "reference": "b8579ada6ede4fd2f4b49e8549a8a176606cae68" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpunit/phpunit-story/zipball/b8579ada6ede4fd2f4b49e8549a8a176606cae68", + "reference": "b8579ada6ede4fd2f4b49e8549a8a176606cae68", + "shasum": "" + }, + "require": { + "ext-spl": "*", + "php": ">=5.2.7", + "phpunit/phpunit": ">=3.6.0RC1@stable" + }, + "type": "library", + "autoload": { + "classmap": [ + "PHPUnit/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Story extension for PHPUnit to facilitate Behaviour-Driven Development.", + "homepage": "http://www.phpunit.de/", + "keywords": [ + "BDD", + "TDD", + "xunit" + ], + "time": "2013-04-02 16:07:28" + }, + { + "name": "sebastian/comparator", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/comparator.git", + "reference": "c484a80f97573ab934e37826dba0135a3301b26a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/c484a80f97573ab934e37826dba0135a3301b26a", + "reference": "c484a80f97573ab934e37826dba0135a3301b26a", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "sebastian/diff": "~1.1", + "sebastian/exporter": "~1.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides the functionality to compare PHP values for equality", + "homepage": "http://www.github.com/sebastianbergmann/comparator", + "keywords": [ + "comparator", + "compare", + "equality" + ], + "time": "2014-11-16 21:32:38" + }, + { + "name": "sebastian/diff", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "5843509fed39dee4b356a306401e9dd1a931fec7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/5843509fed39dee4b356a306401e9dd1a931fec7", + "reference": "5843509fed39dee4b356a306401e9dd1a931fec7", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Diff implementation", + "homepage": "http://www.github.com/sebastianbergmann/diff", + "keywords": [ + "diff" + ], + "time": "2014-08-15 10:29:00" + }, + { + "name": "sebastian/environment", + "version": "1.2.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/environment.git", + "reference": "6e6c71d918088c251b181ba8b3088af4ac336dd7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6e6c71d918088c251b181ba8b3088af4ac336dd7", + "reference": "6e6c71d918088c251b181ba8b3088af4ac336dd7", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides functionality to handle HHVM/PHP environments", + "homepage": "http://www.github.com/sebastianbergmann/environment", + "keywords": [ + "Xdebug", + "environment", + "hhvm" + ], + "time": "2014-10-25 08:00:45" + }, + { + "name": "sebastian/exporter", + "version": "1.0.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/exporter.git", + "reference": "c7d59948d6e82818e1bdff7cadb6c34710eb7dc0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/c7d59948d6e82818e1bdff7cadb6c34710eb7dc0", + "reference": "c7d59948d6e82818e1bdff7cadb6c34710eb7dc0", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides the functionality to export PHP variables for visualization", + "homepage": "http://www.github.com/sebastianbergmann/exporter", + "keywords": [ + "export", + "exporter" + ], + "time": "2014-09-10 00:51:36" + }, + { + "name": "sebastian/finder-facade", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/finder-facade.git", + "reference": "1e396fda3449fce9df032749fa4fa2619e0347e0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/finder-facade/zipball/1e396fda3449fce9df032749fa4fa2619e0347e0", + "reference": "1e396fda3449fce9df032749fa4fa2619e0347e0", + "shasum": "" + }, + "require": { + "symfony/finder": ">=2.2.0", + "theseer/fdomdocument": ">=1.3.1" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "FinderFacade is a convenience wrapper for Symfony's Finder component.", + "homepage": "https://github.com/sebastianbergmann/finder-facade", + "time": "2013-05-28 06:10:03" + }, + { + "name": "sebastian/git", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/git.git", + "reference": "a99fbc102e982c1404041ef3e4d431562b29bcba" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/git/zipball/a99fbc102e982c1404041ef3e4d431562b29bcba", + "reference": "a99fbc102e982c1404041ef3e4d431562b29bcba", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Simple wrapper for Git", + "homepage": "http://www.github.com/sebastianbergmann/git", + "keywords": [ + "git" + ], + "time": "2013-08-04 09:35:29" + }, + { + "name": "sebastian/global-state", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/global-state.git", + "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/c7428acdb62ece0a45e6306f1ae85e1c05b09c01", + "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.2" + }, + "suggest": { + "ext-uopz": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Snapshotting of global state", + "homepage": "http://www.github.com/sebastianbergmann/global-state", + "keywords": [ + "global state" + ], + "time": "2014-10-06 09:23:50" + }, + { + "name": "sebastian/version", + "version": "1.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "a77d9123f8e809db3fbdea15038c27a95da4058b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/a77d9123f8e809db3fbdea15038c27a95da4058b", + "reference": "a77d9123f8e809db3fbdea15038c27a95da4058b", + "shasum": "" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that helps with managing the version number of Git-hosted PHP projects", + "homepage": "https://github.com/sebastianbergmann/version", + "time": "2014-12-15 14:25:24" + }, + { + "name": "squizlabs/php_codesniffer", + "version": "2.2.0", + "source": { + "type": "git", + "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", + "reference": "b301c98f19414d836fdaa678648745fcca5aeb4f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/b301c98f19414d836fdaa678648745fcca5aeb4f", + "reference": "b301c98f19414d836fdaa678648745fcca5aeb4f", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=5.1.2" + }, + "bin": [ + "scripts/phpcs", + "scripts/phpcbf" + ], + "type": "library", + "autoload": { + "classmap": [ + "CodeSniffer.php", + "CodeSniffer/CLI.php", + "CodeSniffer/Exception.php", + "CodeSniffer/File.php", + "CodeSniffer/Fixer.php", + "CodeSniffer/Report.php", + "CodeSniffer/Reporting.php", + "CodeSniffer/Sniff.php", + "CodeSniffer/Tokens.php", + "CodeSniffer/Reports/", + "CodeSniffer/Tokenizers/", + "CodeSniffer/DocGenerators/", + "CodeSniffer/Standards/AbstractPatternSniff.php", + "CodeSniffer/Standards/AbstractScopeSniff.php", + "CodeSniffer/Standards/AbstractVariableSniff.php", + "CodeSniffer/Standards/IncorrectPatternException.php", + "CodeSniffer/Standards/Generic/Sniffs/", + "CodeSniffer/Standards/MySource/Sniffs/", + "CodeSniffer/Standards/PEAR/Sniffs/", + "CodeSniffer/Standards/PSR1/Sniffs/", + "CodeSniffer/Standards/PSR2/Sniffs/", + "CodeSniffer/Standards/Squiz/Sniffs/", + "CodeSniffer/Standards/Zend/Sniffs/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Greg Sherwood", + "role": "lead" + } + ], + "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", + "homepage": "http://www.squizlabs.com/php-codesniffer", + "keywords": [ + "phpcs", + "standards" + ], + "time": "2015-01-21 22:44:05" + }, + { + "name": "symfony/config", + "version": "v2.5.9", + "target-dir": "Symfony/Component/Config", + "source": { + "type": "git", + "url": "https://github.com/symfony/Config.git", + "reference": "c7309e33b719433d5cf3845d0b5b9608609d8c8e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Config/zipball/c7309e33b719433d5cf3845d0b5b9608609d8c8e", + "reference": "c7309e33b719433d5cf3845d0b5b9608609d8c8e", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "symfony/filesystem": "~2.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Config\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony Config Component", + "homepage": "http://symfony.com", + "time": "2015-01-03 08:01:13" + }, + { + "name": "symfony/console", + "version": "v2.6.3", + "target-dir": "Symfony/Component/Console", + "source": { + "type": "git", + "url": "https://github.com/symfony/Console.git", + "reference": "6ac6491ff60c0e5a941db3ccdc75a07adbb61476" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Console/zipball/6ac6491ff60c0e5a941db3ccdc75a07adbb61476", + "reference": "6ac6491ff60c0e5a941db3ccdc75a07adbb61476", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "psr/log": "~1.0", + "symfony/event-dispatcher": "~2.1", + "symfony/process": "~2.1" + }, + "suggest": { + "psr/log": "For using the console logger", + "symfony/event-dispatcher": "", + "symfony/process": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.6-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Console\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony Console Component", + "homepage": "http://symfony.com", + "time": "2015-01-06 17:50:02" + }, + { + "name": "symfony/dependency-injection", + "version": "v2.5.9", + "target-dir": "Symfony/Component/DependencyInjection", + "source": { + "type": "git", + "url": "https://github.com/symfony/DependencyInjection.git", + "reference": "b04e6782962f8e3312274fd16fb6b37a8210a1c3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/b04e6782962f8e3312274fd16fb6b37a8210a1c3", + "reference": "b04e6782962f8e3312274fd16fb6b37a8210a1c3", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "symfony/config": "~2.2", + "symfony/expression-language": "~2.4,>=2.4.10", + "symfony/yaml": "~2.1" + }, + "suggest": { + "symfony/config": "", + "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them", + "symfony/yaml": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\DependencyInjection\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony DependencyInjection Component", + "homepage": "http://symfony.com", + "time": "2015-01-05 08:51:41" + }, + { + "name": "symfony/filesystem", + "version": "v2.5.9", + "target-dir": "Symfony/Component/Filesystem", + "source": { + "type": "git", + "url": "https://github.com/symfony/Filesystem.git", + "reference": "d3c24d7d6e9c342008d8421b2fade460311647ea" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Filesystem/zipball/d3c24d7d6e9c342008d8421b2fade460311647ea", + "reference": "d3c24d7d6e9c342008d8421b2fade460311647ea", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Filesystem\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony Filesystem Component", + "homepage": "http://symfony.com", + "time": "2015-01-03 21:04:44" + }, + { + "name": "symfony/finder", + "version": "v2.6.3", + "target-dir": "Symfony/Component/Finder", + "source": { + "type": "git", + "url": "https://github.com/symfony/Finder.git", + "reference": "16513333bca64186c01609961a2bb1b95b5e1355" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Finder/zipball/16513333bca64186c01609961a2bb1b95b5e1355", + "reference": "16513333bca64186c01609961a2bb1b95b5e1355", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.6-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Finder\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony Finder Component", + "homepage": "http://symfony.com", + "time": "2015-01-03 08:01:59" + }, + { + "name": "symfony/yaml", + "version": "v2.6.3", + "target-dir": "Symfony/Component/Yaml", + "source": { + "type": "git", + "url": "https://github.com/symfony/Yaml.git", + "reference": "82462a90848a52c2533aa6b598b107d68076b018" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Yaml/zipball/82462a90848a52c2533aa6b598b107d68076b018", + "reference": "82462a90848a52c2533aa6b598b107d68076b018", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.6-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Yaml\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony Yaml Component", + "homepage": "http://symfony.com", + "time": "2015-01-03 15:33:07" + }, + { + "name": "theseer/directoryscanner", + "version": "1.3.1", + "source": { + "type": "git", + "url": "https://github.com/theseer/DirectoryScanner.git", + "reference": "b1406a99f5e4b1761c84d9e98127c03871bb7b0e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/theseer/DirectoryScanner/zipball/b1406a99f5e4b1761c84d9e98127c03871bb7b0e", + "reference": "b1406a99f5e4b1761c84d9e98127c03871bb7b0e", + "shasum": "" + }, + "require": { + "php": ">=5.3.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + } + ], + "description": "A recursive directory scanner and filter", + "time": "2014-11-25 14:27:49" + }, + { + "name": "theseer/fdomdocument", + "version": "1.6.0", + "source": { + "type": "git", + "url": "https://github.com/theseer/fDOMDocument.git", + "reference": "d08cf070350f884c63fc9078d27893c2ab6c7cef" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/theseer/fDOMDocument/zipball/d08cf070350f884c63fc9078d27893c2ab6c7cef", + "reference": "d08cf070350f884c63fc9078d27893c2ab6c7cef", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "lib-libxml": "*", + "php": ">=5.3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "lead" + } + ], + "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.", + "homepage": "https://github.com/theseer/fDOMDocument", + "time": "2014-09-13 10:57:19" + }, + { + "name": "theseer/fxsl", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/theseer/fXSL.git", + "reference": "a9246376c713156e55c080782d4104bb07d4b899" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/theseer/fXSL/zipball/a9246376c713156e55c080782d4104bb07d4b899", + "reference": "a9246376c713156e55c080782d4104bb07d4b899", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-libxml": "*", + "ext-xsl": "*", + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + } + ], + "description": "An XSL wrapper / extension to the PHP 5.x XSLTProcessor with Exception and extended Callback support", + "time": "2014-11-27 20:08:52" + }, + { + "name": "theseer/phpdox", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/theseer/phpdox.git", + "reference": "0693cc0d7dcbb5651fe8cbc768dee50ee611c6d0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/theseer/phpdox/zipball/0693cc0d7dcbb5651fe8cbc768dee50ee611c6d0", + "reference": "0693cc0d7dcbb5651fe8cbc768dee50ee611c6d0", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-fileinfo": "*", + "ext-iconv": "*", + "ext-mbstring": "*", + "ext-tokenizer": "*", + "ext-xsl": "*", + "nikic/php-parser": ">=1.0.2", + "php": ">=5.3.3", + "phpunit/php-timer": ">=1.0.4", + "theseer/directoryscanner": ">=1.3.0", + "theseer/fdomdocument": ">=1.6.0", + "theseer/fxsl": ">=1.1" + }, + "bin": [ + "phpdox" + ], + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + } + ], + "description": "A fast Documentation generator for PHP Code using standard technology (SRC, DOCBLOCK, XML and XSLT) with event based processing", + "time": "2015-01-15 16:57:14" + } + ], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": { + "phpmd/phpmd": 0, + "theseer/phpdox": 20 + }, + "prefer-stable": false, + "prefer-lowest": false, + "platform": [], + "platform-dev": [] +} diff --git a/composer.phar b/composer.phar new file mode 100755 index 00000000..8ad22b59 Binary files /dev/null and b/composer.phar differ diff --git a/core/protected/commands/HostingMigrateCommand.php b/core/protected/commands/HostingMigrateCommand.php index 0f150fa6..b21fd93e 100644 --- a/core/protected/commands/HostingMigrateCommand.php +++ b/core/protected/commands/HostingMigrateCommand.php @@ -45,37 +45,89 @@ class HostingMigrateCommand extends MigrateCommand */ public function beforeAction($action, $params) { - if (empty($this->dbhost) || - empty($this->dbuser) || - empty($this->dbpass) || - empty($this->dbname) || - empty($this->hosting) || - !$this->validHostingSwitch($this->hosting) + if ($this->validHostingSwitch($this->hosting) === false || + $this->validateDbCliArgs($action) === false ) { - echo "\n*error halting*\n\n usage: yiic hostingmigrate $action --dbhost=127.0.0.1 --dbuser=root --dbpass=mypass --dbname=webstore --hosting=M\n\n"; - echo " Note, --hosting flag can take one of three values: M for Multi-tenant, S for Single tenant, and T for Multi-tenant staging\n"; - echo " These flags will set configuration keys specific to those environments.\n"; - echo "\n"; return false; } - $this->setDbForMigration(); - $this->connectionID = "dbmt"; $this->migrationTable = 'xlsws_migrations'; return parent::beforeAction($action, $params); - } + /** + * Ensure the --hosting command line argument is present and valid. + * If not, display an error message. + * + * @param $str + * @return bool + */ protected function validHostingSwitch($str) { - $arrAllowed = array('M','T','S'); - return in_array($str,$arrAllowed); + $strError = "\n*error halting*\n"; + $strError .= "\t--hosting flag takes one of three values:\n"; + $strError .= "\tM for Multi-tenant (Retail), T for Multi-tenant staging (Retail), S for Single tenant (Onsite), and N for Non-Hosted (Onsite)\n"; + + if (empty($str)) + { + $strError .= "\t--hosting flag MUST be present.\n\n"; + echo $strError; + return false; + } + + $arrAllowed = array('M','T','S','N'); + if (in_array($str, $arrAllowed) === false) + { + echo $strError . "\n"; + return false; + } + + return true; } + /** - * Establish database component for multitenant. + * Ensure the required database credentials are present if passed on the command line: + * If not, display an error + * + * @param $action + * @return bool + */ + protected function validateDbCliArgs($action) + { + // if any one of these is present... + if (!empty($this->dbhost) || + !empty($this->dbuser) || + !empty($this->dbpass) || + !empty($this->dbname) + ) + { + // ...then they must ALL be present + if (empty($this->dbhost) || + empty($this->dbuser) || + empty($this->dbpass) || + empty($this->dbname) + ) + { + echo "\n*error halting*\n"; + echo "\tusage: yiic hostingmigrate $action --dbhost=127.0.0.1 --dbuser=root --dbpass=mypass --dbname=webstore --hosting=M\n"; + echo "\t--hosting flag takes one of three values:\n"; + echo "\tM for Multi-tenant (Retail), T for Multi-tenant staging (Retail), S for Single tenant (Onsite), and N for Non-Hosted (Onsite)\n\n"; + echo "You must include all database credentials when passing them.\n"; + echo "Or else,\n\n\tusage: yiic hostingmigrate $action --hosting=M --interactive=0\n\n"; + return false; + } + + $this->setDbForMigration(); + $this->connectionID = "dbmt"; + } + + return true; + } + /** + * Establish database component for passed in credentials. * * @return void */ @@ -103,36 +155,47 @@ protected function setDbForMigration() */ public function actionUp($args) { + $component = $this->connectionID; + switch ($this->hosting) { case 'S': - $intVer = Yii::app()->dbmt->createCommand("SELECT key_value FROM xlsws_configuration WHERE `key_name` = 'DATABASE_SCHEMA_VERSION'")->queryScalar(); + + $intVer = Yii::app()->$component->createCommand("SELECT key_value FROM xlsws_configuration WHERE `key_name` = 'DATABASE_SCHEMA_VERSION'")->queryScalar(); if($intVer !== false && (int)$intVer < 447) - { - // Override certain migrations to support legacy schema order - $this->migrationPath = Yii::getPathOfAlias('application.migrations.legacy'); - // Execute yii migrations - parent::actionUp($args); - - // Point to standard migrations for next migration leg - $this->migrationPath = Yii::getPathOfAlias('application.migrations'); - - // Reset migration position to non-legacy - Yii::app()->db->createCommand()->truncateTable('xlsws_migrations'); - $this->actionMark(array('m140429_224114_update_configuration')); + { + // Override certain migrations to support legacy schema order + $this->migrationPath = Yii::getPathOfAlias('application.migrations.legacy'); + // Execute yii migrations + parent::actionUp($args); + + // Point to standard migrations for next migration leg + $this->migrationPath = Yii::getPathOfAlias('application.migrations'); + + // Reset migration position to non-legacy + Yii::app()->$component->createCommand()->truncateTable('xlsws_migrations'); + + $this->actionMark(array('m140429_224114_update_configuration')); } parent::actionUp($args); - Yii::app()->dbmt->createCommand("UPDATE xlsws_configuration SET `key_value` = 1 WHERE `key_name` = 'LIGHTSPEED_HOSTING'")->execute(); - Yii::app()->dbmt->createCommand("UPDATE xlsws_configuration SET `key_value` = 1 WHERE `key_name` = 'ENABLE_SSL'")->execute(); + Yii::app()->$component->createCommand("UPDATE xlsws_configuration SET `key_value` = 1 WHERE `key_name` = 'LIGHTSPEED_HOSTING'")->execute(); + Yii::app()->$component->createCommand("UPDATE xlsws_configuration SET `key_value` = 1 WHERE `key_name` = 'ENABLE_SSL'")->execute(); break; case 'M': case 'T': parent::actionUp($args); - Yii::app()->dbmt->createCommand("UPDATE xlsws_configuration SET `key_value` = 1 WHERE `key_name` = 'LIGHTSPEED_MT'")->execute(); - Yii::app()->dbmt->createCommand("UPDATE xlsws_configuration SET `key_value` = 1 WHERE `key_name` = 'LIGHTSPEED_HOSTING'")->execute(); - Yii::app()->dbmt->createCommand("UPDATE xlsws_configuration SET `key_value` = 1 WHERE `key_name` = 'ENABLE_SSL'")->execute(); + Yii::app()->$component->createCommand("UPDATE xlsws_configuration SET `key_value` = 1 WHERE `key_name` = 'LIGHTSPEED_MT'")->execute(); + Yii::app()->$component->createCommand("UPDATE xlsws_configuration SET `key_value` = 1 WHERE `key_name` = 'LIGHTSPEED_HOSTING'")->execute(); + Yii::app()->$component->createCommand("UPDATE xlsws_configuration SET `key_value` = 1 WHERE `key_name` = 'ENABLE_SSL'")->execute(); + break; + + case 'N': + // yiic hostingmigrate up --hosted=N === yiic migrate up + // i.e. if no command line arguments defining a specific database + // are present, this does the same thing as yiic migrate up + parent::actionUp($args); break; } } diff --git a/core/protected/components/ApplicationComponent.php b/core/protected/components/ApplicationComponent.php index dd5db151..bf293bec 100644 --- a/core/protected/components/ApplicationComponent.php +++ b/core/protected/components/ApplicationComponent.php @@ -2,11 +2,9 @@ /* * Empty event handlers so we can extend without causing errors */ -class ApplicationComponent extends CApplicationComponent { - - - - //For CEventProduct,CEventPhoto,CEventOrder +class ApplicationComponent extends CApplicationComponent +{ + // For CEventProduct,CEventPhoto,CEventOrder. public function onSaveProduct($event) {} public function onUpdateInventory($event) {} public function onActionProductView($event) {} @@ -24,6 +22,4 @@ public function onActionVerifyProductUpdate($event) {} public function onActionListOrders($event) {} public function onFlushTable($event) {} - - -} \ No newline at end of file +} diff --git a/core/protected/components/Checkout.php b/core/protected/components/Checkout.php index 615f5798..378853cd 100644 --- a/core/protected/components/Checkout.php +++ b/core/protected/components/Checkout.php @@ -82,7 +82,7 @@ public static function emailReceipts($objCart) $objEmail->htmlbody = $strHtmlBody; $objEmail->cart_id = $objCart->id; $objEmail->subject = $strSubject; - $orderEmail = _xls_get_conf('ORDER_FROM',''); + $orderEmail = _xls_get_conf('ORDER_FROM', ''); $objEmail->to = empty($orderEmail) ? _xls_get_conf('EMAIL_FROM') : $orderEmail; // If we get back false, it means conversion failed which 99.9% of diff --git a/core/protected/components/Controller.php b/core/protected/components/Controller.php index fc84f472..e84cb67c 100644 --- a/core/protected/components/Controller.php +++ b/core/protected/components/Controller.php @@ -9,24 +9,24 @@ class Controller extends CController * @var string the default layout for the controller view. Defaults to '//layouts/column1', * meaning using a single column layout. See 'protected/views/layouts/column1.php'. */ - public $layout='//layouts/column2'; + public $layout = '//layouts/column2'; + /** * @var array context menu items. This property will be assigned to {@link CMenu::items}. */ - public $menu=array(); + public $menu = array(); + /** * @var array the breadcrumbs of the current page. The value of this property will * be assigned to {@link CBreadcrumbs::links}. Please refer to {@link CBreadcrumbs::links} * for more details on how to specify this property. */ - public $breadcrumbs=array(); + public $breadcrumbs = array(); public $menuwidget; protected $_canonicalUrl; - public $LoadSharing=0; - /* These are public variables that are used in our layout, so we have to define them. */ public $pageDescription; @@ -49,11 +49,15 @@ class Controller extends CController public $gridProductsPerRow = 3; public $gridProductsRows; + + // @codingStandardsIgnoreStart - this variable is used in view files, + // cannot easily be changed. public $custom_page_content; + // @codingStandardsIgnoreEnd /* Support lightweight repeated calls to getMenuTree by caching the result * for the lifetime of the component object. */ - private $objFullTree = null; + private $_objFullTree = null; /** * Dynamically load the configuration settings for the client and @@ -63,25 +67,32 @@ public static function initParams() { defined('DEFAULT_THEME') or define('DEFAULT_THEME', 'brooklyn2014'); - $Params = CHtml::listData(Configuration::model()->findAll(),'key_name','key_value'); + $params = CHtml::listData(Configuration::model()->findAll(), 'key_name', 'key_value'); - foreach ($Params as $key => $value) + foreach ($params as $key => $value) { Yii::app()->params->add($key, $value); } if(isset(Yii::app()->params['THEME'])) - Yii::app()->theme=Yii::app()->params['THEME']; - else Yii::app()->theme=DEFAULT_THEME; + { + Yii::app()->theme = Yii::app()->params['THEME']; + } else { + Yii::app()->theme = DEFAULT_THEME; + } + if(isset(Yii::app()->params['LANG_CODE'])) - Yii::app()->language=Yii::app()->params['LANG_CODE']; - else Yii::app()->language = "en"; - Yii::app()->params->add('listPerPage',Yii::app()->params['PRODUCTS_PER_PAGE']); + { + Yii::app()->language = Yii::app()->params['LANG_CODE']; + } else { + Yii::app()->language = "en"; + } + + Yii::app()->params->add('listPerPage', Yii::app()->params['PRODUCTS_PER_PAGE']); //Based on logging setting, set log level dynamically and possibly turn on debug mode switch (Yii::app()->params['DEBUG_LOGGING']) { - case 'info': $logLevel = "error,warning,info"; break; @@ -94,17 +105,18 @@ public static function initParams() default: $logLevel = "error,warning"; break; - } foreach(Yii::app()->getComponent('log')->routes as $route) + { $route->levels = $logLevel; + } Yii::app()->setViewPath(Yii::getPathOfAlias('application')."/views-cities"); - Yii::app()->name = Yii::app()->params['STORE_NAME']; + Yii::app()->name = Yii::app()->params['STORE_NAME']; - if(Yii::app()->params['LIGHTSPEED_CLOUD']=='-1') + if(Yii::app()->params['LIGHTSPEED_CLOUD'] == '-1') { //We should never see this, this means our cloud cache file is bad $strHostfile = realpath(dirname(__FILE__)).'/../../../config/cloud/'.$_SERVER['HTTP_HOST'].".php"; @@ -112,7 +124,6 @@ public static function initParams() Yii::app()->request->redirect(Yii::app()->createUrl('site/index')); } - } /** * Load anything we need globally, such as items we're going to use in our main.php template. @@ -125,32 +136,41 @@ public function init() self::initParams(); if(isset($_GET['nosni'])) - Yii::app()->user->setFlash('warning',Yii::t('global','NOTE: Your older operating system does not support certain security features this site uses. You have been redirected to {link} for your session which will ensure your information is properly protected.',array('{link}'=>"".Yii::app()->params['LIGHTSPEED_HOSTING_LIGHTSPEED_URL'].""))); + { + Yii::app()->user->setFlash('warning', Yii::t('global', 'NOTE: Your older operating system does not support certain security features this site uses. You have been redirected to {link} for your session which will ensure your information is properly protected.', array('{link}' => "".Yii::app()->params['LIGHTSPEED_HOSTING_LIGHTSPEED_URL'].""))); + } $filename = Yii::getPathOfAlias('webroot.themes').DIRECTORY_SEPARATOR.DEFAULT_THEME; - if(!file_exists($filename) && _xls_get_conf('LIGHTSPEED_MT',0)=='0') + if(!file_exists($filename) && _xls_get_conf('LIGHTSPEED_MT', 0) == '0') { if(!downloadTheme(DEFAULT_THEME)) + { die("missing ".DEFAULT_THEME); + } else + { $this->redirect(Yii::app()->createUrl("site/index")); + } } + if(!Yii::app()->theme) { if(_xls_get_conf('THEME')) { //We can't find our theme for some reason, switch back to default _xls_set_conf('THEME', DEFAULT_THEME); - _xls_set_conf('CHILD_THEME','light'); + _xls_set_conf('CHILD_THEME', 'light'); Yii::log( "Couldn't find our theme, switched back to " . DEFAULT_THEME . " for emergency", 'error', 'application.' . __CLASS__ . "." . __FUNCTION__ ); $this->redirect(Yii::app()->createUrl('site/index')); - - } else + } + else + { die("you have no theme set"); + } } if (isset($_GET['theme']) && isset($_GET['themekey'])) @@ -175,19 +195,23 @@ public function init() $this->buildBootstrap(); if(_xls_facebook_login()) + { $this->getFacebookLogin(); + } if (Yii::app()->params['STORE_OFFLINE'] != '0' || Yii::app()->params['INSTALLED'] != '1') { if (isset($_GET['offline'])) + { Yii::app()->session['STORE_OFFLINE'] = _xls_number_only($_GET['offline']); + } //If uninstalled on a new Multitenant store, direct to license acceptance to get going if (Yii::app()->params['INSTALLED'] != '1' && Yii::app()->params['LIGHTSPEED_MT'] == '1') { $url = Yii::app()->createUrl("admin/license"); - $url = str_replace("https:","http:",$url); - $this->redirect($url,true); + $url = str_replace("https:", "http:", $url); + $this->redirect($url, true); } if (Yii::app()->session['STORE_OFFLINE'] != Yii::app()->params['STORE_OFFLINE'] || @@ -202,16 +226,22 @@ public function init() $strViewset = Yii::app()->theme->info->viewset; if(!empty($strViewset)) + { Yii::app()->setViewPath(Yii::getPathOfAlias('application')."/views-".$strViewset); + } $strLayoutFile = Yii::app()->theme->config->layoutFile; if(empty($strLayoutFile)) + { $strLayoutFile = "column2"; //This is for backwards compatibility only + } if(Yii::app()->theme && file_exists('webroot.themes.'.Yii::app()->theme->name.'.layouts.'.$strLayoutFile)) - $this->layout='webroot.themes.'.Yii::app()->theme->name.'.layouts.'.$strLayoutFile; - else + { + $this->layout = 'webroot.themes.'.Yii::app()->theme->name.'.layouts.'.$strLayoutFile; + } else { $this->layout = $strLayoutFile; + } //Set defaults $this->getUserLanguage(); @@ -223,9 +253,9 @@ public function init() $pageHeaderImage = Yii::app()->params['HEADER_IMAGE']; - if (substr($pageHeaderImage,0,4) != "http") + if (substr($pageHeaderImage, 0, 4) != "http") { - if (substr($pageHeaderImage,0,2) != "//") + if (substr($pageHeaderImage, 0, 2) != "//") { $this->pageAbsoluteHeaderImage = Yii::app()->createAbsoluteUrl($pageHeaderImage, array(), Yii::app()->params['ENABLE_SSL'] ? 'https' : 'http'); // we prefix with baseUrl to handle instances where Web Store is installed in a sub folder @@ -237,10 +267,7 @@ public function init() $this->pageAbsoluteHeaderImage = Yii::app()->params['ENABLE_SSL'] ? 'https:' . $pageHeaderImage : 'http:' . $pageHeaderImage; $this->pageHeaderImage = $pageHeaderImage; } - } - - else - { + } else { $this->pageAbsoluteHeaderImage = $pageHeaderImage; $this->pageHeaderImage = $pageHeaderImage; } @@ -251,14 +278,14 @@ public function init() //Run other functions to create some data we always need $this->buildGoogle(); $this->buildSidebars(); - if (_xls_get_conf('SHOW_SHARING',0)) + if (_xls_get_conf('SHOW_SHARING', 0)) + { $this->buildSharing(); + } $this->buildAccessWarning(); - $this->gridProductsPerRow = _xls_get_conf('PRODUCTS_PER_ROW',3); - - + $this->gridProductsPerRow = _xls_get_conf('PRODUCTS_PER_ROW', 3); Yii::app()->clientScript->registerMetaTag( "Lightspeed Web Store " . XLSWS_VERSION, @@ -273,19 +300,23 @@ public function init() * Default canonical url generator, will remove all get params beside 'id' and generates an absolute url. * If the canonical url was already set in a child controller, it will be taken instead. */ - public function getCanonicalUrl() { - if ($this->_canonicalUrl === null) { + public function getCanonicalUrl() + { + if ($this->_canonicalUrl === null) + { $params = array(); - if (isset($_GET['id'])) { + if (isset($_GET['id'])) + { //just keep the id, because it identifies our model pages $params = array('id' => $_GET['id']); } + $this->_canonicalUrl = Yii::app()->createAbsoluteUrl($this->route, $params); } + return $this->_canonicalUrl; } - /** * Override URL if needed */ @@ -293,10 +324,8 @@ public function setCanonicalUrl($strUrl) { $this->_canonicalUrl = $strUrl; } - protected function getUserLanguage() { - $app = Yii::app(); if (isset($_POST['_lang'])) @@ -316,8 +345,8 @@ protected function getUserLanguage() else { // 'fr_FR' becomes 'fr' - $app->language = substr(Yii::app()->getRequest()->getPreferredLanguage(),0,2); - $app->session['_lang'] = substr(Yii::app()->getRequest()->getPreferredLanguage(),0,2); + $app->language = substr(Yii::app()->getRequest()->getPreferredLanguage(), 0, 2); + $app->session['_lang'] = substr(Yii::app()->getRequest()->getPreferredLanguage(), 0, 2); } } @@ -331,11 +360,14 @@ protected function buildGoogle() { $this->pageGoogleVerify = _xls_get_conf('GOOGLE_VERIFY'); $this->pageGoogleFonts = _xls_get_conf('GOOGLE_FONTS_LINK'); + if (Yii::app()->theme->info->GoogleFonts) + { $this->pageGoogleFonts .= ''; + } - $this->pageGoogleFonts = str_replace("http://","//",$this->pageGoogleFonts); + $this->pageGoogleFonts = str_replace("http://", "//", $this->pageGoogleFonts); } /** @@ -350,23 +382,21 @@ protected function buildSidebars() { } protected function buildSharing() { - $this->sharingHeader = $this->renderPartial('/site/_sharing_header',null,true); - $this->sharingFooter = $this->renderPartial('/site/_sharing_footer',null,true); - - + $this->sharingHeader = $this->renderPartial('/site/_sharing_header', null, true); + $this->sharingFooter = $this->renderPartial('/site/_sharing_footer', null, true); } protected function buildBootstrap() { - Yii::setPathOfAlias('bootstrap',null); + Yii::setPathOfAlias('bootstrap', null); $strBootstrap = Yii::app()->theme->info->bootstrap; if(!isset($strBootstrap)) { - Yii::app()->setComponent('bootstrap',array( - 'class'=>'ext.bootstrap.components.Bootstrap', - 'responsiveCss'=>true, + Yii::app()->setComponent('bootstrap', array( + 'class' => 'ext.bootstrap.components.Bootstrap', + 'responsiveCss' => true, )); Yii::setPathOfAlias('bootstrap', dirname(__FILE__).DIRECTORY_SEPARATOR.'../extensions/bootstrap'); Yii::app()->bootstrap->init(); @@ -381,25 +411,25 @@ protected function buildBootstrap() 'bootstrap', dirname(__FILE__).DIRECTORY_SEPARATOR.'../extensions/'.Yii::app()->theme->info->bootstrap ); - Yii::app()->setComponent('bootstrap',array( - 'class'=>'ext.'.Yii::app()->theme->info->bootstrap.'.components.Bootstrap' + Yii::app()->setComponent('bootstrap', array( + 'class' => 'ext.'.Yii::app()->theme->info->bootstrap.'.components.Bootstrap' )); Yii::app()->bootstrap->init(); } - } protected function buildAccessWarning() { try { - Yii::app()->setComponent('wsaccesswarning' ,array( - 'class'=>'ext.wsaccesswarning.wsaccesswarning' + Yii::app()->setComponent('wsaccesswarning', array( + 'class' => 'ext.wsaccesswarning.wsaccesswarning' )); Yii::app()->wsaccesswarning->displayAccessWarning(); } + catch(Exception $ex) { Yii::log("Failed to load wsaccesswarning extension", 'error', 'application.'.__CLASS__.".".__FUNCTION__); @@ -413,18 +443,18 @@ protected function getloginDialog() { /* This is our modal login dialog box */ if (Yii::app()->user->isGuest) { - $this->beginWidget('zii.widgets.jui.CJuiDialog',array( - 'id'=>'LoginForm', - 'options'=>array( - 'title'=>Yii::t('global','Redirecting to Login...'), - 'autoOpen'=>false, - 'modal'=>'true', - 'width'=>'300', - 'height'=>'0', - 'resizable'=>false, - 'position'=>'center', - 'draggable'=>false, - 'open'=>'js:function(){window.location.href="'.$this->createUrl("site/login").'";}', + $this->beginWidget('zii.widgets.jui.CJuiDialog', array( + 'id' => 'LoginForm', + 'options' => array( + 'title' => Yii::t('global', 'Redirecting to Login...'), + 'autoOpen' => false, + 'modal' => 'true', + 'width' => '300', + 'height' => '0', + 'resizable' => false, + 'position' => 'center', + 'draggable' => false, + 'open' => 'js:function(){window.location.href="'.$this->createUrl("site/login").'";}', ), )); @@ -440,16 +470,15 @@ protected function getFacebookLogin() //Facebook integration $fbArray = require(YiiBase::getPathOfAlias('application.config').'/_wsfacebook.php'); - $fbArray['appId']=Yii::app()->params['FACEBOOK_APPID']; - $fbArray['secret']=Yii::app()->params['FACEBOOK_SECRET']; - Yii::app()->setComponent('facebook',$fbArray); - + $fbArray['appId'] = Yii::app()->params['FACEBOOK_APPID']; + $fbArray['secret'] = Yii::app()->params['FACEBOOK_SECRET']; + Yii::app()->setComponent('facebook', $fbArray); if (Yii::app()->user->isGuest) { $userid = Yii::app()->facebook->getUser(); - if ($userid>0) + if ($userid > 0) { $results = Yii::app()->facebook->api('/'.$userid); if(!isset($results['email'])) @@ -458,26 +487,31 @@ protected function getFacebookLogin() Yii::app()->facebook->destroySession(); $this->redirect(Yii::app()->createUrl("site/index")); } - $identity=new FBIdentity($results['email'],$userid); //we user userid in the password field + + $identity = new FBIdentity($results['email'], $userid); //we user userid in the password field $identity->authenticate(); - if($identity->errorCode===UserIdentity::ERROR_NONE) + if($identity->errorCode === UserIdentity::ERROR_NONE) { - Yii::app()->user->login($identity,0); + Yii::app()->user->login($identity, 0); $this->redirect(Yii::app()->createUrl("site/index")); } } } if(isset(Yii::app()->user->facebook)) + { if(Yii::app()->user->facebook) - $this->logoutUrl = Yii::app()->facebook->getLogoutUrl(); - + { + $this->logoutUrl = Yii::app()->facebook->getLogoutUrl(); + } + } } public function setReturnUrl() { Yii::app()->session['returnUrl'] = $this->CanonicalUrl; } + public function getReturnUrl() { return Yii::app()->session['returnUrl']; @@ -494,7 +528,9 @@ public function getReturnUrl() protected function createBookends($model) { if (count($model) == 0 || Yii::app()->theme->config->disableGridRowDivs) + { return $model; + } $ct = -1; $next = 0; @@ -502,31 +538,37 @@ protected function createBookends($model) { $ct++; if ($ct == 0) + { $model[$ct]->rowBookendFront = true; + } + if ($next == 1) { $model[$ct]->rowBookendFront = true; $next = 0; } + if ((1 + $ct) % $this->gridProductsPerRow == 0) { $model[$ct]->rowBookendBack = true; $next = 1; } } + $model[count($model) - 1]->rowBookendBack = true; //Last item must always close div return $model; } protected function afterRender($view, &$output) { - parent::afterRender($view,$output); + parent::afterRender($view, $output); //Yii::app()->facebook->addJsCallback($js); // use this if you are registering any $js code you want to run asyc - if (_xls_facebook_login()) + { Yii::app()->facebook->initJs($output); // this initializes the Facebook JS SDK on all pages - //Yii::app()->facebook->renderOGMetaTags(); //we don't need this because it was already in our _main.php + } + return true; } @@ -540,25 +582,23 @@ public function getMenuTree() $objTree = Category::GetTree() + CustomPage::GetTree(); ksort($objTree); - if(_xls_get_conf('ENABLE_FAMILIES', 0)>0) + if(_xls_get_conf('ENABLE_FAMILIES', 0) > 0) { - $families = Family::GetTree(); $familyMenu['families_brands_menu'] = array( - 'text'=>CHtml::link(Yii::app()->params['ENABLE_FAMILIES_MENU_LABEL'],$this->createUrl("search/browse",array('brand'=>'*'))), - 'label'=>Yii::app()->params['ENABLE_FAMILIES_MENU_LABEL'], - 'link'=>$this->createUrl("search/browse",array('brand'=>'*')), - 'url'=>$this->createUrl("search/browse",array('brand'=>'*')), - 'id'=>0, - 'child_count'=>count($families), - 'hasChildren'=>1, - 'children'=>$families, - 'items'=>$families + 'text' => CHtml::link(Yii::app()->params['ENABLE_FAMILIES_MENU_LABEL'], $this->createUrl("search/browse", array('brand' => '*'))), + 'label' => Yii::app()->params['ENABLE_FAMILIES_MENU_LABEL'], + 'link' => $this->createUrl("search/browse", array('brand' => '*')), + 'url' => $this->createUrl("search/browse", array('brand' => '*')), + 'id' => 0, + 'child_count' => count($families), + 'hasChildren' => 1, + 'children' => $families, + 'items' => $families ); switch (_xls_get_conf('ENABLE_FAMILIES', 0)) { - case 3: $objFullTree = $families + $objTree; ksort($objFullTree); @@ -569,13 +609,13 @@ public function getMenuTree() case 1: $objFullTree = $objTree + $familyMenu; break; //onbottom - } + } else { + $objFullTree = $objTree; + } - } else $objFullTree = $objTree; - - $this->objFullTree = $objFullTree; - return $this->objFullTree; + $this->_objFullTree = $objFullTree; + return $this->_objFullTree; } /** @@ -585,18 +625,25 @@ public function getMenuTree() */ public function getMenuTreeTop() { - if ($this->objFullTree === null) - $this->objFullTree = $this->MenuTree; + if ($this->_objFullTree === null) + { + $this->_objFullTree = $this->MenuTree; + } - foreach($this->objFullTree as $key => $menuItem) + foreach($this->_objFullTree as $key => $menuItem) { if(isset($menuItem['children'])) - unset($this->objFullTree[$key]['children']); + { + unset($this->_objFullTree[$key]['children']); + } + if(isset($menuItem['items'])) - unset($this->objFullTree[$key]['items']); + { + unset($this->_objFullTree[$key]['items']); + } } - return $this->objFullTree; + return $this->_objFullTree; } /** @@ -608,9 +655,9 @@ public function getMenuTreeTop() * @param string $ampersand * @return string */ - public function createAbsoluteUrl($route,$params=array(),$schema='',$ampersand='&') + public function createAbsoluteUrl($route, $params = array(), $schema = '', $ampersand = '&') { - return Yii::app()->createAbsoluteUrl($route,$params,$schema,$ampersand); + return Yii::app()->createAbsoluteUrl($route, $params, $schema, $ampersand); } /** @@ -620,7 +667,10 @@ public function createAbsoluteUrl($route,$params=array(),$schema='',$ampersand=' public function getIsCloud() { if (Yii::app()->params['LIGHTSPEED_CLOUD'] > 0) + { return true; + } + return false; } @@ -631,7 +681,10 @@ public function getIsCloud() public function getIsMT() { if (Yii::app()->params['LIGHTSPEED_MT'] > 0) + { return true; + } + return false; } @@ -641,14 +694,17 @@ public function getIsMT() */ public function getIsHosted() { - if(Yii::app()->params['LIGHTSPEED_HOSTING']>0) + if(Yii::app()->params['LIGHTSPEED_HOSTING'] > 0) + { return true; + } + return false; } protected function verifyPreviewThemeKey($strThemeName, $strKey) { - return ($strKey === substr(md5($strThemeName.gmdate('d')),0,10)); + return ($strKey === substr(md5($strThemeName.gmdate('d')), 0, 10)); } protected function registerPreviewThemeScript($strThemeName, $strkey) @@ -659,8 +715,7 @@ protected function registerPreviewThemeScript($strThemeName, $strkey) $script .= "$('div.product_cell_label').each(function(elem) { $(this).attr('onclick', $(this).attr('onclick').substring(0,$(this).attr('onclick').length-1) + '?theme=$strThemeName&themekey=$strkey\"'); });"; $script .= "$('div.wishlistnew').each(function(elem) { $(this).attr('onclick', $(this).attr('onclick').substring(0,$(this).attr('onclick').length-1) + '?theme=$strThemeName&themekey=$strkey\"'); });"; - Yii::app()->clientScript->registerScript('themepreview',$script,CClientScript::POS_END); - + Yii::app()->clientScript->registerScript('themepreview', $script, CClientScript::POS_END); } /** diff --git a/core/protected/components/CustomPageUrlRule.php b/core/protected/components/CustomPageUrlRule.php index 616db958..e7d2893d 100644 --- a/core/protected/components/CustomPageUrlRule.php +++ b/core/protected/components/CustomPageUrlRule.php @@ -5,60 +5,71 @@ class CustomPageUrlRule extends CBaseUrlRule { public $connectionID = 'db'; - public function createUrl($manager,$route,$params,$ampersand) + public function createUrl($manager, $route, $params, $ampersand) { - if ($route=="site/index") { - - $ct=0; + if ($route == "site/index") + { + $ct = 0; $retString = ""; - foreach ($params as $key=>$val) + foreach ($params as $key => $val) + { $retString .= ($ct++ > 0 ? $ampersand : "?").$key."=".$val; + } return $retString; } - if ($route==='search/browse') + if ($route === 'search/browse') { //This route may be a category view or a searchfield search - $ct=0; - if (isset($params['cat'])) { + $ct = 0; + if (isset($params['cat'])) + { $retString = $params['cat']; unset($params['cat']); } elseif (isset($params['search/browse'])) $retString = "search/browse"; - else $retString = 'search/browse'; + else { + $retString = 'search/browse'; + } - foreach ($params as $key=>$val) + foreach ($params as $key => $val) + { if ($val != 'cat' && $val != '') + { $retString .= ($ct++ > 0 ? $ampersand : "?").$key."=".$val; + } + } return $retString; } - if($route=="custompage/index") + if($route == "custompage/index") { $id = $params['id']; $objCatTest = Category::LoadByRequestUrl($id); if (!is_null($objCatTest)) + { $id .= "/".URLPattern::CustomPage; //avoid conflicting Custom Page and Product URL + } + return $id; } - return false; // this rule does not apply } - public function parseUrl($manager,$request,$pathInfo,$rawPathInfo) + public function parseUrl($manager, $request, $pathInfo, $rawPathInfo) { $pathInfo = urlencode($pathInfo); if (preg_match('/^[a-zA-Z0-9%()\-_\.]+$/', $pathInfo, $matches)) { - - if (!empty($matches)) { - + if (!empty($matches)) + { $objCategory = Category::LoadByRequestUrl($matches[0]); - if ($objCategory instanceof Category) { + if ($objCategory instanceof Category) + { $_GET['cat'] = $matches[0]; return 'search/browse'; } @@ -69,17 +80,19 @@ public function parseUrl($manager,$request,$pathInfo,$rawPathInfo) $_GET['id'] = $objCustomPage->request_url; //Reserved keyword for contact us form - if ($matches[0]=="contact-us") + if ($matches[0] == "contact-us") + { return "custompage/contact"; - else - return "custompage/index"; + } else { + return "custompage/index"; + } } else { return false; } } - } + return false; // this rule does not apply } -} \ No newline at end of file +} diff --git a/core/protected/components/DbConnection.php b/core/protected/components/DbConnection.php index 97cdcf76..e2a321c2 100644 --- a/core/protected/components/DbConnection.php +++ b/core/protected/components/DbConnection.php @@ -3,5 +3,4 @@ class DbConnection extends CDbConnection { public $ttl; - -} \ No newline at end of file +} diff --git a/core/protected/components/FBIdentity.php b/core/protected/components/FBIdentity.php index b0a16150..c1b81967 100755 --- a/core/protected/components/FBIdentity.php +++ b/core/protected/components/FBIdentity.php @@ -6,119 +6,115 @@ */ class FBIdentity extends CUserIdentity { - const ERROR_DUAL_ACCOUNTS = 100; - const ERROR_NOT_APPROVED=101; - - //inherit username, password - /** - * - * @var type int - */ - public $_id; - - /** - * Overrided parent method - * @return type - */ - public function getId() - { - return $this->_id; - } - - /** - * Authenticate user - * @return type - */ - public function authenticate() - { - - $user = Customer::model()->findByAttributes(array('facebook'=>$this->password)); - if($user instanceof Customer) - { - - $this->loginHousekeeping($user); - } - else - { - //We didn't find the Facebook ID in the database, but let's see if the user has an account already - - $user = Customer::model()->findByAttributes(array('email'=>$this->username)); - if($user instanceof Customer ) //We found an existing account under this email - { - if(is_null($user->facebook)) - {//We found an account, merge them - $user->facebook = $this->password; - $user->save(); - $this->loginHousekeeping($user); - } else { - //Somehow we've found an existing account with an email from facebook but not the same ID - //Clear Facebook ID and bail, this is a serious conflict - $user->facebook = $this->password; - $user->save(); - $this->redirect(Yii::app()->homeUrl); - } - - } else { - - //New user to our site using Facebook, so set up an account - $model = new Customer(); - $model->scenario = 'createfb'; - $results = Yii::app()->facebook->api('/me'); - $model->first_name = $results['first_name']; - $model->last_name = $results['last_name']; - $model->email = $results['email']; - $model->email_repeat = $results['email']; - $model->record_type = Customer::REGISTERED; + const ERROR_NOT_APPROVED = 101; + + /** + * + * @var type int + */ + private $_id; + + /** + * Overrided parent method + * @return type + */ + public function getId() + { + return $this->_id; + } + + /** + * Authenticate user + * @return type + */ + public function authenticate() + { + + $user = Customer::model()->findByAttributes(array('facebook' => $this->password)); + if($user instanceof Customer) + { + $this->loginHousekeeping($user); + } else { + //We didn't find the Facebook ID in the database, but let's see if the user has an account already + + $user = Customer::model()->findByAttributes(array('email' => $this->username)); + if($user instanceof Customer) + { + //We found an existing account under this email + if(is_null($user->facebook)) + { + //We found an account, merge them + $user->facebook = $this->password; + $user->save(); + $this->loginHousekeeping($user); + } else { + //Somehow we've found an existing account with an email from facebook but not the same ID + //Clear Facebook ID and bail, this is a serious conflict + $user->facebook = $this->password; + $user->save(); + $this->redirect(Yii::app()->homeUrl); + } + } else { + //New user to our site using Facebook, so set up an account + $model = new Customer(); + $model->scenario = 'createfb'; + $results = Yii::app()->facebook->api('/me'); + $model->first_name = $results['first_name']; + $model->last_name = $results['last_name']; + $model->email = $results['email']; + $model->email_repeat = $results['email']; + $model->record_type = Customer::REGISTERED; $model->newsletter_subscribe = 1; - $model->facebook = $results['id']; - - if(_xls_get_conf('MODERATE_REGISTRATION',0)==1) - { - $this->errorCode = self::ERROR_NOT_APPROVED; - $model->allow_login=Customer::UNAPPROVED_USER; - } - else - { - $model->allow_login=Customer::NORMAL_USER; - if(!$model->save()) - { - Yii::log("Error creating Facebook account ". - print_r($model->getErrors(),true), 'error', 'application.'.__CLASS__.".".__FUNCTION__); - - die("A serious error has occurred creating a Facebook account"); - } - - $this->loginHousekeeping($model); - } - - } - + $model->facebook = $results['id']; + + if(_xls_get_conf('MODERATE_REGISTRATION', 0) == 1) + { + $this->errorCode = self::ERROR_NOT_APPROVED; + $model->allow_login = Customer::UNAPPROVED_USER; + } else { + $model->allow_login = Customer::NORMAL_USER; + if(!$model->save()) + { + Yii::log( + "Error creating Facebook account ". + print_r($model->getErrors(), true), + 'error', + 'application.'.__CLASS__.".".__FUNCTION__ + ); + + die("A serious error has occurred creating a Facebook account"); + } + + $this->loginHousekeeping($model); + } + } + } - } - return $this->errorCode; - } + } protected function loginHousekeeping($user) - { + { - $this->_id = $user->id; + $this->_id = $user->id; - $this->setState('fullname', $user->first_name.' '.$user->last_name); - $this->setState('firstname', $user->first_name); - $this->setState('profilephoto',Yii::app()->facebook->getProfilePicture('square')); - $this->setState('facebook',true); + $this->setState('fullname', $user->first_name.' '.$user->last_name); + $this->setState('firstname', $user->first_name); + $this->setState('profilephoto', Yii::app()->facebook->getProfilePicture('square')); + $this->setState('facebook', true); - $user->last_login = new CDbExpression('NOW()'); + $user->last_login = new CDbExpression('NOW()'); - if ($user->allow_login == Customer::ADMIN_USER) - $this->setState('role', 'admin'); - else - $this->setState('role', 'user'); + if ($user->allow_login == Customer::ADMIN_USER) + { + $this->setState('role', 'admin'); + } else { + $this->setState('role', 'user'); + } - $user->save(); - $this->errorCode = self::ERROR_NONE; - } + $user->save(); + $this->errorCode = self::ERROR_NONE; + } } diff --git a/core/protected/components/HtmlToText.php b/core/protected/components/HtmlToText.php index 3461ffae..d774285d 100644 --- a/core/protected/components/HtmlToText.php +++ b/core/protected/components/HtmlToText.php @@ -26,16 +26,18 @@ * @param html the input HTML * @return the HTML converted, as best as possible, to text */ -class HtmlToText { - - +class HtmlToText +{ + // @codingStandardsIgnoreStart public function convert_html_to_text($html) { + // @codingStandardsIgnoreEnd $html = $this->fix_newlines($html); $doc = new DOMDocument(); try { $doc->loadHTML($html); } + catch (Exception $e) { Yii::log("Error creating plain text email from receipt ".$e, 'error', 'application.'.__CLASS__.".".__FUNCTION__); @@ -61,7 +63,9 @@ public function convert_html_to_text($html) { * @param text text with any number of \r, \r\n and \n combinations * @return the fixed text */ + // @codingStandardsIgnoreStart public function fix_newlines($text) { + // @codingStandardsIgnoreEnd // replace \r\n to \n $text = str_replace("\r\n", "\n", $text); // remove \rs @@ -70,44 +74,66 @@ public function fix_newlines($text) { return $text; } + // @codingStandardsIgnoreStart public function next_child_name($node) { + // @codingStandardsIgnoreEnd // get the next child $nextNode = $node->nextSibling; - while ($nextNode != null) { - if ($nextNode instanceof DOMElement) { + while ($nextNode != null) + { + if ($nextNode instanceof DOMElement) + { break; } + $nextNode = $nextNode->nextSibling; } + $nextName = null; - if ($nextNode instanceof DOMElement && $nextNode != null) { + if ($nextNode instanceof DOMElement && $nextNode != null) + { $nextName = strtolower($nextNode->nodeName); } return $nextName; } - public function prev_child_name($node) { + + // @codingStandardsIgnoreStart + public function prev_child_name($node) + // @codingStandardsIgnoreEnd + { // get the previous child $nextNode = $node->previousSibling; - while ($nextNode != null) { - if ($nextNode instanceof DOMElement) { + while ($nextNode != null) + { + if ($nextNode instanceof DOMElement) + { break; } + $nextNode = $nextNode->previousSibling; } + $nextName = null; - if ($nextNode instanceof DOMElement && $nextNode != null) { + if ($nextNode instanceof DOMElement && $nextNode != null) + { $nextName = strtolower($nextNode->nodeName); } return $nextName; } - public function iterate_over_node($node) { - if ($node instanceof DOMText) { + // @codingStandardsIgnoreStart + public function iterate_over_node($node) + // @codingStandardsIgnoreEnd + { + if ($node instanceof DOMText) + { return preg_replace("/\\s+/im", " ", $node->wholeText); } - if ($node instanceof DOMDocumentType) { + + if ($node instanceof DOMDocumentType) + { // ignore return ""; } @@ -118,7 +144,8 @@ public function iterate_over_node($node) { $name = strtolower($node->nodeName); // start whitespace - switch ($name) { + switch ($name) + { case "hr": return "------\n"; @@ -156,16 +183,20 @@ public function iterate_over_node($node) { //$output .= "[$name,$nextName]"; if($node->childNodes) - for ($i = 0; $i < $node->childNodes->length; $i++) { - $n = $node->childNodes->item($i); + { + for ($i = 0; $i < $node->childNodes->length; $i++) + { + $n = $node->childNodes->item($i); - $text = $this->iterate_over_node($n); + $text = $this->iterate_over_node($n); - $output .= $text; + $output .= $text; + } } // end whitespace - switch ($name) { + switch ($name) + { case "style": case "head": case "title": @@ -187,25 +218,32 @@ public function iterate_over_node($node) { case "br": // add one line if ($nextName != "div") + { $output .= "\n"; + } break; case "div": // add one line only if the next child isn't a div if ($nextName != "div" && $nextName != null) + { $output .= "\n"; + } break; case "a": // links are returned in [text](link) format $href = $node->getAttribute("href"); - if ($href == null) { + if ($href == null) + { // it doesn't link anywhere - if ($node->getAttribute("name") != null) { + if ($node->getAttribute("name") != null) + { $output = "[$output]"; } } else { - if ($href == $output) { + if ($href == $output) + { // link to the same address: just use link $output; } else { @@ -215,7 +253,8 @@ public function iterate_over_node($node) { } // does the next node require additional whitespace? - switch ($nextName) { + switch ($nextName) + { case "h1": case "h2": case "h3": case "h4": case "h5": case "h6": $output .= "\n"; break; diff --git a/core/protected/components/HttpRequest.php b/core/protected/components/HttpRequest.php index 3c67dd35..78eed6ad 100644 --- a/core/protected/components/HttpRequest.php +++ b/core/protected/components/HttpRequest.php @@ -25,7 +25,7 @@ protected function normalizeRequest() foreach($this->enableCsrfValidationRoutes as $route) { - if(strpos($url,$route) === 0) + if(strpos($url, $route) === 0) { $enableValidation = true; break; @@ -34,7 +34,7 @@ protected function normalizeRequest() if (!$enableValidation) { - Yii::app()->detachEventHandler('onBeginRequest',array($this,'validateCsrfToken')); + Yii::app()->detachEventHandler('onBeginRequest', array($this,'validateCsrfToken')); } } } @@ -52,9 +52,10 @@ public function getCsrfToken() $csrfToken = $session->itemAt($this->csrfTokenName); if($csrfToken === null) { - $csrfToken = sha1(uniqid(mt_rand(),true)); + $csrfToken = sha1(uniqid(mt_rand(), true)); $session->add($this->csrfTokenName, $csrfToken); } + $this->_csrfToken = $csrfToken; } @@ -77,7 +78,7 @@ public function validateCsrfToken($event) { $tokenFromSession = $session->itemAt($this->csrfTokenName); $tokenFromPost = $_POST[$this->csrfTokenName]; - $valid=$tokenFromSession === $tokenFromPost; + $valid = $tokenFromSession === $tokenFromPost; } else { @@ -91,4 +92,4 @@ public function validateCsrfToken($event) } } } -} \ No newline at end of file +} diff --git a/core/protected/components/Shipping.php b/core/protected/components/Shipping.php index e0ada909..72a6316e 100644 --- a/core/protected/components/Shipping.php +++ b/core/protected/components/Shipping.php @@ -195,10 +195,10 @@ protected static function addRatesToShippingProviders($arrShippingProvider) */ public static function getCartScenarios($checkoutForm) { - $logLevel = 'error'; + $logLevel = 'info'; if (CPropertyValue::ensureBoolean(_xls_get_conf('DEBUG_SHIPPING', false)) === true) { - $logLevel = 'info'; + $logLevel = 'error'; } // TODO: This, and the setting of hasTaxModeChanged, should be @@ -210,6 +210,16 @@ public static function getCartScenarios($checkoutForm) // values so we need to save the current value. $savedTaxId = Yii::app()->shoppingcart->tax_code_id; $cart = Yii::app()->shoppingcart->getModel(); + + // The call to setTaxCodeByCheckoutForm() on the shopping cart will call + // recalculateAndSave(). That call is going to add taxes on shipping by + // calling updateTaxShipping(). The first run will have the correct values. + // On later runs, we will have taxes set in the shopping cart and add more + // when we call updateTaxShipping(). Plus, we used to also make a call to + // recalculateAndSave() while going through the shipping providers. Then we + // would call AddTaxes() which would add taxes on top of taxes. + $cart->updateTaxExclusive(); + $savedStorePickup = $cart->blnStorePickup; // Get the list of shipping modules. @@ -242,8 +252,6 @@ public static function getCartScenarios($checkoutForm) $cart->blnStorePickup = false; } - $cart->recalculateAndSave(); - // Get the "shipping" product, which may vary from module to module. $strShippingProduct = $shippingProvider['component']->LsProduct; Yii::log( @@ -271,18 +279,19 @@ public static function getCartScenarios($checkoutForm) { $priorityPrice = $priority['price']; $includeTaxInShippingPrice = false; + $shippingTaxValues = array(); if (Yii::app()->params['SHIPPING_TAXABLE'] == '1') { - $taxes = Tax::CalculatePricesWithTax( + $shippingTaxPrices = Tax::calculatePricesWithTax( $priority['price'], Yii::app()->shoppingcart->tax_code_id, $intShipProductLsid ); - Yii::log("Shipping Taxes retrieved " . print_r($taxes, true), $logLevel, 'application.'.__CLASS__.".".__FUNCTION__); - // TODO: WS-3525 Refactor Tax::CalculatePricesWithTax to return an associative array. - $taxOnShipping = $taxes[1]; + Yii::log("Shipping Taxes retrieved " . print_r($shippingTaxPrices, true), $logLevel, 'application.'.__CLASS__.".".__FUNCTION__); + + $shippingTaxValues = $shippingTaxPrices['arrTaxValues']; if (Yii::app()->params['TAX_INCLUSIVE_PRICING'] == '1') { $includeTaxInShippingPrice = true; @@ -290,9 +299,11 @@ public static function getCartScenarios($checkoutForm) if ($includeTaxInShippingPrice === true) { - $priorityPrice = $taxes[0]; - } else { - Yii::app()->shoppingcart->AddTaxes($taxOnShipping); + $priorityPrice = $shippingTaxPrices['fltSellTotalWithTax']; + } + else + { + Yii::app()->shoppingcart->AddTaxes($shippingTaxValues); } } @@ -339,7 +350,7 @@ public static function getCartScenarios($checkoutForm) // Remove shipping taxes to accommodate the next shipping priority in the loop. if (Yii::app()->params['SHIPPING_TAXABLE'] == '1' && $includeTaxInShippingPrice === false) { - Yii::app()->shoppingcart->SubtractTaxes($taxOnShipping); + Yii::app()->shoppingcart->SubtractTaxes($shippingTaxValues); } } } diff --git a/core/protected/components/ShoppingCart.php b/core/protected/components/ShoppingCart.php index 1d328d53..e2dc4fe5 100644 --- a/core/protected/components/ShoppingCart.php +++ b/core/protected/components/ShoppingCart.php @@ -84,22 +84,13 @@ public function getModel() if (is_null($objCart)) { // TODO: We should probably fix this behaviour: - // If we don't use InitializeCart() here, then we end up with a tax_code_id=NULL, + // If we don't use initialize() here, then we end up with a tax_code_id=NULL, // which is fine, except that in models/Cart.php beforeValidate() we explicitly set // the tax_code_id to use the NOTAX tax code if tax_code_id is null. In the case // of TAX_INCLUSIVE stores, this is definitely not what we want. - $objCart = Cart::InitializeCart(); - if ($intCustomerId !== null) - { - //Set the customer_id here so that setTaxCodeByDefaultShippingAddress() - //will pick it up later on and load the cart with customer info. - $objCart->customer_id = $intCustomerId; - Yii::app()->user->setState('cartid', $objCart->id); - } + $objCart = Cart::initialize($objCustomer); } - } - else - { + } else { $objCart = Cart::model()->findByPk($intSessionCartId); //We don't want to create a new cart if the cart is currently active in session @@ -118,17 +109,20 @@ public function getModel() $objCart->cart_type ), 'error', - 'application.' . __CLASS__ . "." . __FUNCTION__ + 'application.'.__CLASS__.".".__FUNCTION__ ); - $objCart = Cart::InitializeCart(); - Yii::app()->user->setState('cartid', $objCart->id); + $objCart = Cart::initialize($objCustomer); } } if ($intCustomerId !== null) { - $objCart->customer_id = $intCustomerId; //Need this for recalulateAndSave() + $objCart->customer_id = $intCustomerId; + } + + if ($objCart->item_count > 0) + { $objCart->recalculateAndSave(); } @@ -138,6 +132,7 @@ public function getModel() return $this->_model; } + /** * Since calling our model doesn't necessarily really create a db record (to avoid blank carts all over the place), * this function purposely creates a record when we need one (i.e. when adding a product to the cart) @@ -145,11 +140,10 @@ public function getModel() protected function createCart() { $intCartId = Yii::app()->user->getState('cartid'); - Yii::log("Creating cart, existing id is " . $intCartId, 'info', 'application.' . __CLASS__ . "." . __FUNCTION__); + Yii::log("Creating cart, existing id is " . $intCartId, 'info', 'application.'.__CLASS__.".".__FUNCTION__); if (empty($intCartId) && !Yii::app()->isCommonSSL) { - $objCustomer = Customer::GetCurrent(); $intCustomerid = null; @@ -163,9 +157,10 @@ protected function createCart() { $objCart = Cart::LoadLastCartInProgress($intCustomerid); } + if (is_null($objCart)) { - $objCart = Cart::InitializeCart(); + $objCart = Cart::initializeAndSave(); } $this->_model = $objCart; @@ -179,8 +174,8 @@ public function getIsActive() { return false; } - else return true; + return true; } /** @@ -193,23 +188,19 @@ public function loginMerge($objCartToMerge = null) if (is_null($objCartToMerge) === false) { $objCartInProgress = $objCartToMerge; - } - else - { + } else { $objCartInProgress = Cart::LoadLastCartInProgress(Yii::app()->user->id, $this->id); } - if ($objCartInProgress) + if ($objCartInProgress instanceof Cart) { - Yii::log("Found prior cart " . $objCartInProgress->id, 'info', 'application.' . __CLASS__ . "." . __FUNCTION__); + Yii::log("Found prior cart " . $objCartInProgress->id, 'info', 'application.'.__CLASS__.".".__FUNCTION__); if (count($this->cartItems) == 0) { $this->_model = $objCartInProgress; $arrPastItems = array(); - } - else - { + } else { $arrPastItems = $objCartInProgress->cartItems; } @@ -220,7 +211,7 @@ public function loginMerge($objCartToMerge = null) { $objProduct = Product::model()->findbyPk($objItem->product_id); - //we strip any discount from another cart usu. promo code + // We strip any discount from another cart usu. promo code. $retVal = $this->model->AddProduct( $objProduct, $objItem->qty, @@ -242,7 +233,8 @@ public function loginMerge($objCartToMerge = null) } } - //If we aren't being passed a cart from a share (that we don't want to delete), then remove the old cart in progress + // If we aren't being passed a cart from a share (that we don't + // want to delete), then remove the old cart in progress. if (is_null($objCartToMerge)) { Yii::app()->user->setFlash('success', Yii::t('cart', 'Your prior cart has been restored.')); @@ -251,19 +243,21 @@ public function loginMerge($objCartToMerge = null) $this->model->UpdateMissingProducts(); } - } - $this->model->customer_id = Yii::app()->user->id; - $this->model->datetime_cre = new CDbExpression('NOW()'); //Reset time to current time - if (!$this->model->save()) - { - Yii::log("Error saving cart " . print_r($this->model->getErrors(), true), 'error', 'application.' . __CLASS__ . "." . __FUNCTION__); + $this->model->customer_id = Yii::app()->user->id; + $this->model->datetime_cre = new CDbExpression('NOW()'); //Reset time to current time + if (!$this->model->save()) + { + Yii::log("Error saving cart " . print_r($this->model->getErrors(), true), 'error', 'application.' . __CLASS__ . "." . __FUNCTION__); + } + + $this->recalculateAndSave(); + $this->_model = Cart::model()->findByPk($this->id); + Yii::app()->user->setState('cartid', $this->id); + return true; } - $this->recalculateAndSave(); - $this->_model = Cart::model()->findByPk($this->id); - Yii::app()->user->setState('cartid', $this->id); - return true; + return false; } /** @@ -289,7 +283,7 @@ public function loginQuote($objDocument = null) // Merge in items from our quote to the cart. if (count($arrPastItems) > 0) { - foreach ($arrPastItems as $objItem) + foreach($arrPastItems as $objItem) { $objProduct = Product::model()->findbyPk($objItem->product_id); $retVal = $this->model->AddProduct( @@ -314,7 +308,11 @@ public function loginQuote($objDocument = null) $this->model->datetime_cre = new CDbExpression('NOW()'); //Reset time to current time if (!$this->model->save()) { - Yii::log("Error saving cart " . print_r($this->model->getErrors(), true), 'error', 'application.' . __CLASS__ . "." . __FUNCTION__); + Yii::log( + "Error saving cart ".print_r($this->model->getErrors(), true), + 'error', + 'application.'.__CLASS__.".".__FUNCTION__ + ); } $this->recalculateAndSave(); @@ -340,20 +338,20 @@ public function verifyPrices() foreach ($this->cartItems as $item) { - //Make sure our object is current and not cached through our relations + // Make sure our object is current and not cached through our relations. $objProduct = Product::model()->findByPk($item->product_id); if ($item->sell_base != $objProduct->PriceValue) { $strFlash .= Yii::t( - 'cart', - 'The item {item} in your cart has {updown} in price to {price}.', - array( - '{item}' => $item->description, - '{updown}' => ($item->sell_base > $objProduct->PriceValue ? Yii::t('cart', 'decreased') : Yii::t('cart', 'increased')), - '{price}' => $objProduct->getPrice(1, $this->IsTaxIn) - ) - ) . '
'; + 'cart', + 'The item {item} in your cart has {updown} in price to {price}.', + array( + '{item}' => $item->description, + '{updown}' => ($item->sell_base > $objProduct->PriceValue ? Yii::t('cart', 'decreased') : Yii::t('cart', 'increased')), + '{price}' => $objProduct->getPrice(1, $this->IsTaxIn) + ) + ) . '
'; $arrItem['product'] = $objProduct; $arrItem['qty'] = $item->qty; @@ -393,6 +391,7 @@ public function getName() return $this->model->name; } + public function getCartQty() { @@ -423,7 +422,6 @@ public function assign($id) Yii::app()->user->setState('cartid', $id); $this->setModelById($id); } - /** * Add a product to the cart. Defaults to qty 1 unless specified * @param $mixProduct @@ -435,7 +433,8 @@ public function assign($id) public function addProduct($mixProduct, $intQuantity = 1, $intGiftItemId = null, $auto = null) { $cartid = Yii::app()->user->getState('cartid'); - if (empty($cartid)) + + if (empty($cartid) && is_null($this->model)) { $this->createCart(); } @@ -443,9 +442,7 @@ public function addProduct($mixProduct, $intQuantity = 1, $intGiftItemId = null, if ($mixProduct instanceof Product) { $objProduct = $mixProduct; - } - else - { + } else { $objProduct = Product::model()->findByPk($mixProduct); } @@ -466,23 +463,22 @@ public function addProduct($mixProduct, $intQuantity = 1, $intGiftItemId = null, if (is_numeric($retVal) && is_null($auto)) //prevent circular logic adding { - foreach ($objProduct->productRelateds as $objProductAdditional) + foreach($objProduct->productRelateds as $objProductAdditional) { if (isset($objProductAdditional->related) && $objProductAdditional->related->IsAddable && $objProductAdditional->autoadd == 1 && - $objProductAdditional->related->master_model == 0 - ) + $objProductAdditional->related->master_model == 0) { $this->addProduct($objProductAdditional->related, $objProductAdditional->qty, null, true); } } } - return $retVal; + return $retVal; } - else return false; + return false; } /** @@ -509,8 +505,9 @@ public function save() $retVal = $this->model->save(); if (!$retVal) { - Yii::log("Error saving cart " . print_r($this->model->getErrors()), 'error', 'application.' . __CLASS__ . "." . __FUNCTION__); + Yii::log("Error saving cart " . print_r($this->model->getErrors()), 'error', 'application.'.__CLASS__.".".__FUNCTION__); } + return $retVal; } @@ -518,12 +515,13 @@ public function getErrors() { return $this->model->getErrors(); } - /** * Create a Link to view the cart after checkout. Used for receipt viewing. * @return mixed */ + // @codingStandardsIgnoreStart public function GenerateLink() + // @codingStandardsIgnoreEnd { return $this->model->GenerateLink(); } @@ -550,8 +548,10 @@ public function clearCart() { WishlistItem::model()->updateByPk($item->wishlist_item, array('cart_item_id' => null)); } + $item->delete(); } + $this->model->fk_promo_id = null; $this->model->save(); $this->model->refresh(); @@ -561,7 +561,9 @@ public function clearCart() return true; } + // @codingStandardsIgnoreStart public function UpdateMissingProducts() + // @codingStandardsIgnoreEnd { if (Yii::app()->user->getState('cartid') > 0 && isset($this->_model)) { @@ -589,9 +591,16 @@ public function removePromoCode() */ public function revalidatePromoCode() { + if (is_null($this->id)) + { + // If id is null then the cart has yet to be saved, which means it contains + // no products and therefore there is no promocode to be revalidated. + return; + } + if (isset($this->model) === false) { - // No Cart object, cannot revalidate. + // If model isn't set then there is no Cart object, cannot revalidate. return; } @@ -627,7 +636,9 @@ public function releaseCart() $this->_model = null; } + // @codingStandardsIgnoreStart public function UpdateItemQuantity($objItem, $qty) + // @codingStandardsIgnoreEnd { $this->clearCachedShipping(); return $this->model->UpdateItemQuantity($objItem, _xls_number_only($qty)); @@ -639,9 +650,7 @@ public function applyPromoCode($mixCode) if ($mixCode instanceof PromoCode) { $objPromoCode = $mixCode; - } - else - { + } else { $objPromoCode = PromoCode::LoadByCode($mixCode); } @@ -652,7 +661,7 @@ public function applyPromoCode($mixCode) } } - //These are pass-through functions which go currently to our cart object + // These are pass-through functions which go currently to our cart object. /** * True - cart should display tax inclusive prices @@ -688,7 +697,9 @@ public function completeUpdatePromoCode() $this->model->completeUpdatePromoCode(); } + // @codingStandardsIgnoreStart public function SetIdStr() + // @codingStandardsIgnoreEnd { $this->model->SetIdStr(); } @@ -708,17 +719,14 @@ public function assignCustomer($mixCustomer) if (is_numeric($mixCustomer)) { $objCustomer = Customer::model()->findByPk($mixCustomer); - } - else - { + } else { $objCustomer = $mixCustomer; } if ($objCustomer instanceof Customer) { - Yii::log("Assigning customer id #" . $objCustomer->id, 'info', 'application.' . __CLASS__ . "." . __FUNCTION__); + Yii::log("Assigning customer id #" . $objCustomer->id, 'info', 'application.'.__CLASS__.".".__FUNCTION__); $this->model->customer_id = $objCustomer->id; - $this->model->save(); return true; } @@ -735,12 +743,16 @@ public function recalculateAndSave() $this->model->recalculateAndSave(); } + // @codingStandardsIgnoreStart public function RecalculateInventoryOnCartItems() + // @codingStandardsIgnoreEnd { $this->model->RecalculateInventoryOnCartItems(); } + // @codingStandardsIgnoreStart public function UpdateWishList() + // @codingStandardsIgnoreEnd { $this->model->UpdateWishList(); } @@ -800,6 +812,77 @@ public static function displayNoTaxMessage() return false; } + /** + * Erase expired carts and their associated items. + * A cart is considered expired if + * 1. it was last modified over CART_LIFE days ago AND + * 2. it has no id_str associated with it AND + * 3. it is of type cart, giftregistry or awaitpayment AND + * 4. it has no items in it OR + * 5. it has no customer_id associated with it + * + * 1. AND 2. AND 3. AND (4. OR 5.) + * + * @return int The number of carts + items that were erased. + */ + public static function eraseExpired() { + // Erase carts older than CART_LIFE days. + $cartLife = CPropertyValue::ensureInteger(_xls_get_conf('CART_LIFE', 30)); + + // We can't use the class constants directly in the call to + // bindParam(), put them in variables first. + $cartType = CPropertyValue::ensureInteger(CartType::cart); + $giftRegistryType = CPropertyValue::ensureInteger(CartType::giftregistry); + $awaitPaymentType = CPropertyValue::ensureInteger(CartType::awaitpayment); + + $deleteSql = " + DELETE c, ci + FROM xlsws_cart c + LEFT JOIN xlsws_cart_item ci + ON c.id = ci.cart_id + WHERE + (c.customer_id IS NULL OR ci.id IS NULL) AND + (c.cart_type IN (:cart, :giftregistry, :awaitpayment) AND + c.modified < CURDATE() - INTERVAL :cartlife DAY AND + c.id_str IS NULL)"; + $deleteCommand = Yii::app()->db->createcommand($deleteSql); + $deleteCommand->bindparam(":cart", $cartType, PDO::PARAM_INT); + $deleteCommand->bindparam(":giftregistry", $giftRegistryType, PDO::PARAM_INT); + $deleteCommand->bindparam(":awaitpayment", $awaitPaymentType, PDO::PARAM_INT); + $deleteCommand->bindparam(":cartlife", $cartLife, PDO::PARAM_INT); + + $transaction = Yii::app()->db->beginTransaction(); + try + { + Yii::app()->db->createCommand("set foreign_key_checks = 0")->execute(); + $numErased = $deleteCommand->execute(); + Yii::app()->db->createCommand("set foreign_key_checks = 1")->execute(); + $transaction->commit(); + } catch(Exception $e) { + $transaction->rollback(); + } + + return $numErased; + } + + /** + * Optimize the tables related to the shopping cart. + * This is an administrative function and should be called with care. + * + * @return void + */ + public static function optimizeTables() { + Yii::app()->db->createCommand("OPTIMIZE table xlsws_cart")->execute(); + Yii::app()->db->createCommand("OPTIMIZE table xlsws_cart_item")->execute(); + Yii::app()->db->createCommand("OPTIMIZE table xlsws_customer")->execute(); + Yii::app()->db->createCommand("OPTIMIZE table xlsws_wish_list")->execute(); + Yii::app()->db->createCommand("OPTIMIZE table xlsws_wish_list_items")->execute(); + Yii::app()->db->createCommand("OPTIMIZE table xlsws_product")->execute(); + Yii::app()->db->createCommand("OPTIMIZE table xlsws_product_related")->execute(); + Yii::app()->db->createCommand("OPTIMIZE table xlsws_category")->execute(); + Yii::app()->db->createCommand("OPTIMIZE table xlsws_product_category_assn")->execute(); + } + /** * Check to see if the cart contains items that have quantity discounts * applied to them. If there is one element that those this method will @@ -832,8 +915,10 @@ public function displayPromoLine() * @param string $strName * @return int|mixed */ - public function __get($strName) { - switch ($strName) { + public function __get($strName) + { + switch ($strName) + { case 'attributes': return $this->model->attributes; @@ -850,7 +935,7 @@ public function __get($strName) { case 'TotalItemCount': case 'totalItemCount': - return $this->model->totalItemCount; + return $this->model->TotalItemCount; case 'tax1name': case 'tax1Name': @@ -891,9 +976,6 @@ public function __get($strName) { case 'TaxTotal': return $this->model->TaxTotal; - case 'IsTaxIn': - return $this->getIsTaxIn(); - case 'taxTotalFormatted': return _xls_currency($this->model->TaxTotal); case 'subtotal': @@ -914,8 +996,7 @@ public function __get($strName) { return $this->model->Taxes; case 'Total': - case 'total': - return $this->model->total; + return $this->total; case 'TotalFormatted': case 'totalFormatted': @@ -1006,7 +1087,7 @@ public function __get($strName) { return self::calculateOriginalSubtotal(); default: - //As a clever trick to get to our model through the component, + // As a clever trick to get to our model through the component. if (isset($this->model) && $strName != "model" && $this->model->hasAttribute($strName)) { return $this->model->$strName; @@ -1016,7 +1097,9 @@ public function __get($strName) { } + // @codingStandardsIgnoreStart private function calculateOriginalSubtotal() + // @codingStandardsIgnoreEnd { $originalSubTotal = 0; if ($this->model->cartItems) @@ -1035,19 +1118,20 @@ private function calculateOriginalSubtotal() * @param mixed $mixValue * @return mixed */ - public function __set($strName, $mixValue) { - switch ($strName) { - + public function __set($strName, $mixValue) + { + switch ($strName) + { case 'cartItems': return $this->model->cartItems; default: - //As a clever trick to get to our model through the component, + // As a clever trick to get to our model through the component, if ($strName != "model" && $this->model->hasAttribute($strName)) { - $this->model->__set($strName,$mixValue); + $this->model->__set($strName, $mixValue); } else { - return parent::__set($strName,$mixValue); + return parent::__set($strName, $mixValue); } } } diff --git a/core/protected/components/Theme.php b/core/protected/components/Theme.php index 672a1f90..5c197950 100644 --- a/core/protected/components/Theme.php +++ b/core/protected/components/Theme.php @@ -12,10 +12,11 @@ public static function hasAdminForm($strThemeName) { $model = Yii::app()->getComponent('wstheme')->getAdminModel($strThemeName); if($model) + { return true; - else + } else { return false; - + } } /** @@ -25,7 +26,7 @@ public static function hasAdminForm($strThemeName) */ public function getCssUrl($cssFile) { - //Just in case someone passed the .css as part of the $cssFile + // Just in case someone passed the .css as part of the $cssFile if (substr($cssFile, strlen($cssFile) - 4, 4) == ".css") { $cssFile = substr($cssFile, 0, -4); @@ -48,7 +49,7 @@ public function getCssUrl($cssFile) return parent::getBaseUrl()."/css/".$cssFile.".css"; } else { return str_replace("http:", "", _xls_custom_css_folder()). - "_customcss/".Yii::app()->theme->name."/".$cssFile.".css"; + "_customcss/" . Yii::app()->theme->name . "/" . $cssFile . ".css"; } } } else { @@ -68,7 +69,6 @@ public function cssUrl($cssFile) } - /** * Pass along theme config from the xlsws_modules table * @return ThemeConfig @@ -97,11 +97,11 @@ public function getInfo() { return new ThemeInfo(); } - - } +// @codingStandardsIgnoreStart class ThemeConfig +// @codingStandardsIgnoreEnd { /* @@ -115,11 +115,11 @@ public function __get($name) default: $arrConfig = Yii::app()->getComponent('wstheme')->getConfigValues(Yii::app()->theme->name); if(isset($arrConfig[$name])) + { return $arrConfig[$name]; - else return (_xls_get_conf($name,null)); + } + return (_xls_get_conf($name, null)); } - - } /* @@ -129,45 +129,48 @@ public function __set($name, $mixValue) { $arrConfig = Yii::app()->getComponent('wstheme')->getConfigValues(Yii::app()->theme->name); - $arrConfig[$name]=$mixValue; + $arrConfig[$name] = $mixValue; Yii::app()->getComponent('wstheme')->setConfigValues($arrConfig); return true; - } - - } + +// @codingStandardsIgnoreStart class ThemeInfo +// @codingStandardsIgnoreEnd { - /* - * Get a key from the module. If it's not defined, use the xlsws_configuration as a backup + * Get a key from the module. If it's not defined, use the + * xlsws_configuration as a backup */ public function __get($name) { switch($name) { - case 'cssfiles': $model = Yii::app()->getComponent('wstheme')->getAdminModel(Yii::app()->theme->name); if(!$model) + { return array('base','style'); + } + $form = new $model; $strCss = $form->cssfiles; - return explode(",",$strCss); + return explode(",", $strCss); break; default: $model = Yii::app()->getComponent('wstheme')->getAdminModel(Yii::app()->theme->name); - if(!$model) return null; - $form = new $model; - return $form->$name; + if(!$model) + { + return null; + } + $form = new $model(); + return $form->$name; } - } - } diff --git a/core/protected/components/UserIdentity.php b/core/protected/components/UserIdentity.php index fdfd8002..1a8e9c87 100644 --- a/core/protected/components/UserIdentity.php +++ b/core/protected/components/UserIdentity.php @@ -10,8 +10,8 @@ class UserIdentity extends CUserIdentity private $_id; - const ERROR_NOT_APPROVED=101; - const ERROR_PASSWORD_FACEBOOK=102; + const ERROR_NOT_APPROVED = 101; + const ERROR_PASSWORD_FACEBOOK = 102; /** @@ -23,24 +23,23 @@ public function authenticate() $user = $this->getCustomerRecord(); - if (!($user instanceof Customer) || $user->email !== $this->username) { + if (!($user instanceof Customer) || $user->email !== $this->username) + { $this->errorCode = self::ERROR_USERNAME_INVALID; } elseif ($user->allow_login != Customer::NORMAL_USER && $user->allow_login != Customer::ADMIN_USER) { $this->errorCode = self::ERROR_NOT_APPROVED; - } elseif (!$user->authenticate($this->password)) { - //is this an account that was set up via facebook login and doesn't have its own password? - if ($user->password=="facebook") + if ($user->password == "facebook") + { $this->errorCode = self::ERROR_PASSWORD_FACEBOOK; - else + } else { $this->errorCode = self::ERROR_PASSWORD_INVALID; - + } } else { - $this->successfullyLogin($user); - } + return !$this->errorCode; } @@ -48,7 +47,6 @@ public function authenticate() protected function hash($string) { return md5($string); - } public function getId() @@ -59,16 +57,19 @@ public function getId() public function getIsAdmin() { if ($this->_id) - if ($this->getState('role', 'customer')=="admin") + { + if ($this->getState('role', 'customer') == "admin") + { return true; + } + } return false; - } protected function getCustomerRecord() { - return Customer::model()->findByAttributes(array('email' => $this->username,'record_type'=>Customer::REGISTERED)); + return Customer::model()->findByAttributes(array('email' => $this->username,'record_type' => Customer::REGISTERED)); } protected function successfullyLogin($user) @@ -80,9 +81,11 @@ protected function successfullyLogin($user) $this->setState('profilephoto', Yii::app()->theme->baseUrl."/css/images/loginhead.png"); if ($user->allow_login == Customer::ADMIN_USER) + { $this->setState('role', 'admin'); - else + } else { $this->setState('role', 'user'); + } // Update the password storage format if ($user->password == $this->hash($this->password) || @@ -100,7 +103,7 @@ protected function successfullyLogin($user) if (!$user->save()) { - Yii::log("ERROR Saving user record ".print_r($user->getErrors(),true), 'error', 'application.'.__CLASS__.".".__FUNCTION__); + Yii::log("ERROR Saving user record ".print_r($user->getErrors(), true), 'error', 'application.'.__CLASS__.".".__FUNCTION__); } } -} \ No newline at end of file +} diff --git a/core/protected/components/WebServiceAction.php b/core/protected/components/WebServiceAction.php index 6688e342..853ab6fc 100644 --- a/core/protected/components/WebServiceAction.php +++ b/core/protected/components/WebServiceAction.php @@ -13,19 +13,19 @@ class WebServiceAction extends CWebServiceAction public function run() { - $hostInfo=Yii::app()->getRequest()->getHostInfo(); - $controller=$this->getController(); - $this->serviceUrl=$controller->createAbsoluteUrl($this->getId()); - $this->wsdlUrl=$controller->createAbsoluteUrl($this->getId())."?wsdl"; + $hostInfo = Yii::app()->getRequest()->getHostInfo(); + $controller = $this->getController(); + $this->serviceUrl = $controller->createAbsoluteUrl($this->getId()); + $this->wsdlUrl = $controller->createAbsoluteUrl($this->getId())."?wsdl"; //To reverse this wsdl thing, we do some trickery if(!isset($_GET['wsdl'])) - $_GET[$this->serviceVar]='1'; - else + { + $_GET[$this->serviceVar] = '1'; + } else { unset($_GET['wsdl']); + } parent::run(); } - - -} \ No newline at end of file +} diff --git a/core/protected/components/WebUser.php b/core/protected/components/WebUser.php index f6ece8ac..0fd15f02 100644 --- a/core/protected/components/WebUser.php +++ b/core/protected/components/WebUser.php @@ -41,9 +41,9 @@ public function getIsGuest() protected function afterLogin($fromCookie) { - if(!$fromCookie) + if (!$fromCookie) { - //Assign the user to the cart, if logged in + // Assign the user to the cart, if logged in Yii::app()->shoppingcart->assignCustomer(Yii::app()->user->id); // If the user is not a guest user, then update the tax destination @@ -57,18 +57,25 @@ protected function afterLogin($fromCookie) Yii::app()->shoppingcart->setTaxCodeByDefaultShippingAddress(); } - //Since we have successfully logged in, see if we have a cart in progress - Yii::app()->shoppingcart->loginMerge(); + // Since we have successfully logged in, see if we have a cart in progress + $cartInProgressFound = Yii::app()->shoppingcart->loginMerge(); - //Verify prices haven't changed - Yii::app()->shoppingcart->verifyPrices(); - - Yii::log("Cart ID is ".Yii::app()->shoppingcart->id, 'info', 'application.'.__CLASS__.".".__FUNCTION__); + // Recalculate and update the cart if prices of any cart items have changed + if ($cartInProgressFound === true) + { + Yii::app()->shoppingcart->verifyPrices(); + Yii::log("Cart ID is ".Yii::app()->shoppingcart->id, 'info', 'application.'.__CLASS__.".".__FUNCTION__); + } - //Display no-tax message if the customer's default shipping address is - //in no-tax destination in tax-inclusive mode - ShoppingCart::displayNoTaxMessage(); - } else { + // Display no-tax message if the customer's default shipping address is + // in no-tax destination in tax-inclusive mode + if (Yii::app()->params['TAX_INCLUSIVE_PRICING'] == 1) + { + ShoppingCart::displayNoTaxMessage(); + } + } + else + { Yii::log("User Login using cookie", 'info', 'application.'.__CLASS__.".".__FUNCTION__); } } @@ -94,8 +101,7 @@ protected function beforeLogout() try { $objCart->save(); - } - catch (Exception $objExc) { + } catch (Exception $objExc) { Yii::log('Failed to save cart with : ' . $objExc, 'error', 'application.'.__CLASS__.".".__FUNCTION__); } } diff --git a/core/protected/components/WsExtension.php b/core/protected/components/WsExtension.php index 35c96308..b272c94f 100644 --- a/core/protected/components/WsExtension.php +++ b/core/protected/components/WsExtension.php @@ -1,8 +1,7 @@ CheckoutForm = $mixForm; @@ -141,7 +156,7 @@ public function name() } else { - $strName = $this->strModuleName; + $strName = $this->_strModuleName; } if (isset($config['live'])) @@ -166,7 +181,7 @@ public function customer() { * * @return string */ - public function admin_name() { + public function adminName() { return $this->defaultName; } @@ -186,8 +201,12 @@ public function info() { * @param Cart $cart * @return string */ + // @codingStandardsIgnoreStart + // Renaming this could break custom payment methods. + // TODO: This method does not appear to be called anywhere, remove it. public function payment_method(Cart $cart) { + // @codingStandardsIgnoreEnd $config = $this->Config; if (isset($config['ls_payment_method'])) @@ -240,8 +259,11 @@ public function getAdminModelName() * */ public function getConfigValues($strClass = null) { + if (is_null($strClass)) + { + $strClass = get_class($this); + } - if (is_null($strClass)) $strClass = get_class($this); $arr = array(); $objModule = Modules::model()->findByAttributes(array('module' => $strClass)); @@ -291,7 +313,7 @@ public function getDefaultConfiguration() public function getVersion() { - return $this->version; + return $this->_version; } public function getAdminNameNormal() @@ -322,13 +344,13 @@ public function check() return false; } - //Remove possible "null" string which should be same as not set - if (isset($this->config['restrictcountry']) && $this->config['restrictcountry']=="null") + // Remove possible "null" string which should be same as not set + if (isset($this->config['restrictcountry']) && $this->config['restrictcountry'] == "null") { unset($this->config['restrictcountry']); } - //Check possible scenarios why we would not offer this type of shipping + // Check possible scenarios why we would not offer this type of shipping if (isset($this->config['restrictcountry'])) //we have a country restriction { switch($this->config['restrictcountry']) { @@ -342,7 +364,6 @@ public function check() return true; } } - return false; break; @@ -351,7 +372,6 @@ public function check() { return false; } - break; case 'AUNZ': @@ -359,7 +379,6 @@ public function check() { return false; } - break; case 'OUTSIDE': @@ -367,7 +386,6 @@ public function check() { return false; } - break; default: @@ -452,9 +470,13 @@ public function process() { * @param Cart $cart * @return unknown_type */ + // @codingStandardsIgnoreStart + // Renaming this could break custom payment methods. + // TODO: This does not appear to be used anywhere, remove it. public function paid_amount(Cart $cart) { - if ($this->admin_name() == "Cash On Delivery") + // @codingStandardsIgnoreEnd + if ($this->adminName() == "Cash On Delivery") { return 0.00; } @@ -471,7 +493,11 @@ public function paid_amount(Cart $cart) * * @return bool */ + // @codingStandardsIgnoreStart + // Renaming this could break custom payment methods. + // TODO: This does not appear to be used anywhere, remove it. public function uses_jumper() { + // @codingStandardsIgnoreEnd return false; } @@ -489,18 +515,20 @@ public function uses_jumper() { * - success => true| false * - output => */ + // @codingStandardsIgnoreStart + // Renaming this to respect coding standards could break custom payment integrations. public function gateway_response_process() { + // @codingStandardsIgnoreEnd return false; } - public function __get($strName) { switch ($strName) { case 'Name': return $this->name(); case 'AdminName': - return $this->admin_name(); + return $this->adminName(); case 'DefaultName': return $this->defaultName; @@ -537,4 +565,4 @@ public function __set($strName, $mixValue) { } } -} \ No newline at end of file +} diff --git a/core/protected/components/WsSoapException.php b/core/protected/components/WsSoapException.php index be3294dc..4e20bc36 100644 --- a/core/protected/components/WsSoapException.php +++ b/core/protected/components/WsSoapException.php @@ -18,4 +18,4 @@ public function __construct($message, $code = 0, Exception $previous = null) public function __toString() { return __CLASS__ . ": [{$this->code}]: {$this->message}\n"; } -} \ No newline at end of file +} diff --git a/core/protected/components/helpers.php b/core/protected/components/helpers.php index 3565af55..15f8b7f8 100644 --- a/core/protected/components/helpers.php +++ b/core/protected/components/helpers.php @@ -16,18 +16,24 @@ * @param mix optional default in case key is not found * @return string key value */ -function _xls_get_conf($strKey, $mixDefault = ""){ +// @codingStandardsIgnoreStart +function _xls_get_conf($strKey, $mixDefault = "") +// @codingStandardsIgnoreEnd +{ if (isset(Yii::app()->params[$strKey])) - return Yii::app()->params[$strKey]; - else { + return Yii::app()->params[$strKey]; + } else { $objKey = Configuration::model()->find('key_name=?', array($strKey)); - if (!$objKey) return $mixDefault; - else return $objKey->key_value; - } - + if (!$objKey) + { + return $mixDefault; + } else { + return $objKey->key_value; + } + } } /** @@ -36,29 +42,31 @@ function _xls_get_conf($strKey, $mixDefault = ""){ * @param string $strUrlPath optional * @return string url */ -function _xls_site_url($strUrlPath = '') { +// @codingStandardsIgnoreStart +function _xls_site_url($strUrlPath = '') +// @codingStandardsIgnoreEnd +{ Yii::log("Function deprecated, should use \$this->createAbsoluteUrl instead", 'info', 'application.'.__CLASS__.".".__FUNCTION__); return Yii::app()->createAbsoluteUrl($strUrlPath); - } +// @codingStandardsIgnoreStart function _xls_theme_config($strThemeName) +// @codingStandardsIgnoreEnd { - if(Theme::hasAdminForm($strThemeName)) + { return Yii::app()->getComponent('wstheme')->getAdminModel($strThemeName); - - - - + } $fnOptions = YiiBase::getPathOfAlias('webroot')."/themes/".$strThemeName."/config.xml"; if (file_exists($fnOptions)) { $strXml = file_get_contents($fnOptions); return new SimpleXMLElement($strXml); - } else return null; - + } else { + return null; + } } @@ -69,7 +77,6 @@ function _xls_theme_config($strThemeName) */ function getFile($url) { - $ch = curl_init(); curl_setopt($ch, CURLOPT_URL, $url); curl_setopt($ch, CURLOPT_VERBOSE, 0); @@ -82,54 +89,71 @@ function getFile($url) $resp = curl_exec($ch); curl_close($ch); return $resp; - } - /** * Download latest theme. We call this during install and also on the off chance that the default suddenly * goes missing. */ function downloadTheme($strTheme) { - $jLatest= getFile("http://"._xls_get_conf('LIGHTSPEED_UPDATER','updater.lightspeedretail.com')."/site/latesttheme/".XLSWS_VERSIONBUILD."/".$strTheme); + $jLatest = getFile("http://"._xls_get_conf('LIGHTSPEED_UPDATER', 'updater.lightspeedretail.com')."/site/latesttheme/".XLSWS_VERSIONBUILD."/".$strTheme); $result = json_decode($jLatest); if(empty($result)) - { Yii::log("ERROR attempting to locate latesttheme ".$strTheme." from Lightspeed", 'error', 'application.'.__CLASS__.".".__FUNCTION__); + { + Yii::log( + "ERROR attempting to locate latesttheme ".$strTheme." from Lightspeed", + 'error', + 'application.'.__CLASS__.".".__FUNCTION__ + ); return false; } $strWebstoreInstall = "http://cdn.lightspeedretail.com/webstore/themes/".$result->latest->filename; $data = getFile($strWebstoreInstall); - if (stripos($data,"404 - Not Found")>0 || empty($data)){ + if (stripos($data, "404 - Not Found") > 0 || empty($data)) + { Yii::log("ERROR downloading theme ".$strTheme." from Lightspeed CDN", 'error', 'application.'.__CLASS__.".".__FUNCTION__); return false; } - $f=file_put_contents("themes/".$result->latest->title.".zip", $data); + $f = file_put_contents("themes/".$result->latest->title.".zip", $data); if ($f) { require_once( YiiBase::getPathOfAlias('application.components'). '/zip.php'); - extractZip($result->latest->title.".zip",'',YiiBase::getPathOfAlias('webroot.themes')); + extractZip($result->latest->title.".zip", '', YiiBase::getPathOfAlias('webroot.themes')); @unlink("themes/".$result->latest->title.".zip"); - } - else { + } else { Yii::log("ERROR saving themes/".$result->latest->title.".zip", 'error', 'application.'.__CLASS__.".".__FUNCTION__); return false; } + return true; } + +// @codingStandardsIgnoreStart function _xls_regionalize($str) +// @codingStandardsIgnoreEnd { $c = Yii::app()->params['DEFAULT_COUNTRY']; switch ($str) { case 'color': - if ($c==224) return 'color'; else return 'colour'; + if ($c == 224) + { + return 'color'; + } else { + return 'colour'; + } case 'check': - if ($c==224) return 'check'; else return 'cheque'; + if ($c == 224) + { + return 'check'; + } else { + return 'cheque'; + } default: return $str; @@ -143,7 +167,9 @@ function _xls_regionalize($str) * @param $url * @return string */ +// @codingStandardsIgnoreStart function _xls_url_common_to_custom($url) +// @codingStandardsIgnoreEnd { return str_replace( "https://".Yii::app()->params['LIGHTSPEED_HOSTING_LIGHTSPEED_URL'], @@ -158,7 +184,9 @@ function _xls_url_common_to_custom($url) * @param $url * @return string */ +// @codingStandardsIgnoreStart function _xls_url_custom_to_common($url) +// @codingStandardsIgnoreEnd { return str_replace( "http://".Yii::app()->params['LIGHTSPEED_HOSTING_CUSTOM_URL'], @@ -174,16 +202,24 @@ function _xls_url_custom_to_common($url) * @param boolean ssl_attempt * @return string url */ -function _xls_site_dir($ssl_attempt = false) { +// @codingStandardsIgnoreStart +function _xls_site_dir($sslAttempt = false) +// @codingStandardsIgnoreEnd +{ $strSsl = 'http://'; $strHost = $_SERVER['HTTP_HOST'] . Yii::app()->getBaseUrl(false); - if ($ssl_attempt || + if ($sslAttempt || (isset($_SERVER['HTTPS']) && - ($_SERVER['HTTPS'] == 'on' || $_SERVER['HTTPS'] == '1'))) + ($_SERVER['HTTPS'] == 'on' || $_SERVER['HTTPS'] == '1'))) + { $strSsl = 'https://'; + } - if (substr($strHost,-1)=="/") $strHost = substr($strHost, 0, -1); + if (substr($strHost, -1) == "/") + { + $strHost = substr($strHost, 0, -1); + } return $strSsl . $strHost; } @@ -194,19 +230,20 @@ function _xls_site_dir($ssl_attempt = false) { * @param mix optional default in case key is not found * @return string key value */ -function _sp($strString, $strLocation = "global"){ +function _sp($strString, $strLocation = "global") +{ return Yii::t($strLocation, $strString); } -function _qalert($strString) { error_log($strString); -// $cs = Yii::app()->clientScript; -// $cs->registerScript('my_script', 'alert("'.$strString.'");', CClientScript::POS_READY); -// $this->render('any_view'); - +function _qalert($strString) +{ + error_log($strString); } +// @codingStandardsIgnoreStart function _xls_parse_name($strName) +// @codingStandardsIgnoreEnd { Yii::import('ext.HumanNameParser.*'); require_once('Name.php'); @@ -219,50 +256,61 @@ function _xls_parse_name($strName) /* * Get all active event handles for a given event */ +// @codingStandardsIgnoreStart function _xls_get_events($strEventHandler) +// @codingStandardsIgnoreEnd { - $obj = new Modules(); $obj->category = $strEventHandler; - $obj->active=1; + $obj->active = 1; $dataProvider = $obj->searchEvents(); $objModules = $dataProvider->getData(); foreach ($objModules as $module) { - //See if the extension actually exists either in custom file or our core + // See if the extension actually exists either in custom file or our core if(file_exists(Yii::getPathOfAlias('custom.extensions.'.$module->module.".".$module->module).".php")) + { Yii::import('custom.extensions.'.$module->module.".".$module->module); - elseif(file_exists(Yii::getPathOfAlias('ext.'.$module->module.".".$module->module).".php")) + } elseif(file_exists(Yii::getPathOfAlias('ext.'.$module->module.".".$module->module).".php")) + { Yii::import('ext.'.$module->module.".".$module->module); + } } return $objModules; } -function _xls_raise_events($strEvent,$objEvent) +// @codingStandardsIgnoreStart +function _xls_raise_events($strEvent, $objEvent) +// @codingStandardsIgnoreEnd { - - //Attach event handlers + // Attach event handlers $objModules = _xls_get_events($strEvent); foreach ($objModules as $objModule) { $objModule->instanceHandle = new $objModule->module; - $objModule->instanceHandle->attachEventHandler($objEvent->onAction,array($objModule->instanceHandle,$objEvent->onAction)); + $objModule->instanceHandle->attachEventHandler($objEvent->onAction, array($objModule->instanceHandle,$objEvent->onAction)); } - //Raise events - foreach ($objModules as $objModule) { + // Raise events + foreach ($objModules as $objModule) + { Yii::log('Running event '.$strEvent.' '.$objModule->module, 'trace', 'application.'.__CLASS__.".".__FUNCTION__); - $objModule->instanceHandle->raiseEvent($objEvent->onAction,$objEvent); + $objModule->instanceHandle->raiseEvent($objEvent->onAction, $objEvent); } } +// @codingStandardsIgnoreStart function _xls_facebook_login() +// @codingStandardsIgnoreEnd { if (!empty(Yii::app()->params['FACEBOOK_APPID']) && !empty(Yii::app()->params['FACEBOOK_SECRET'])) + { return true; - else return false; + } else { + return false; + } } /** @@ -297,18 +345,23 @@ function _xls_facebook_login() * [1] => Last Name cannot be blank. * ) */ +// @codingStandardsIgnoreStart function _xls_convert_errors($arrErrors) +// @codingStandardsIgnoreEnd { return array_reduce( $arrErrors, - function ($collectedErrors, $attributeErrors) { + function ($collectedErrors, $attributeErrors) + { return array_unique(array_merge($collectedErrors, $attributeErrors)); }, array() ); } +// @codingStandardsIgnoreStart function _xls_convert_errors_display($arrErrors) +// @codingStandardsIgnoreEnd { $strReturn = "\n"; foreach ($arrErrors as $value) @@ -319,48 +372,60 @@ function _xls_convert_errors_display($arrErrors) return $strReturn; } -//from http://bavotasan.com/2011/convert-hex-color-to-rgb-using-php/ -function hex2rgb($hex) { +// from http://bavotasan.com/2011/convert-hex-color-to-rgb-using-php/ +function hex2rgb($hex) +{ $hex = str_replace("#", "", $hex); - if(strlen($hex) == 3) { - $r = hexdec(substr($hex,0,1).substr($hex,0,1)); - $g = hexdec(substr($hex,1,1).substr($hex,1,1)); - $b = hexdec(substr($hex,2,1).substr($hex,2,1)); + if(strlen($hex) == 3) + { + $r = hexdec(substr($hex, 0, 1).substr($hex, 0, 1)); + $g = hexdec(substr($hex, 1, 1).substr($hex, 1, 1)); + $b = hexdec(substr($hex, 2, 1).substr($hex, 2, 1)); } else { - $r = hexdec(substr($hex,0,2)); - $g = hexdec(substr($hex,2,2)); - $b = hexdec(substr($hex,4,2)); + $r = hexdec(substr($hex, 0, 2)); + $g = hexdec(substr($hex, 2, 2)); + $b = hexdec(substr($hex, 4, 2)); } + $rgb = array($r, $g, $b); - //return implode(",", $rgb); // returns the rgb values separated by commas +// return implode(",", $rgb); // returns the rgb values separated by commas return $rgb; // returns an array with the rgb values } -function json_encode_with_relations(array $models, $attributeNames) { +// @codingStandardsIgnoreStart +function json_encode_with_relations(array $models, $attributeNames) +// @codingStandardsIgnoreEnd +{ $attributeNames = explode(',', $attributeNames); $rows = array(); //the rows to output - foreach ($models as $model) { + foreach ($models as $model) + { $row = array(); //you will be copying in model attribute values to this array - foreach ($attributeNames as $name) { + foreach ($attributeNames as $name) + { $name = trim($name); //in case of spaces around commas $row[$name] = CHtml::value($model, $name); //this function walks the relations } + $rows[] = $row; } return CJSON::encode($rows); - } -function _xls_get_sort_order() { - $strProperty = _xls_get_conf('PRODUCT_SORT_FIELD' , 'Name'); +// @codingStandardsIgnoreStart +function _xls_get_sort_order() +// @codingStandardsIgnoreEnd +{ + $strProperty = _xls_get_conf('PRODUCT_SORT_FIELD', 'Name'); $blnAscend = true; - if ($strProperty[0] == '-') { - $strProperty = substr($strProperty,1); + if ($strProperty[0] == '-') + { + $strProperty = substr($strProperty, 1); $blnAscend = false; } @@ -379,16 +444,23 @@ function _xls_get_sort_order() { * @param string $filename * @return pointer */ -function _xls_fopen_w($filename) { +// @codingStandardsIgnoreStart +function _xls_fopen_w($filename) +// @codingStandardsIgnoreEnd +{ $dir = dirname($filename); if (!file_exists($filename) && !is_writable($dir)) + { return false; + } if (file_exists($filename) && !is_writable($filename)) + { return false; + } - $fp = fopen($filename , 'w'); + $fp = fopen($filename, 'w'); return $fp; } @@ -398,15 +470,10 @@ function _xls_fopen_w($filename) { * @param string $name :: Path relative to the template folder * @return string :: Converted path relative to __SITEROOT__ */ -function templateNamed($name) { +function templateNamed($name) +{ $file = Yii::app()->theme->baseUrl . '/'.$name; return $file; -// -// if(!file_exists($file)) { -// QApplication::Log(E_ERROR,"Template ".$file." not found - site cannot continue"); -// die("Template file missing. Check System Log for details."); -// } -// else return $file; } /** @@ -415,14 +482,21 @@ function templateNamed($name) { * @param string $camel :: String you wish to convert * @return string :: Converted string corresponding to a table field */ -function _xls_convert_camel($camel) { +// @codingStandardsIgnoreStart +function _xls_convert_camel($camel) +// @codingStandardsIgnoreEnd +{ $output = ""; - preg_match_all('/[A-Z][^A-Z]*/',$camel,$results); - for ($i=0; $i < count($results[0]);$i++) { + preg_match_all('/[A-Z][^A-Z]*/', $camel, $results); + + for ($i = 0; $i < count($results[0]); $i++) + { if ($i) + { $output .= "_" . $results[0][$i]; - else + } else { $output .= $results[0][$i]; + } } return strtolower($output); @@ -442,9 +516,11 @@ function camelize($string, $pascalCase = true) $string = ucwords($string); $string = str_replace(' ', '', $string); - if (!$pascalCase) { + if (!$pascalCase) + { return lcfirst($string); } + return $string; } @@ -455,9 +531,10 @@ function camelize($string, $pascalCase = true) * @return int(bool) */ function isValidEmail($email) { - $validator=new CEmailValidator; + $validator = new CEmailValidator; - if(!$validator->validateValue($email)){ + if(!$validator->validateValue($email)) + { return false; } @@ -466,10 +543,8 @@ function isValidEmail($email) { if (is_bool($atIndex) && !$atIndex) { $isValid = false; - } - else - { - $domain = substr($email, $atIndex+1); + } else { + $domain = substr($email, $atIndex + 1); $local = substr($email, 0, $atIndex); $localLen = strlen($local); $domainLen = strlen($domain); @@ -478,49 +553,53 @@ function isValidEmail($email) { // local part length exceeded $isValid = false; } - else if ($domainLen < 1 || $domainLen > 255) + elseif ($domainLen < 1 || $domainLen > 255) { // domain part length exceeded $isValid = false; } - else if ($local[0] == '.' || $local[$localLen-1] == '.') + elseif ($local[0] == '.' || $local[$localLen - 1] == '.') { // local part starts or ends with '.' $isValid = false; } - else if (preg_match('/\\.\\./', $local)) + elseif (preg_match('/\\.\\./', $local)) { // local part has two consecutive dots $isValid = false; } - else if (!preg_match('/^[A-Za-z0-9\\-\\.]+$/', $domain)) + elseif (!preg_match('/^[A-Za-z0-9\\-\\.]+$/', $domain)) { // character not valid in domain part $isValid = false; } - else if (preg_match('/\\.\\./', $domain)) + elseif (preg_match('/\\.\\./', $domain)) { // domain part has two consecutive dots $isValid = false; } - else if - (!preg_match('/^(\\\\.|[A-Za-z0-9!#%&`_=\\/$\'*+?^{}|~.-])+$/', - str_replace("\\\\","",$local))) - { + elseif (!preg_match( + '/^(\\\\.|[A-Za-z0-9!#%&`_=\\/$\'*+?^{}|~.-])+$/', + str_replace("\\\\", "", $local) + )) { // character not valid in local part unless // local part is quoted - if (!preg_match('/^"(\\\\"|[^"])+"$/', - str_replace("\\\\","",$local))) + if (!preg_match( + '/^"(\\\\"|[^"])+"$/', + str_replace("\\\\", "", $local) + )) { $isValid = false; } } - if ($isValid && !(checkdnsrr($domain,"MX") || checkdnsrr($domain,"A"))) - { - // domain not found in DNS - $isValid = false; - } - } + + if ($isValid && !(checkdnsrr($domain, "MX") || checkdnsrr($domain, "A"))) + { + // domain not found in DNS + $isValid = false; + } + } + return $isValid; } @@ -533,7 +612,8 @@ function isValidEmail($email) { function toCharArray($input) { $len = strlen($input); - for ($j=0;$j<$len;$j++) { + for ($j = 0; $j < $len; $j++) + { $char[$j] = substr($input, $j, 1); } @@ -546,11 +626,16 @@ function toCharArray($input) { * @param array $arr The array * @return array */ -function values_as_keys($arr) { //ToDo: only used in Admin panel +// @codingStandardsIgnoreStart +function values_as_keys($arr) +// @codingStandardsIgnoreEnd +{ + // TODO: only used in Admin panel $ret = array(); reset($arr); - foreach($arr as $val) { + foreach($arr as $val) + { $ret[$val] = $val; } @@ -565,7 +650,10 @@ function values_as_keys($arr) { //ToDo: only used in Admin panel * @param string $val * @return array */ -function _xls_comma_to_array($val) { +// @codingStandardsIgnoreStart +function _xls_comma_to_array($val) +// @codingStandardsIgnoreEnd +{ return _xls_delim_to_array($val, ','); } @@ -575,17 +663,23 @@ function _xls_comma_to_array($val) { * @param string $val * @return array */ -function _xls_delim_to_array($val , $delim = ',') { - $arr = explode($delim , trim($val)); +// @codingStandardsIgnoreStart +function _xls_delim_to_array($val, $delim = ',') +// @codingStandardsIgnoreEnd +{ + $arr = explode($delim, trim($val)); $ret = array(); - while(list( , $item) = each($arr)) { + while(list( , $item) = each($arr)) + { if(trim($item) != '') + { $ret[$item] = $item; + } } + return $ret; } - /** * Convert a string or 1 dimensional array * to a 2 dimensional array. @@ -595,7 +689,9 @@ function _xls_delim_to_array($val , $delim = ',') { * @param $arr * @return array */ +// @codingStandardsIgnoreStart function _xls_make2dimArray($arr) +// @codingStandardsIgnoreEnd { if (is_array($arr) === false) { @@ -607,7 +703,8 @@ function _xls_make2dimArray($arr) { // 1 dimension array $newArr = array(); - foreach ($arr as $key => $item) { + foreach ($arr as $key => $item) + { $newArr[$key] = array($item); } @@ -624,7 +721,10 @@ function _xls_make2dimArray($arr) * @param string $value :: The value to be contained by the input * @return string :: An input HTML tag */ -function _xls_make_hidden($name , $value) { +// @codingStandardsIgnoreStart +function _xls_make_hidden($name, $value) +// @codingStandardsIgnoreEnd +{ return "\n"; } @@ -633,9 +733,11 @@ function _xls_make_hidden($name , $value) { * * @param unknown_type $msg */ -function _xls_log($msg,$blnSysLogOnly = false) { - - Yii::log($msg, CLogger::LEVEL_ERROR, 'application'); +// @codingStandardsIgnoreStart +function _xls_log($msg, $blnSysLogOnly = false) +// @codingStandardsIgnoreEnd +{ + Yii::log($msg, CLogger::LEVEL_ERROR, 'application'); } /** @@ -643,35 +745,46 @@ function _xls_log($msg,$blnSysLogOnly = false) { * * @return string "hostname ; ipaddress" */ -function _xls_get_ip() { +// @codingStandardsIgnoreStart +function _xls_get_ip() +// @codingStandardsIgnoreEnd +{ $hname = @gethostbyaddr($_SERVER["REMOTE_ADDR"]); - if(strcmp($hname , $_SERVER["REMOTE_ADDR"]) != 0) { + if(strcmp($hname, $_SERVER["REMOTE_ADDR"]) != 0) + { $hname .= " ( " . $_SERVER["REMOTE_ADDR"] . " ) "; } - if(isset($_SERVER["HTTP_X_FORWARDED_FOR"])) { + if(isset($_SERVER["HTTP_X_FORWARDED_FOR"])) + { $pname = @gethostbyaddr($_SERVER["HTTP_X_FORWARDED_FOR"]); - if( strcmp($pname , $_SERVER["HTTP_X_FORWARDED_FOR"]) != 0) { + if(strcmp($pname, $_SERVER["HTTP_X_FORWARDED_FOR"]) != 0) + { $pname .= " ( " . $_SERVER["HTTP_X_FORWARDED_FOR"] . " ) "; } - $hname = $pname . " ; Proxy " . $hname ; + + $hname = $pname . " ; Proxy " . $hname; } + return trim($hname); } - /** * Return values of an array as value and key (itself) * * @param array $arr The array * @return array */ -function _xls_values_as_keys($arr) { +// @codingStandardsIgnoreStart +function _xls_values_as_keys($arr) +// @codingStandardsIgnoreEnd +{ $ret = array(); reset($arr); - foreach($arr as $val) { + foreach($arr as $val) + { $ret[$val] = $val; } @@ -686,10 +799,18 @@ function _xls_values_as_keys($arr) { * @param string $mixDefault * @return bool */ -function _xls_set_conf($strKey, $mixDefault = "") { +// @codingStandardsIgnoreStart +function _xls_set_conf($strKey, $mixDefault = "") +// @codingStandardsIgnoreEnd +{ $conf = Configuration::LoadByKey($strKey); Yii::app()->params[$strKey] = $mixDefault; - if(!$conf) return false; + + if(!$conf) + { + return false; + } + $conf->key_value = $mixDefault; $conf->modified = new CDbExpression('NOW()'); $conf->save(); @@ -707,40 +828,53 @@ function _xls_set_conf($strKey, $mixDefault = "") { * @param string $options * @param int $sort_order */ -function _xls_insert_conf($key , $title, $value, $helper_text, - $config_type, $options, $sort_order = NULL,$template_specific = 0) { - +// @codingStandardsIgnoreStart +function _xls_insert_conf( +// @codingStandardsIgnoreEnd + $key, + $title, + $value, + $helperText, + $configType, + $options, + $sortOrder = NULL, + $templateSpecific = 0 +) { $conf = Configuration::LoadByKey($key); if(!$conf) + { $conf = new Configuration(); + } $conf->key_name = $key; $conf->title = $title; $conf->key_value = $value; - $conf->helper_text = $helper_text; - $conf->configuration_type_id = $config_type; + $conf->helper_text = $helperText; + $conf->configuration_type_id = $configType; $conf->options = $options; $query = <<findBySql($query); + if(!$sortOrder) + { + $sortOrder = Configuration::model()->findBySql($query); + } - $conf->sort_order = $sort_order; - $conf->template_specific = $template_specific; + $conf->sort_order = $sortOrder; + $conf->template_specific = $templateSpecific; $conf->created = new CDbExpression('NOW()'); $conf->modified = new CDbExpression('NOW()'); if (!$conf->save()) + { print_r($conf->getErrors()); - - + } } /** @@ -749,11 +883,14 @@ function _xls_insert_conf($key , $title, $value, $helper_text, * @param string $zip * @return $zip */ -function _xls_zip_fix($zip) { +// @codingStandardsIgnoreStart +function _xls_zip_fix($zip) +// @codingStandardsIgnoreEnd +{ $zip = trim($zip); - $zip = str_replace(" " , "" , $zip); + $zip = str_replace(" ", "", $zip); $zip = strtoupper($zip); - $zip = preg_replace('/\-[0-9][0-9][0-9][0-9]/','',$zip); + $zip = preg_replace('/\-[0-9][0-9][0-9][0-9]/', '', $zip); return $zip; } @@ -765,16 +902,24 @@ function _xls_zip_fix($zip) { * @param string $zippreg * @return boolean */ -function _xls_validate_zip($zip , $zippreg = '') { +// @codingStandardsIgnoreStart +function _xls_validate_zip($zip, $zippreg = '') +// @codingStandardsIgnoreEnd +{ if(!$zippreg) + { return true; + } $zip = _xls_zip_fix($zip); if(preg_match($zippreg, $zip)) + { return true; - else + } + else { return false; + } } /** @@ -784,15 +929,21 @@ function _xls_validate_zip($zip , $zippreg = '') { * @param string $ext :: Filter to a given file extension * @return array */ -function _xls_read_dir($dir , $ext = FALSE) { +// @codingStandardsIgnoreStart +function _xls_read_dir($dir, $ext = FALSE) { +// @codingStandardsIgnoreEnd $ret = array(); - $handle=opendir($dir); + $handle = opendir($dir); while (false !== ($file = readdir($handle))) - if ($file != "." && $file != ".." && - ($ext ? stristr($file , $ext) : TRUE)) + { + if ($file != "." && $file != ".." && + ($ext ? stristr($file, $ext) : TRUE)) + { $ret[$file] = $file; + } + } closedir($handle); return $ret; @@ -805,10 +956,16 @@ function _xls_read_dir($dir , $ext = FALSE) { * @param mix $value * @return void */ -function _xls_stack_add($key, $value) { +// @codingStandardsIgnoreStart +function _xls_stack_add($key, $value) +// @codingStandardsIgnoreEnd +{ if(!isset($_SESSION['stack_vars'][$key])) + { $_SESSION['stack_vars'][$key] = array(); - $_SESSION['stack_vars'][$key][]=$value; + } + + $_SESSION['stack_vars'][$key][] = $value; } /** @@ -818,7 +975,10 @@ function _xls_stack_add($key, $value) { * @param mix $value * @return void */ -function _xls_stack_put($key, $value) { +// @codingStandardsIgnoreStart +function _xls_stack_put($key, $value) +// @codingStandardsIgnoreEnd +{ $_SESSION['stack_vars'][$key] = array($value); } @@ -829,16 +989,21 @@ function _xls_stack_put($key, $value) { * @param string $key * return mix or false */ -function _xls_stack_get($key) { - if(isset($_SESSION['stack_vars'][$key])) { +// @codingStandardsIgnoreStart +function _xls_stack_get($key) +// @codingStandardsIgnoreEnd +{ + if(isset($_SESSION['stack_vars'][$key])) + { $intItemCount = count($_SESSION['stack_vars'][$key]); if ($intItemCount > 0) + { return $_SESSION['stack_vars'][$key][$intItemCount - 1]; - } - - else + } + } else { return false; + } } /** @@ -847,10 +1012,13 @@ function _xls_stack_get($key) { * @param string $key * return mix or false */ -function _xls_stack_pop($key) { +// @codingStandardsIgnoreStart +function _xls_stack_pop($key) +// @codingStandardsIgnoreEnd +{ if(isset($_SESSION['stack_vars'][$key]) && - (count($_SESSION['stack_vars'][$key])>0)) { - + (count($_SESSION['stack_vars'][$key]) > 0)) + { end($_SESSION['stack_vars'][$key]); $index = key($_SESSION['stack_vars'][$key]); @@ -858,23 +1026,35 @@ function _xls_stack_pop($key) { unset($_SESSION['stack_vars'][$key][$index]); if(count($_SESSION['stack_vars'][$key]) == 0) + { $_SESSION['stack_vars'][$key] = array(); + } return $val; - }else + }else { return false; + } } -function _xls_stack_remove($key) { +// @codingStandardsIgnoreStart +function _xls_stack_remove($key) +// @codingStandardsIgnoreEnd +{ + + while (_xls_stack_pop($key)) + { + } - while (_xls_stack_pop($key)) { } unset($_SESSION['stack_vars'][$key]); return true; } /** * Clear $_SESSION['stack_vars'] */ -function _xls_stack_removeall() { +// @codingStandardsIgnoreStart +function _xls_stack_removeall() +// @codingStandardsIgnoreEnd +{ unset($_SESSION['stack_vars']); } @@ -884,7 +1064,10 @@ function _xls_stack_removeall() { * @param string $msg * @param string $redirect */ -function _xls_display_msg($msg) { +// @codingStandardsIgnoreStart +function _xls_display_msg($msg) +// @codingStandardsIgnoreEnd +{ _xls_stack_add('msg', _sp($msg)); _rd(_xls_site_url('msg/'.XLSURL::KEY_PAGE)); @@ -896,11 +1079,17 @@ function _xls_display_msg($msg) { * @param string $key * return mix or false */ -function _xls_remember_url($strUrl) { //Yii::app()->session['crumbtrail'] +// @codingStandardsIgnoreStart +function _xls_remember_url($strUrl) +// @codingStandardsIgnoreEnd +{ //Yii::app()->session['crumbtrail'] if (empty($strUrl)) + { unset(Yii::app()->session['last_url']); - else - Yii::app()->session['last_url'] = $strUrl; + } + else { + Yii::app()->session['last_url'] = $strUrl; + } } /** @@ -909,11 +1098,17 @@ function _xls_remember_url($strUrl) { //Yii::app()->session['crumbtrail'] * @param string $key * return mix or false */ -function _xls_get_remembered_url() { +// @codingStandardsIgnoreStart +function _xls_get_remembered_url() +// @codingStandardsIgnoreEnd +{ if (isset(Yii::app()->session['last_url'])) + { return (Yii::app()->session['last_url']); - else + } + else { return null; + } } /** @@ -921,14 +1116,19 @@ function _xls_get_remembered_url() { * * @param string $msg */ -function _xls_require_login($msg = false) { +// @codingStandardsIgnoreStart +function _xls_require_login($msg = false) +// @codingStandardsIgnoreEnd +{ $uri = $_SERVER['REQUEST_URI']; if(!$msg) + { $msg = "You are required to login to access this page."; + } - _xls_stack_add('login_msg' , _sp($msg)); - _xls_stack_add('login_redirect_uri' , $uri); + _xls_stack_add('login_msg', _sp($msg)); + _xls_stack_add('login_redirect_uri', $uri); _rd(_xls_site_url('login/'.XLSURL::KEY_PAGE.'/')); } @@ -940,24 +1140,27 @@ function _xls_require_login($msg = false) { * @param string $adde * @return array */ -function _xls_mail_name($name , $adde) { +// @codingStandardsIgnoreStart +function _xls_mail_name($name, $adde) +// @codingStandardsIgnoreEnd +{ return $name . ' <' . $adde . '>'; } +// @codingStandardsIgnoreStart function _xls_send_email($id, $hideJson = false) +// @codingStandardsIgnoreEnd { - $objMail = EmailQueue::model()->findByPk($id); - if ($objMail instanceof EmailQueue) { - - - $orderEmail = _xls_get_conf('ORDER_FROM',''); + if ($objMail instanceof EmailQueue) + { + $orderEmail = _xls_get_conf('ORDER_FROM', ''); $from = empty($orderEmail) ? _xls_get_conf('EMAIL_FROM') : $orderEmail; - Yii::app()->setComponent('Smtpmail',null); - $mail=Yii::app()->Smtpmail; + Yii::app()->setComponent('Smtpmail', null); + $mail = Yii::app()->Smtpmail; //$mail->CharSet="utf-8"; - $mail->Debugoutput="error_log"; + $mail->Debugoutput = "error_log"; $mail->IsSMTP(); $mail->Username = Yii::app()->params['EMAIL_SMTP_USERNAME']; $mail->Password = _xls_decrypt(Yii::app()->params['EMAIL_SMTP_PASSWORD']); @@ -965,61 +1168,97 @@ function _xls_send_email($id, $hideJson = false) $mail->Port = Yii::app()->params['EMAIL_SMTP_PORT']; $SMTPSecure = ""; - if(Yii::app()->params['EMAIL_SMTP_SECURITY_MODE']=='0') + if(Yii::app()->params['EMAIL_SMTP_SECURITY_MODE'] == '0') + { + if (Yii::app()->params['EMAIL_SMTP_PORT'] == "465") + { + $SMTPSecure = "ssl"; + } + + if (Yii::app()->params['EMAIL_SMTP_PORT'] == "587") + { + $SMTPSecure = "tls"; + } + } + + if(_xls_get_conf('EMAIL_SMTP_SECURITY_MODE') == '1') + { + $SMTPSecure = ""; + } + + if(_xls_get_conf('EMAIL_SMTP_SECURITY_MODE') == '2') { - if (Yii::app()->params['EMAIL_SMTP_PORT']=="465") $SMTPSecure = "ssl"; - if (Yii::app()->params['EMAIL_SMTP_PORT']=="587") $SMTPSecure = "tls"; + $SMTPSecure = "ssl"; } - if(_xls_get_conf('EMAIL_SMTP_SECURITY_MODE')=='1') $SMTPSecure = ""; - if(_xls_get_conf('EMAIL_SMTP_SECURITY_MODE')=='2') $SMTPSecure = "ssl"; - if(_xls_get_conf('EMAIL_SMTP_SECURITY_MODE')=='3') $SMTPSecure = "tls"; + if(_xls_get_conf('EMAIL_SMTP_SECURITY_MODE') == '3') + { + $SMTPSecure = "tls"; + } - $mail->SMTPAuth = true; + $mail->SMTPAuth = true; $mail->AuthType = "LOGIN"; - if(_xls_get_conf('EMAIL_SMTP_AUTH_PLAIN','0')=='1') + if(_xls_get_conf('EMAIL_SMTP_AUTH_PLAIN', '0') == '1') + { $mail->AuthType = "PLAIN"; + } + if(empty(Yii::app()->params['EMAIL_SMTP_PASSWORD'])) { Yii::log("Password for SMTP blank, turning off SMTP Authentication", 'info', 'application.'.__CLASS__.".".__FUNCTION__); - $mail->SMTPAuth = false; + $mail->SMTPAuth = false; $mail->Username = ''; $mail->Password = ''; } - $mail->SMTPDebug=1; + + $mail->SMTPDebug = 1; $mail->SMTPSecure = $SMTPSecure; $mail->Host = Yii::app()->params['EMAIL_SMTP_SERVER']; $mail->SetFrom($from, Yii::app()->params['STORE_NAME']); $mail->Subject = $objMail->subject; - $mail->ClearAllRecipients(); + $mail->ClearAllRecipients(); $mail->AddAddress($objMail->to); if(!empty(Yii::app()->params['EMAIL_BCC'])) + { if($objMail->to != Yii::app()->params['EMAIL_BCC'] && $objMail->to == $from) + { $mail->AddCC(Yii::app()->params['EMAIL_BCC']); + } + } - $mail->MsgHTML($objMail->htmlbody); + $mail->MsgHTML($objMail->htmlbody); $blnResult = $mail->Send(); $mail->Password = '*password removed for logging*'; //replace the real password before logging - Yii::log("Contents of mail ".print_r($mail,true), 'info', 'application.'.__CLASS__.".".__FUNCTION__); + Yii::log("Contents of mail ".print_r($mail, true), 'info', 'application.'.__CLASS__.".".__FUNCTION__); if($blnResult) { Yii::log("Sent email to ".$objMail->to." successfully.", 'info', 'application.'.__CLASS__.".".__FUNCTION__); $objMail->delete(); - Yii::log("Email removed from queue", 'info', 'application.'.__CLASS__.".".__FUNCTION__); - if (!$hideJson) echo json_encode("success"); - } - else - { + Yii::log("Email removed from queue", 'info', 'application.'.__CLASS__.".".__FUNCTION__); + if (!$hideJson) + { + echo json_encode("success"); + } + } else { $objMail->sent_attempts += 1; $objMail->save(); - Yii::log("Sending email failed ID ".$id." ".$objMail->to." ". - print_r($mail->ErrorInfo,true), 'error', 'application.'.__CLASS__.".".__FUNCTION__); - if (!$hideJson) echo json_encode("failure"); + Yii::log( + "Sending email failed ID ".$id." ".$objMail->to." ". + print_r($mail->ErrorInfo, true), + 'error', + 'application.'.__CLASS__.".".__FUNCTION__ + ); + + if (!$hideJson) + { + echo json_encode("failure"); + } } } + return $blnResult; } @@ -1030,18 +1269,30 @@ function _xls_send_email($id, $hideJson = false) * @param string $templatefile * @param mixed $vars */ -function _xls_mail_body_from_template($templatefile, $vars) { - if(!file_exists($templatefile)) { - _xls_log(_sp("FATAL ERROR : e-mail template file not found") . - $templatefile); +// @codingStandardsIgnoreStart +function _xls_mail_body_from_template($templatefile, $vars) +// @codingStandardsIgnoreEnd +{ + if(!file_exists($templatefile)) + { + _xls_log( + _sp("FATAL ERROR : e-mail template file not found") . + $templatefile + ); + return ""; } try { extract($vars); } catch (Exception $exc) { - _xls_log(_sp("FATAL ERROR : problem extracting e-mail" . - " variables in") . " " . print_r($vars , true)); + _xls_log( + _sp( + "FATAL ERROR : problem extracting e-mail" . + " variables in" + ) . " " . print_r($vars, true) + ); + return ""; } @@ -1063,7 +1314,10 @@ function _xls_mail_body_from_template($templatefile, $vars) { * @param memory reference to array value * @return string */ -function _xls_trim(&$value) { +// @codingStandardsIgnoreStart +function _xls_trim(&$value) +// @codingStandardsIgnoreEnd +{ $value = trim($value); } @@ -1074,11 +1328,18 @@ function _xls_trim(&$value) { * @param array to search in * @return boolean true or false */ -function _xls_array_search($needle, $haystack) { - foreach($haystack as $elem) { - if(preg_match('/' . $elem.'/',$needle)) +// @codingStandardsIgnoreStart +function _xls_array_search($needle, $haystack) +// @codingStandardsIgnoreEnd +{ + foreach($haystack as $elem) + { + if(preg_match('/' . $elem.'/', $needle)) + { return true; + } } + return false; } @@ -1089,22 +1350,36 @@ function _xls_array_search($needle, $haystack) { * @param array to search in * @return boolean true or false */ -function _xls_array_search_begin($needle, $haystack) { - foreach($haystack as $elem) { - if(preg_match('/^' . $elem .'/',$needle)) +// @codingStandardsIgnoreStart +function _xls_array_search_begin($needle, $haystack) +// @codingStandardsIgnoreEnd +{ + foreach($haystack as $elem) + { + if(preg_match('/^' . $elem .'/', $needle)) + { return true; + } } + return false; } -function _xls_array_search_restrict_begin($needle, $haystack) { - foreach($haystack as $elem) { - $elem = preg_quote($elem,'/'); - $elem = substr_replace($elem, '', strpos($elem,"\\"), (strpos($elem,"\\")-strlen($elem)+1)); - if(preg_match('/^' . $elem .'/',$needle)) - return true; - } - return false; +// @codingStandardsIgnoreStart +function _xls_array_search_restrict_begin($needle, $haystack) +// @codingStandardsIgnoreEnd +{ + foreach($haystack as $elem) + { + $elem = preg_quote($elem, '/'); + $elem = substr_replace($elem, '', strpos($elem, "\\"), (strpos($elem, "\\") - strlen($elem) + 1)); + if(preg_match('/^' . $elem .'/', $needle)) + { + return true; + } + } + + return false; } /** @@ -1114,16 +1389,26 @@ function _xls_array_search_restrict_begin($needle, $haystack) { * @param float $num * @return string */ -function _xls_currency($num, $strCountry = null) { +// @codingStandardsIgnoreStart +function _xls_currency($num, $strCountry = null) +// @codingStandardsIgnoreEnd +{ if(function_exists('_custom_currency')) + { return _custom_currency($num); + } if (!is_numeric($num)) + { return $num; + } if (is_null($strCountry)) - $strCountry=_xls_get_conf('CURRENCY_DEFAULT','USD'); - return Yii::app()->numberFormatter->formatCurrency($num,$strCountry); + { + $strCountry = _xls_get_conf('CURRENCY_DEFAULT', 'USD'); + } + + return Yii::app()->numberFormatter->formatCurrency($num, $strCountry); } @@ -1133,65 +1418,76 @@ function _xls_currency($num, $strCountry = null) { * @param string $path * @return string */ -function _xls_remove_leading_slash($path) { - if(substr($path , 0 , 1) == '/') - return substr($path , 1); - else +// @codingStandardsIgnoreStart +function _xls_remove_leading_slash($path) +// @codingStandardsIgnoreEnd +{ + if(substr($path, 0, 1) == '/') + { + return substr($path, 1); + } + else { return $path; + } } - /** * Return the URL Parser Object * Useful if we need to find out URL properties to make decisions somewhere * * @return object */ -function _xls_url_object() { +// @codingStandardsIgnoreStart +function _xls_url_object() +// @codingStandardsIgnoreEnd +{ $objUrl = XLSURL::getInstance(); return $objUrl; } - - - - -//Makes our SEO hyphenated string from passed string -//Used to build anything that will be in a URL. -//Same as seo_name plus lower case conversion and removing spaces -function _xls_seo_url($string) { +// Makes our SEO hyphenated string from passed string +// Used to build anything that will be in a URL. +// Same as seo_name plus lower case conversion and removing spaces +// @codingStandardsIgnoreStart +function _xls_seo_url($string) +// @codingStandardsIgnoreEnd +{ return mb_strtolower(trim(_xls_seo_name($string), '-'), 'UTF-8'); } -//Makes our SEO hyphenated string from passed string -//Used to build anything that will be in a Name. -function _xls_seo_name($string) { - $string = str_replace(array('\n','\r',chr(13),'%'),'',$string); - $string = str_replace('\'','',$string); - $string = str_replace('"','',$string); - $string = str_replace(array(',','?','!','.'),'',$string); - $string = str_replace("&","and",$string); - $string = str_replace("%","pct",$string); - $string = str_replace("#","No",$string); - $string = str_replace("+","and",$string); - $string = str_replace(array(" ",'/'),"-",$string); - $string = preg_replace("`\[.*\]`U","",$string); - $string = preg_replace('`&(amp;)?#?[A-Za-z0-9]+;`i','-',$string); - //$string = htmlentities($string, ENT_COMPAT, 'utf-8'); - $string = preg_replace("`&([a-z])(acute|uml|circ|grave|ring|cedil|slash|tilde|caron|lig|quot|rsquo);`i","\\1", $string); - $string = str_replace('-amp-','-and-',$string); - $string = preg_replace( array("`[^a-z0-9{Cyrillic}{Greek}{Japanese}{Chinese}{Korean}{Hebrew}{Arabic}]/u`i","`[-]+`") , "-", $string); +// Makes our SEO hyphenated string from passed string +// Used to build anything that will be in a Name. +// @codingStandardsIgnoreStart +function _xls_seo_name($string) +// @codingStandardsIgnoreEnd +{ + $string = str_replace(array('\n', '\r', chr(13), '%'), '', $string); + $string = str_replace('\'', '', $string); + $string = str_replace('"', '', $string); + $string = str_replace(array(',', '?', '!', '.'), '', $string); + $string = str_replace("&", "and", $string); + $string = str_replace("%", "pct", $string); + $string = str_replace("#", "No", $string); + $string = str_replace("+", "and", $string); + $string = str_replace(array(" ", '/'), "-", $string); + $string = preg_replace("`\[.*\]`U", "", $string); + $string = preg_replace('`&(amp;)?#?[A-Za-z0-9]+;`i', '-', $string); + $string = preg_replace("`&([a-z])(acute|uml|circ|grave|ring|cedil|slash|tilde|caron|lig|quot|rsquo);`i", "\\1", $string); + $string = str_replace('-amp-', '-and-', $string); + $string = preg_replace(array("`[^a-z0-9{Cyrillic}{Greek}{Japanese}{Chinese}{Korean}{Hebrew}{Arabic}]/u`i", "`[-]+`"), "-", $string); return trim($string, '- '); } - /** * Escape backslashes, used for Google Conversion item description * @return string */ -function _xls_jssafe_name($string) { - $string = str_replace('\'','\\\'',$string); - $string = str_replace('&','&',$string); +// @codingStandardsIgnoreStart +function _xls_jssafe_name($string) +// @codingStandardsIgnoreEnd +{ + $string = str_replace('\'', '\\\'', $string); + $string = str_replace('&', '&', $string); return trim($string); } @@ -1199,9 +1495,12 @@ function _xls_jssafe_name($string) { * Escape backslashes, used for Google Conversion item description * @return string */ -function _xls_ajaxclean($string) { +// @codingStandardsIgnoreStart +function _xls_ajaxclean($string) +// @codingStandardsIgnoreEnd +{ $string = trim($string); - $string = str_replace('\'','\\\'',$string); + $string = str_replace('\'', '\\\'', $string); $string = str_replace(array("\r", "\n", "\t"), '', $string); return trim($string); } @@ -1210,8 +1509,11 @@ function _xls_ajaxclean($string) { * Replace double quote with single quote for Meta tags * @return string */ -function _xls_meta_safe($string) { - $string = str_replace('"','\'',$string); +// @codingStandardsIgnoreStart +function _xls_meta_safe($string) +// @codingStandardsIgnoreEnd +{ + $string = str_replace('"', '\'', $string); //$string = str_replace("&","and",$string); return trim($string); } @@ -1221,26 +1523,40 @@ function _xls_meta_safe($string) { * Get the ID of the current customer object * @return int */ -function _xls_get_current_customer_id() { +// @codingStandardsIgnoreStart +function _xls_get_current_customer_id() +// @codingStandardsIgnoreEnd +{ $blnLoggedIn = !Yii::app()->user->isGuest; if ($blnLoggedIn) + { return Yii::app()->user->GetId(); - else return null; + } else { + return null; + } } /** * Get the Full Name of the current customer object * @return string */ -function _xls_get_current_customer_name() { +// @codingStandardsIgnoreStart +function _xls_get_current_customer_name() +// @codingStandardsIgnoreEnd +{ $blnLoggedIn = !Yii::app()->user->isGuest; - if ($blnLoggedIn) { - if (strlen(Yii::app()->user->fullname)<13) return Yii::app()->user->fullname; - else return _xls_truncate(Yii::app()->user->firstname,13); - + if ($blnLoggedIn) + { + if (strlen(Yii::app()->user->fullname) < 13) + { + return Yii::app()->user->fullname; + } else { + return _xls_truncate(Yii::app()->user->firstname, 13); + } + } else { + return "My Account"; } - else return "My Account"; } /** @@ -1249,14 +1565,19 @@ function _xls_get_current_customer_name() { * @param string $filename (path) * @return string $filename (fqdn path) */ -function _xls_get_url_resource($filename) { +// @codingStandardsIgnoreStart +function _xls_get_url_resource($filename) +// @codingStandardsIgnoreEnd +{ $fl = mb_strtolower($filename); - if(substr($fl , 0 , 7) == 'http://' || - substr($fl , 0 , 8) == 'https://') + if(substr($fl, 0, 7) == 'http://' || + substr($fl, 0, 8) == 'https://') + { return $filename; + } - $filename = str_replace( __DOCROOT__ , '' , $filename); - $filename = str_replace( __SUBDIRECTORY__ , '' , $filename); + $filename = str_replace(__DOCROOT__, '', $filename); + $filename = str_replace(__SUBDIRECTORY__, '', $filename); $filename = __VIRTUAL_DIRECTORY__ . __SUBDIRECTORY__ . $filename; return $filename; @@ -1266,7 +1587,10 @@ function _xls_get_url_resource($filename) { * Do a permanent 301 redirect * */ -function _xls_301($strUrl) { +// @codingStandardsIgnoreStart +function _xls_301($strUrl) +// @codingStandardsIgnoreEnd +{ header("HTTP/1.1 301 Moved Permanently"); header("Location: ".$strUrl); exit(); @@ -1276,24 +1600,32 @@ function _xls_301($strUrl) { * Do a 404 fail * */ -function _xls_404() { - throw new CHttpException(404,'The requested page does not exist.'); +// @codingStandardsIgnoreStart +function _xls_404() +// @codingStandardsIgnoreEnd +{ + throw new CHttpException(404, 'The requested page does not exist.'); } /** * Redirect to a given URL * @param string $url */ -function _rd($url = '') { +function _rd($url = '') +{ - if(empty($url)) { + if(empty($url)) + { $url = $_SERVER["REQUEST_URI"]; //_xls_site_url will append subfolder again so get rid of it here - if (__SUBDIRECTORY__) $url = substr($url,strlen(__SUBDIRECTORY__),999); + if (__SUBDIRECTORY__) + { + $url = substr($url, strlen(__SUBDIRECTORY__), 999); + } } + header("Location: "._xls_site_url($url)); exit(); - } @@ -1303,8 +1635,9 @@ function _rd($url = '') { * @param CustomerAddress $objAddress * @return null|string */ - +// @codingStandardsIgnoreStart function _xls_string_address($objAddress) +// @codingStandardsIgnoreEnd { if ($objAddress instanceof CustomerAddress === false) { @@ -1328,23 +1661,25 @@ function _xls_string_address($objAddress) * * @return string */ - +// @codingStandardsIgnoreStart function _xls_html_storeaddress() +// @codingStandardsIgnoreEnd { $str = ''; $str .= Yii::app()->params['STORE_ADDRESS1'] . '
'; - $str .= Yii::app()->params['STORE_ADDRESS2'] ? Yii::app()->params['STORE_ADDRESS2'] . '
' : ''; - $str .= Yii::app()->params['STORE_CITY'] ? Yii::app()->params['STORE_CITY'] . ', ' : ''; - $str .= Yii::app()->params['STORE_STATE'] ? State::CodeById(Yii::app()->params['STORE_STATE']) . '
' : ''; + $str .= Yii::app()->params['STORE_ADDRESS2'] ? Yii::app()->params['STORE_ADDRESS2'] . '
' : ''; + $str .= Yii::app()->params['STORE_CITY'] ? Yii::app()->params['STORE_CITY'] . ', ' : ''; + $str .= Yii::app()->params['STORE_STATE'] ? State::CodeById(Yii::app()->params['STORE_STATE']) . '
' : ''; $intIdCountry = Yii::app()->params['STORE_COUNTRY']; if (is_null($intIdCountry) === false) { if (Country::CodeById($intIdCountry) !== _xls_country()) { - $str .= Yii::app()->params['STORE_COUNTRY'] ? Country::CountryById(Yii::app()->params['STORE_COUNTRY']) . '
' : ''; + $str .= Yii::app()->params['STORE_COUNTRY'] ? Country::CountryById(Yii::app()->params['STORE_COUNTRY']) . '
' : ''; } } - $str .= Yii::app()->params['STORE_ZIP'] ? Yii::app()->params['STORE_ZIP'] : ''; + + $str .= Yii::app()->params['STORE_ZIP'] ? Yii::app()->params['STORE_ZIP'] : ''; return $str; } @@ -1355,7 +1690,9 @@ function _xls_html_storeaddress() * @param ShoppingCart $objCart * @return string */ +// @codingStandardsIgnoreStart function _xls_html_storepickupdetails($objCart) +// @codingStandardsIgnoreEnd { if ($objCart === null) { @@ -1368,7 +1705,6 @@ function _xls_html_storepickupdetails($objCart) $str .= $objCart->shipaddress->first_name . ' ' . $objCart->shipaddress->last_name . '
'; $str .= $objCart->shipaddress->store_pickup_email ? $objCart->shipaddress->store_pickup_email : $objCart->customer->email; $str .= $objCart->shipaddress->phone ? '
' . $objCart->shipaddress->phone : ''; - } else { @@ -1389,13 +1725,15 @@ function _xls_html_storepickupdetails($objCart) * @param ShoppingCart $objCart * @return string */ +// @codingStandardsIgnoreStart function _xls_html_shippingaddress($objCart) +// @codingStandardsIgnoreEnd { if ($objCart === null) { $objCart = Yii::app()->shoppingcart; } - + $str = ''; $str .= $objCart->shipaddress->address1 . '
'; $str .= $objCart->shipaddress->address2 ? $objCart->shipaddress->address2 . '
' : ''; @@ -1418,7 +1756,9 @@ function _xls_html_shippingaddress($objCart) * @param ShoppingCart $objCart * @return string */ +// @codingStandardsIgnoreStart function _xls_html_billingaddress($objCart) +// @codingStandardsIgnoreEnd { if ($objCart === null) { @@ -1429,9 +1769,11 @@ function _xls_html_billingaddress($objCart) { return ''; } - + if ($objCart->shipaddress_id == $objCart->billaddress_id) + { return _xls_html_shippingaddress($objCart); + } $str = ''; $str .= $objCart->billaddress->address1 . '
'; @@ -1458,11 +1800,16 @@ function _xls_html_billingaddress($objCart) * @param int $len * @param string $etc */ -function _xls_truncate($text,$len,$etc = "…") { +// @codingStandardsIgnoreStart +function _xls_truncate($text, $len, $etc = "…") +// @codingStandardsIgnoreEnd +{ if(function_exists('_custom_truncate')) - return _custom_truncate($text,$len,$etc); + { + return _custom_truncate($text, $len, $etc); + } - return _xls_string_smart_truncate($text , $len , $etc); + return _xls_string_smart_truncate($text, $len, $etc); } /** @@ -1473,13 +1820,17 @@ function _xls_truncate($text,$len,$etc = "…") { * @param string $strEncoding * @return mb_string $strOut */ +// @codingStandardsIgnoreStart function _xls_string_smart_truncate($strText, $intLimit, $etc, - $strEncoding = "utf-8") { +// @codingStandardsIgnoreEnd + $strEncoding = "utf-8") +{ $strOut = rtrim($strText); // if the text length is longer than the limit set - if (mb_strlen($strOut, $strEncoding) > $intLimit) { + if (mb_strlen($strOut, $strEncoding) > $intLimit) + { $strStop = XLS_TRUNCATE_PUNCTUATIONS; $strStop .= html_entity_decode("»", ENT_COMPAT, "utf-8"); @@ -1491,23 +1842,31 @@ function _xls_string_smart_truncate($strText, $intLimit, $etc, $intChars = 0; - for ($i = $intLimit-1; $i >= 0; $i--) { + for ($i = $intLimit - 1; $i >= 0; $i--) + { if (mb_strpos($strStop, $charArray[$i]) || ctype_space($charArray[$i])) + { $posStop = $i; - else { + } else { if ($intChars > 0) + { break; + } + $intChars++; } } if (!is_null($posStop) && ($posStop != 0)) + { $intLimit = $posStop; + } $strOut = mb_substr($strOut, 0, $intLimit, $strEncoding); $strOut .= html_entity_decode($etc, ENT_COMPAT, "utf-8"); } + return $strOut; } @@ -1518,16 +1877,21 @@ function _xls_string_smart_truncate($strText, $intLimit, $etc, * @param string $strEncoding * @return mb_string $strOut */ -function _xls_string_split($strText, $strEncoding = "utf-8") { +// @codingStandardsIgnoreStart +function _xls_string_split($strText, $strEncoding = "utf-8") +// @codingStandardsIgnoreEnd +{ $intLength = mb_strlen($strText, $strEncoding); $charArray = array(); // start from the left and chop off one character a time - while ($intLength) { + while ($intLength) + { $charArray[] = mb_substr($strText, 0, 1, $strEncoding); $strText = mb_substr($strText, 1, $intLength, $strEncoding); $intLength = mb_strlen($strText, $strEncoding); } + return $charArray; } @@ -1536,7 +1900,10 @@ function _xls_string_split($strText, $strEncoding = "utf-8") { * @param string $string * @return string */ -function _xls_number_only($string ) { +// @codingStandardsIgnoreStart +function _xls_number_only($string) +// @codingStandardsIgnoreEnd +{ return preg_replace('/[^0-9]/', '', $string); } @@ -1545,7 +1912,10 @@ function _xls_number_only($string ) { * @param string $string * @return string */ -function _xls_letters_only($string ) { +// @codingStandardsIgnoreStart +function _xls_letters_only($string) +// @codingStandardsIgnoreEnd +{ return preg_replace('/[^A-Za-z]/', '', $string); } @@ -1555,7 +1925,10 @@ function _xls_letters_only($string ) { * @param string $string * @return string */ -function _xls_clean_currency($string) { +// @codingStandardsIgnoreStart +function _xls_clean_currency($string) +// @codingStandardsIgnoreEnd +{ return preg_replace('/[^0-9\.\-]/', '', $string); } @@ -1564,7 +1937,10 @@ function _xls_clean_currency($string) { * @param string $url * @param int $delay */ -function _xls_add_meta_redirect($url , $delay = 60) { +// @codingStandardsIgnoreStart +function _xls_add_meta_redirect($url, $delay = 60) +// @codingStandardsIgnoreEnd +{ _xls_stack_add( 'xls_meta_redirect', array('url' => $url , 'delay' => $delay) @@ -1575,39 +1951,52 @@ function _xls_add_meta_redirect($url , $delay = 60) { * Set the page title * @param string $title */ -function _xls_add_page_title($title) { +// @codingStandardsIgnoreStart +function _xls_add_page_title($title) +// @codingStandardsIgnoreEnd +{ global $strPageTitle; $strPageTitle = $title; - _xls_stack_put('xls_page_title',$title); + _xls_stack_put('xls_page_title', $title); } /** * Set the page title combined with storename (or other wildcard pattern) * @param string $title */ -function _xls_add_formatted_page_title($title) { - - _xls_stack_put('xls_page_title', - _xls_get_formatted_page_title($title)); - +// @codingStandardsIgnoreStart +function _xls_add_formatted_page_title($title) +// @codingStandardsIgnoreEnd +{ + _xls_stack_put( + 'xls_page_title', + _xls_get_formatted_page_title($title) + ); } /** * Set the page title combined with storename (or other wildcard pattern) * @param string $title */ -function _xls_get_formatted_page_title($title,$meta = null) { - - if(is_null($meta)) $meta = _xls_get_conf('SEO_CUSTOMPAGE_TITLE'); +// @codingStandardsIgnoreStart +function _xls_get_formatted_page_title($title, $meta = null) +// @codingStandardsIgnoreEnd +{ + if(is_null($meta)) + { + $meta = _xls_get_conf('SEO_CUSTOMPAGE_TITLE'); + } return - Yii::t('global',$meta, - array( - '{name}'=>$title, - '{storename}'=>_xls_get_conf('STORE_NAME','Lightspeed Web Store'), - '{storetagline}'=>_xls_get_conf('STORE_TAGLINE','Amazing products available to order online!'), - )); - + Yii::t( + 'global', + $meta, + array( + '{name}' => $title, + '{storename}' => _xls_get_conf('STORE_NAME', 'Lightspeed Web Store'), + '{storetagline}' => _xls_get_conf('STORE_TAGLINE', 'Amazing products available to order online!'), + ) + ); } /** @@ -1615,22 +2004,32 @@ function _xls_get_formatted_page_title($title,$meta = null) { * Note that this doesn't populate orderid or customername, that has to be done in skeleton * @param string $title */ -function _xls_format_email_subject($key='EMAIL_SUBJECT_CUSTOMER',$customer="", $orderid="") { +// @codingStandardsIgnoreStart +function _xls_format_email_subject($key = 'EMAIL_SUBJECT_CUSTOMER', $customer = "", $orderid = "") +// @codingStandardsIgnoreEnd +{ $strPattern = _xls_get_conf($key); - return Yii::t('email',$strPattern, - array( - '{customername}'=>$customer, - '{orderid}'=>$orderid, - '{storename}'=>_xls_get_conf('STORE_NAME','Lightspeed Web Store'), - )); + return + Yii::t( + 'email', + $strPattern, + array( + '{customername}' => $customer, + '{orderid}' => $orderid, + '{storename}' => _xls_get_conf('STORE_NAME', 'Lightspeed Web Store'), + ) + ); } /** * Add meta description to the stack_vars stack * @param string $desc */ -function _xls_add_meta_desc($desc) { +// @codingStandardsIgnoreStart +function _xls_add_meta_desc($desc) +// @codingStandardsIgnoreEnd +{ _xls_stack_put('xls_meta_desc', strip_tags($desc)); } @@ -1638,12 +2037,17 @@ function _xls_add_meta_desc($desc) { * Save crumbtrail to session * @param array $arrCrumbs */ -function _xls_set_crumbtrail($arrCrumbs = null) { +// @codingStandardsIgnoreStart +function _xls_set_crumbtrail($arrCrumbs = null) +// @codingStandardsIgnoreEnd +{ if($arrCrumbs) + { Yii::app()->session['crumbtrail'] = $arrCrumbs; - else + } else { unset(Yii::app()->session['crumbtrail']); + } } /** @@ -1651,16 +2055,28 @@ function _xls_set_crumbtrail($arrCrumbs = null) { * @param string $type * @return $array */ -function _xls_get_crumbtrail($type = 'full') { +// @codingStandardsIgnoreStart +function _xls_get_crumbtrail($type = 'full') +// @codingStandardsIgnoreEnd +{ - if (!isset(Yii::app()->session['crumbtrail'])) return array(); + if (!isset(Yii::app()->session['crumbtrail'])) + { + return array(); + } - if ($type=='full') return Yii::app()->session['crumbtrail']; + if ($type == 'full') + { + return Yii::app()->session['crumbtrail']; + } $arrCrumbs = Yii::app()->session['crumbtrail']; $retArray = array(); foreach ($arrCrumbs as $crumb) - $retArray[] = $crumb['name']; + { + $retArray[] = $crumb['name']; + } + return $retArray; } @@ -1670,7 +2086,10 @@ function _xls_get_crumbtrail($type = 'full') { * @param int $intProductRowid * @return $string */ -function _xls_get_googlecategory($intProductRowid) { +// @codingStandardsIgnoreStart +function _xls_get_googlecategory($intProductRowid) +// @codingStandardsIgnoreEnd +{ $objGoogle = Yii::app()->db->createCommand( "SELECT d.name0, extra @@ -1678,46 +2097,49 @@ function _xls_get_googlecategory($intProductRowid) { LEFT JOIN ".Category::model()->tableName()." AS b ON a.category_id=b.id LEFT JOIN ".CategoryIntegration::model()->tableName()." AS c ON a.category_id=c.category_id LEFT JOIN ".CategoryGoogle::model()->tableName()." as d ON c.foreign_id=d.id - WHERE c.module='google' AND a.product_id=".$intProductRowid)->queryRow(); - + WHERE c.module='google' AND a.product_id=".$intProductRowid + )->queryRow(); $strLine = $objGoogle['name0']; - $strLine = str_replace("&","&",$strLine); - $strLine = str_replace(">",">",$strLine); + $strLine = str_replace("&", "&", $strLine); + $strLine = str_replace(">", ">", $strLine); $arrGoogle = array(); $arrGoogle['Category'] = trim($strLine); if (!empty($objGoogle['extra'])) { - $arrX = explode(",",$objGoogle['extra']); + $arrX = explode(",", $objGoogle['extra']); $arrGoogle['Gender'] = $arrX[0]; $arrGoogle['Age'] = $arrX[1]; } return $arrGoogle; - } -function _xls_get_googleparentcategory($intProductRowid) { - +// @codingStandardsIgnoreStart +function _xls_get_googleparentcategory($intProductRowid) +// @codingStandardsIgnoreEnd +{ $arrTrailFull = Category::GetTrailByProductId($intProductRowid); $objCat = Category::model()->findbyPk($arrTrailFull[0]['key']); $objPar = $objCat->integration->google; - - if ($objPar) { + if ($objPar) + { $strLine = $objPar->name0; $strMeta = $objPar->extra; - } else $strLine=""; - $strLine = str_replace("&","&",$strLine); - $strLine = str_replace(">",">",$strLine); + } else { + $strLine = ""; + } + $strLine = str_replace("&", "&", $strLine); + $strLine = str_replace(">", ">", $strLine); $arrGoogle = array(); $arrGoogle['Category'] = trim($strLine); if (!empty($strMeta)) { - $arrX = explode(",",$strMeta); + $arrX = explode(",", $strMeta); $arrGoogle['Gender'] = $arrX[0]; $arrGoogle['Age'] = $arrX[1]; } @@ -1731,7 +2153,10 @@ function _xls_get_googleparentcategory($intProductRowid) { * Return the Web Store's version * @return string */ -function _xls_version() { // LEGACY +// @codingStandardsIgnoreStart +function _xls_version() +// @codingStandardsIgnoreEnd +{ // LEGACY return XLSWS_VERSION; } @@ -1739,32 +2164,48 @@ function _xls_version() { // LEGACY * Are we being browsed on an iDevice (checks for both devices) * @return bool */ -function _xls_is_idevice() { - if (_xls_is_ipad() || _xls_is_iphone()) return true; - else return false; +// @codingStandardsIgnoreStart +function _xls_is_idevice() +// @codingStandardsIgnoreEnd +{ + if (_xls_is_ipad() || _xls_is_iphone()) + { + return true; + } else { + return false; + } } /** * Are we being browsed on an iPad * @return bool */ -function _xls_is_ipad() { - +// @codingStandardsIgnoreStart +function _xls_is_ipad() +// @codingStandardsIgnoreEnd +{ if(isset($_SERVER['HTTP_USER_AGENT'])) - return (bool) strpos($_SERVER['HTTP_USER_AGENT'],'iPad'); - else return false; + { + return (bool) strpos($_SERVER['HTTP_USER_AGENT'], 'iPad'); + } else { + return false; + } } /** * Are we being browsed on an iPhone/Ipod Touch * @return bool */ -function _xls_is_iphone() { - +// @codingStandardsIgnoreStart +function _xls_is_iphone() +// @codingStandardsIgnoreEnd +{ if(isset($_SERVER['HTTP_USER_AGENT']) && - (strpos($_SERVER['HTTP_USER_AGENT'],'iPhone') || - strpos($_SERVER['HTTP_USER_AGENT'],'iPod'))) + (strpos($_SERVER['HTTP_USER_AGENT'], 'iPhone') || + strpos($_SERVER['HTTP_USER_AGENT'], 'iPod'))) + { return true; + } return false; } @@ -1775,82 +2216,93 @@ function _xls_is_iphone() { * @param string $strLangCode * @param string $strCountryCode (optional) */ +// @codingStandardsIgnoreStart function _xls_lang_init($strLangCode, $strCountryCode = '') +// @codingStandardsIgnoreEnd { - if (Yii::app()->language != $strLangCode) { - + if (Yii::app()->language != $strLangCode) + { Yii::app()->language = $strLangCode; if (!empty($strCountryCode)) + { Yii::app()->session['country_code'] = $strCountryCode; + } return; } } +// @codingStandardsIgnoreStart function _xls_avail_languages() +// @codingStandardsIgnoreEnd { - $data = array(); - foreach (explode(",", _xls_get_conf('LANG_OPTIONS','en_us')) as $cLine) { + foreach (explode(",", _xls_get_conf('LANG_OPTIONS', 'en_us')) as $cLine) + { list ($cKey, $cValue) = explode(':', $cLine, 2); $data[$cKey] = $cValue; } - return $data; + return $data; } +// @codingStandardsIgnoreStart function _xls_check_version() +// @codingStandardsIgnoreEnd { - if(!Yii::app()->theme) return false; + if(!Yii::app()->theme) + { + return false; + } - $url = "http://"._xls_get_conf('LIGHTSPEED_UPDATER','updater.lightspeedretail.com'); + $url = "http://"._xls_get_conf('LIGHTSPEED_UPDATER', 'updater.lightspeedretail.com'); Yii::log("Checking Version (and reporting stats) to $url", 'info', 'application.'.__CLASS__.".".__FUNCTION__); $storeurl = Yii::app()->createAbsoluteUrl("/"); - $storeurl = str_replace("http://","",$storeurl); - $storeurl = str_replace("https://","",$storeurl); + $storeurl = str_replace("http://", "", $storeurl); + $storeurl = str_replace("https://", "", $storeurl); $strTheme = Yii::app()->theme->name; - $strThemeVersion = - (Yii::app()->theme->info->noupdate ? "noupdate" : Yii::app()->theme->info->version); + $strThemeVersion = (Yii::app()->theme->info->noupdate ? "noupdate" : Yii::app()->theme->info->version); if(isset($_SERVER['SERVER_SOFTWARE'])) - $serversoftware=$_SERVER['SERVER_SOFTWARE']; - else - $serversoftware=""; + { + $serversoftware = $_SERVER['SERVER_SOFTWARE']; + } + else { + $serversoftware = ""; + } $data['webstore'] = array( 'version' => XLSWS_VERSIONBUILD, 'customer' => $storeurl, - 'type' => (_xls_get_conf('LIGHTSPEED_HOSTING')==1 ? "hosted" : "self"), - 'track' => (_xls_get_conf('AUTO_UPDATE_TRACK','0')==1 ? "beta" : "release"), - 'autoupdate' => (_xls_get_conf('AUTO_UPDATE','1')==1 ? "1" : "0"), + 'type' => (_xls_get_conf('LIGHTSPEED_HOSTING') == 1 ? "hosted" : "self"), + 'track' => (_xls_get_conf('AUTO_UPDATE_TRACK', '0') == 1 ? "beta" : "release"), + 'autoupdate' => (_xls_get_conf('AUTO_UPDATE', '1') == 1 ? "1" : "0"), 'theme' => $strTheme, - 'serversoftware'=> $serversoftware, + 'serversoftware' => $serversoftware, 'themeversion' => $strThemeVersion, - 'schema' => _xls_get_conf('DATABASE_SCHEMA_VERSION'), + 'schema' => _xls_get_conf('DATABASE_SCHEMA_VERSION', '447'), 'cid' => _xls_get_conf('LIGHTSPEED_CID'), 'phpversion' => PHP_VERSION, 'themefiles' => _xls_theme_report(), 'configuration' => _xls_configuration_report() - ); - if(Yii::app()->params['LIGHTSPEED_MT']=='1') + if(Yii::app()->params['LIGHTSPEED_MT'] == '1') { - //Since we could have two urls on multitenant, just grab the original one - $data['webstore']['customer']=Yii::app()->params['LIGHTSPEED_HOSTING_LIGHTSPEED_URL']; - $data['webstore']['type']="mt-pro"; - if(Yii::app()->params['LIGHTSPEED_CLOUD']>0) + // Since we could have two urls on multitenant, just grab the original one + $data['webstore']['customer'] = Yii::app()->params['LIGHTSPEED_HOSTING_LIGHTSPEED_URL']; + $data['webstore']['type'] = "mt-pro"; + if(Yii::app()->params['LIGHTSPEED_CLOUD'] > 0) { - $data['webstore']['type']="mt-cloud"; - $data['webstore']['cid']=Yii::app()->params['LIGHTSPEED_CLOUD']; + $data['webstore']['type'] = "mt-cloud"; + $data['webstore']['cid'] = Yii::app()->params['LIGHTSPEED_CLOUD']; } - } - Yii::log("sending to stats ".print_r($data,true), 'trace', 'application.'.__CLASS__.".".__FUNCTION__); + Yii::log("sending to stats ".print_r($data, true), 'trace', 'application.'.__CLASS__.".".__FUNCTION__); $json = json_encode($data); $ch = curl_init($url); @@ -1863,20 +2315,25 @@ function _xls_check_version() curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 15); curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE); curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, FALSE); - curl_setopt($ch, CURLOPT_HTTPHEADER, - array("Content-type: application/json")); + curl_setopt( + $ch, + CURLOPT_HTTPHEADER, + array("Content-type: application/json") + ); curl_setopt($ch, CURLOPT_POST, true); curl_setopt($ch, CURLOPT_POSTFIELDS, $json); $resp = curl_exec($ch); curl_close($ch); - if(Yii::app()->params['LIGHTSPEED_HOSTING'] != 1 && _xls_check_migrations()) { $oXML = json_decode($resp); if (!empty($oXML) && isset($oXML->webstore)) + { $oXML->webstore->schema = "update"; + } + $resp = json_encode($oXML); } @@ -1888,58 +2345,78 @@ function _xls_check_version() * * @return bool */ +// @codingStandardsIgnoreStart function _xls_check_migrations() +// @codingStandardsIgnoreEnd { $arrFiles = glob(Yii::getPathOfAlias('application').'/migrations/*.php'); $arrMigrations = preg_grep('/(m(\d{6}_\d{6})_.*?)\.php$/', $arrFiles); $intCount = Yii::app()->db->createCommand("select count(*) from xlsws_migrations")->queryScalar(); - return ((count($arrMigrations)+1) > $intCount); - + return ((count($arrMigrations) + 1) > $intCount); } -//In order to evaluate view layer changes impact, we need to know -//what files have changed in a customer theme. (This is useful for -//judging risk during the development process) -//We simply take an md5 hash of each file in the theme and compare -//it to the hash of our original shipping file. Contents of the file -//are not sent. +// In order to evaluate view layer changes impact, we need to know +// what files have changed in a customer theme. (This is useful for +// judging risk during the development process) +// We simply take an md5 hash of each file in the theme and compare +// it to the hash of our original shipping file. Contents of the file +// are not sent. +// @codingStandardsIgnoreStart function _xls_theme_report() +// @codingStandardsIgnoreEnd { $retVal = getThemeFiles(YiiBase::getPathOfAlias('webroot.themes').'/'.Yii::app()->theme->name); return serialize($retVal); } -function getThemeFiles($dir) { - +// @codingStandardsIgnoreStart +function getThemeFiles($dir) +// @codingStandardsIgnoreEnd +{ $files = array(); - if ($handle = opendir($dir)) { - while (false !== ($file = readdir($handle))) { - if ($file != "." && $file != "..") { - if(is_dir($dir.'/'.$file)) { + if ($handle = opendir($dir)) + { + while (false !== ($file = readdir($handle))) + { + if ($file != "." && $file != "..") + { + if(is_dir($dir.'/'.$file)) + { $dir2 = $dir.'/'.$file; $files[] = getThemeFiles($dir2); } else { - //We only care about php and css files - if(substr($file,-4)==".php" || substr($file,-4)==".css" ) - $files[] = str_replace(YiiBase::getPathOfAlias('webroot.themes').'/'.Yii::app()->theme->name."/","",$dir). - '/'.$file.",".md5_file($dir.'/'.$file); + // We only care about php and css files + if(substr($file, -4) == ".php" || substr($file, -4) == ".css") + { + $files[] = str_replace( + YiiBase::getPathOfAlias('webroot.themes').'/'.Yii::app()->theme->name."/", + "", + $dir + ) . '/'.$file.",".md5_file($dir.'/'.$file); + } } } } + closedir($handle); } return array_flat($files); } -function array_flat($array) { - $tmp=array(); - foreach($array as $a) { - if(is_array($a)) { +// @codingStandardsIgnoreStart +function array_flat($array) +// @codingStandardsIgnoreEnd +{ + $tmp = array(); + foreach($array as $a) + { + if(is_array($a)) + { $tmp = array_merge($tmp, array_flat($a)); } else { @@ -1951,11 +2428,13 @@ function array_flat($array) { } +// @codingStandardsIgnoreStart function _xls_configuration_report() +// @codingStandardsIgnoreEnd { - //In order to make impact decisions, report how these configuration keys are set - //This array will report either the value or simply if they are set (in cases of sensitive data) - $_arrKeysToReport = array( + // In order to make impact decisions, report how these configuration keys are set + // This array will report either the value or simply if they are set (in cases of sensitive data) + $arrKeysToReport = array( 'EMAIL_FROM' => 'value', 'CURRENCY_DEFAULT' => 'value', 'FACEBOOK_APPID' => 'boolean', @@ -1967,43 +2446,54 @@ function _xls_configuration_report() 'LANG_MENU' => 'value' ); - //Report active modules + // Report active modules $retVal = CHtml::listData(Modules::model()->findAllByAttributes(array('active' => 1)), 'module', 'active'); - //How big are some of these tables, affects upgrade processing time when we have to add indexes, etc. Trying to avoid timeouts. + // How big are some of these tables, affects upgrade processing time when we have to add indexes, etc. Trying to avoid timeouts. $retVal['CART_LIFE'] = Yii::app()->db->createCommand("SELECT count(*) as thecount FROM xlsws_cart WHERE cart_type=4 AND modified > '".date("Y-m-d", strtotime("-30 DAYS"))."'")->queryScalar(); $retVal['WEB_PRODUCTS'] = Yii::app()->db->createCommand("SELECT count(*) as thecount FROM xlsws_product WHERE web=1")->queryScalar(); $retVal['TOTAL_PRODUCTS'] = Yii::app()->db->createCommand("SELECT count(*) as thecount FROM xlsws_product")->queryScalar(); $retVal['TOTAL_CATEGORIES'] = Yii::app()->db->createCommand("SELECT count(*) as thecount FROM xlsws_category")->queryScalar(); - foreach ($_arrKeysToReport as $key => $value) + foreach ($arrKeysToReport as $key => $value) + { $retVal[$key] = ($value == "boolean" ? (empty(Yii::app()->params[$key]) ? 0 : 1) : Yii::app()->params[$key]); + } return serialize($retVal); } +// @codingStandardsIgnoreStart function _xls_parse_language($string) +// @codingStandardsIgnoreEnd { $pattern = "|<".Yii::app()->language.".*>(.*)language.">|U"; - preg_match_all($pattern, $string, $output); - if (is_array($output) && count($output)>0 && count($output[1])>0) - return $output[1][0]; - else + if (is_array($output) && count($output) > 0 && count($output[1]) > 0) { - $patternDefaultLang = "/^(.*?)<\b(".str_replace(",","|",_xls_get_conf('LANGUAGES','en')).")/"; + return $output[1][0]; + } else { + $patternDefaultLang = "/^(.*?)<\b(".str_replace(",", "|", _xls_get_conf('LANGUAGES', 'en')).")/"; preg_match_all($patternDefaultLang, $string, $output); - if (is_array($output) && count($output)>0 && count($output[1])>0) + + if (is_array($output) && count($output) > 0 && count($output[1]) > 0) + { return $output[1][0]; + } } return $string; } + +// @codingStandardsIgnoreStart function _xls_parse_language_serialized($string) +// @codingStandardsIgnoreEnd { $output = @unserialize($string); if (empty($output) || !is_array($output)) - $output = array(Yii::app()->language => $string); + { + $output = array(Yii::app()->language => $string); + } return $output; } @@ -2013,13 +2503,18 @@ function _xls_parse_language_serialized($string) * @param string $text * @param boolean $key */ -function _xls_key_encrypt($text , $key = false) { +// @codingStandardsIgnoreStart +function _xls_key_encrypt($text, $key = false) +// @codingStandardsIgnoreEnd +{ if(!$key) - $key = _xls_get_conf('LSKEY' , 'password'); + { + $key = _xls_get_conf('LSKEY', 'password'); + } $text = trim($text); - $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB); - $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND); + $ivSize = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB); + $iv = mcrypt_create_iv($ivSize, MCRYPT_RAND); $enc = mcrypt_encrypt(MCRYPT_RIJNDAEL_256, $key, $text, MCRYPT_MODE_ECB, $iv); return $enc; @@ -2030,21 +2525,29 @@ function _xls_key_encrypt($text , $key = false) { * @param string $enc * @param boolean $key */ -function _xls_key_decrypt($enc , $key = false) { +// @codingStandardsIgnoreStart +function _xls_key_decrypt($enc, $key = false) +// @codingStandardsIgnoreEnd +{ if(!$key) - $key = _xls_get_conf('LSKEY' , 'password'); + { + $key = _xls_get_conf('LSKEY', 'password'); + } - $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB); - $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND); + $ivSize = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB); + $iv = mcrypt_create_iv($ivSize, MCRYPT_RAND); $crypttext = mcrypt_decrypt(MCRYPT_RIJNDAEL_256, $key, $enc, MCRYPT_MODE_ECB, $iv); return trim($crypttext); } +// @codingStandardsIgnoreStart function _xls_encrypt($msg) +// @codingStandardsIgnoreEnd { - if(file_exists(YiiBase::getPathOfAlias('config')."/wskeys.php")) { + if(file_exists(YiiBase::getPathOfAlias('config')."/wskeys.php")) + { $existingKeys = require(YiiBase::getPathOfAlias('config')."/wskeys.php"); $pass = $existingKeys['key']; $salt = $existingKeys['salt']; @@ -2055,14 +2558,17 @@ function _xls_encrypt($msg) return $encrypted; } - else die("missing wskeys"); - - + else { + die("missing wskeys"); + } } +// @codingStandardsIgnoreStart function _xls_decrypt($msg) +// @codingStandardsIgnoreEnd { - if(file_exists(YiiBase::getPathOfAlias('config')."/wskeys.php")) { + if(file_exists(YiiBase::getPathOfAlias('config')."/wskeys.php")) + { $existingKeys = require(YiiBase::getPathOfAlias('config')."/wskeys.php"); $pass = $existingKeys['key']; $salt = $existingKeys['salt']; @@ -2075,95 +2581,154 @@ function _xls_decrypt($msg) return $decrypted; } - else die("missing wskeys"); + else { + die("missing wskeys"); + } } /** * Return an array containing a list of timezone names */ -function _xls_timezones() { +// @codingStandardsIgnoreStart +function _xls_timezones() +// @codingStandardsIgnoreEnd +{ $zones = array('Africa','America','Antarctica','Arctic','Asia', 'Atlantic','Australia','Europe','Indian','Pacific','Canada','US'); $results = array(); - foreach (timezone_identifiers_list() as $zone) { + foreach (timezone_identifiers_list() as $zone) + { // Split the value into 0=>Continent, 1=>City $zone = explode('/', $zone); - if (in_array($zone[0],$zones)) + if (in_array($zone[0], $zones)) + { if (isset($zone[1]) != '') + { $results[] = implode('/', $zone); + } + } } + $results = array_combine($results, $results); return $results; } -/** Determine whether to show the captcha to the user - */ -function _xls_show_captcha($strPage = "checkout") { - switch ($strPage) { - case 'register': $strKey = "CAPTCHA_REGISTRATION"; break; - case 'contactus': $strKey = "CAPTCHA_CONTACTUS"; break; +/** + * Determine whether to show the captcha to the user + */ +// @codingStandardsIgnoreStart +function _xls_show_captcha($strPage = "checkout") +// @codingStandardsIgnoreEnd +{ + switch ($strPage) + { + case 'register': + $strKey = "CAPTCHA_REGISTRATION"; + break; + case 'contactus': + $strKey = "CAPTCHA_CONTACTUS"; + break; case 'checkout': - default: $strKey = "CAPTCHA_CHECKOUT"; break; + default: + $strKey = "CAPTCHA_CHECKOUT"; + break; } - if (_xls_get_conf($strKey , '0')=='2' || (Yii::app()->user->isGuest && _xls_get_conf($strKey , '0')=='1')) + if (_xls_get_conf($strKey, '0') == '2' || (Yii::app()->user->isGuest && _xls_get_conf($strKey, '0') == '1')) + { return true; - else return false; - + } else { + return false; + } } +// @codingStandardsIgnoreStart function _xls_country() +// @codingStandardsIgnoreEnd { - $objCountry = Country::Load(_xls_get_conf('DEFAULT_COUNTRY',39)); + $objCountry = Country::Load(_xls_get_conf('DEFAULT_COUNTRY', 39)); return $objCountry->code; - } -function _xls_recalculate_inventory() { - - $strField = (_xls_get_conf('INVENTORY_FIELD_TOTAL','')==1 ? "inventory_total" : "inventory"); - +// @codingStandardsIgnoreStart +function _xls_recalculate_inventory() +// @codingStandardsIgnoreEnd +{ + $strField = (_xls_get_conf('INVENTORY_FIELD_TOTAL', '') == 1 ? "inventory_total" : "inventory"); $dbC = Yii::app()->db->createCommand(); $dbC->setFetchMode(PDO::FETCH_OBJ);//fetch each row as Object $dbC->select()->from(Product::model()->tableName())->where('web=1 AND '.$strField.'>0 AND - inventory_reserved=0 AND inventory_avail=0 AND - master_model=0')->order('id')->limit(1000); - - foreach ($dbC->queryAll() as $item) { + inventory_reserved=0 AND inventory_avail=0 AND + master_model=0')->order('id')->limit(1000); - $objProduct = Product::model()->findByPk($item->id); - $objProduct->inventory_reserved=$objProduct->CalculateReservedInventory(); - $objProduct->inventory_avail=$objProduct->inventory; - $objProduct->save(); - } + foreach ($dbC->queryAll() as $item) + { + $objProduct = Product::model()->findByPk($item->id); + $objProduct->inventory_reserved = $objProduct->CalculateReservedInventory(); + $objProduct->inventory_avail = $objProduct->inventory; + $objProduct->save(); + } - $ctPic=Yii::app()->db->createCommand("SELECT count(*) as thecount FROM xlsws_product WHERE web=1 AND ".$strField.">0 AND inventory_reserved=0 AND inventory_avail=0 AND master_model=0")->queryScalar(); + $ctPic = Yii::app()->db->createCommand("SELECT count(*) as thecount FROM xlsws_product WHERE web=1 AND ".$strField.">0 AND inventory_reserved=0 AND inventory_avail=0 AND master_model=0")->queryScalar(); return $ctPic; +} +// @codingStandardsIgnoreStart +function mb_pathinfo($filepath, $portion = null) +// @codingStandardsIgnoreEnd +{ + preg_match('%^(.*?)[\\\\/]*(([^/\\\\]*?)(\.([^\.\\\\/]+?)|))[\\\\/\.]*$%im', $filepath, $m); + if(isset($m[1])) + { + $ret['dirname'] = $m[1]; + } + if(isset($m[2])) + { + $ret['basename'] = $m[2]; + } + if(isset($m[5])) + { + $ret['extension'] = $m[5]; + } -} + if(isset($m[3])) + { + $ret['filename'] = $m[3]; + } + if ($portion == PATHINFO_DIRNAME) + { + return $ret['dirname']; + } + + if ($portion == PATHINFO_BASENAME) + { + return $ret['basename']; + } + + if ($portion == PATHINFO_EXTENSION) + { + return $ret['extension']; + } + + if ($portion == PATHINFO_FILENAME) + { + return $ret['filename']; + } -function mb_pathinfo($filepath,$portion = null) { - preg_match('%^(.*?)[\\\\/]*(([^/\\\\]*?)(\.([^\.\\\\/]+?)|))[\\\\/\.]*$%im',$filepath,$m); - if(isset($m[1])) $ret['dirname']=$m[1]; - if(isset($m[2])) $ret['basename']=$m[2]; - if(isset($m[5])) $ret['extension']=$m[5]; - if(isset($m[3])) $ret['filename']=$m[3]; - if ($portion==PATHINFO_DIRNAME) return $ret['dirname']; - if ($portion==PATHINFO_BASENAME) return $ret['basename']; - if ($portion==PATHINFO_EXTENSION) return $ret['extension']; - if ($portion==PATHINFO_FILENAME) return $ret['filename']; return $ret; } + +// @codingStandardsIgnoreStart function convert_number_to_words($number) +// @codingStandardsIgnoreEnd { $hyphen = $negative = "-"; $conjunction = "and"; @@ -2171,212 +2736,264 @@ function convert_number_to_words($number) $decimal = "."; $dictionary = array( 0 => 'Zero', - 1 => 'One', - 2 => 'Two', - 3 => 'Three', - 4 => 'Four', - 5 => 'Five', - 6 => 'Six', - 7 => 'Seven', - 8 => 'Eight', - 9 => 'Nine', - 10 => 'Ten', - 11 => 'Eleven', - 12 => 'Twelve', - 13 => 'Thirteen', - 14 => 'Fourteen', - 15 => 'Fifteen', - 16 => 'Sixteen', - 17 => 'Seventeen', - 18 => 'Eighteen', - 19 => 'Nineteen', - 20 => 'Twenty', - 30 => 'Thirty', - 40 => 'Fourty', - 50 => 'Fifty', - 60 => 'Sixty', - 70 => 'Seventy', - 80 => 'Eighty', - 90 => 'Ninety', - 100 => 'Hundred', - 1000 => 'Thousand', - 1000000 => 'Million', - 1000000000 => 'Billion', - 1000000000000 => 'Trillion', - 1000000000000000 => 'Quadrillion', - 1000000000000000000 => 'Quintillion' - ); - - if (!is_numeric($number)) { - return false; - } - - if (($number >= 0 && (int) $number < 0) || (int) $number < 0 - PHP_INT_MAX) { - // overflow - trigger_error( - 'convert_number_to_words only accepts numbers between -' . PHP_INT_MAX . ' and ' . PHP_INT_MAX, - E_USER_WARNING - ); - return false; - } - - if ($number < 0) { - return $negative . convert_number_to_words(abs($number)); - } - - $string = $fraction = null; - - if (strpos($number, '.') !== false) { - list($number, $fraction) = explode('.', $number); - } - - switch (true) { - case $number < 21: - $string = $dictionary[$number]; - break; - case $number < 100: - $tens = ((int) ($number / 10)) * 10; - $units = $number % 10; - $string = $dictionary[$tens]; - if ($units) { - $string .= $hyphen . $dictionary[$units]; - } - break; - case $number < 1000: - $hundreds = $number / 100; - $remainder = $number % 100; - $string = $dictionary[$hundreds] . ' ' . $dictionary[100]; - if ($remainder) { - $string .= $conjunction . convert_number_to_words($remainder); - } - break; - default: - $baseUnit = pow(1000, floor(log($number, 1000))); - $numBaseUnits = (int) ($number / $baseUnit); - $remainder = $number % $baseUnit; - $string = convert_number_to_words($numBaseUnits) . ' ' . $dictionary[$baseUnit]; - if ($remainder) { - $string .= $remainder < 100 ? $conjunction : $separator; - $string .= convert_number_to_words($remainder); - } - break; - } - - if (null !== $fraction && is_numeric($fraction)) { - $string .= $decimal; - $words = array(); - foreach (str_split((string) $fraction) as $number) { - $words[] = $dictionary[$number]; - } - $string .= implode(' ', $words); - } - - return strtolower($string); + 1 => 'One', + 2 => 'Two', + 3 => 'Three', + 4 => 'Four', + 5 => 'Five', + 6 => 'Six', + 7 => 'Seven', + 8 => 'Eight', + 9 => 'Nine', + 10 => 'Ten', + 11 => 'Eleven', + 12 => 'Twelve', + 13 => 'Thirteen', + 14 => 'Fourteen', + 15 => 'Fifteen', + 16 => 'Sixteen', + 17 => 'Seventeen', + 18 => 'Eighteen', + 19 => 'Nineteen', + 20 => 'Twenty', + 30 => 'Thirty', + 40 => 'Fourty', + 50 => 'Fifty', + 60 => 'Sixty', + 70 => 'Seventy', + 80 => 'Eighty', + 90 => 'Ninety', + 100 => 'Hundred', + 1000 => 'Thousand', + 1000000 => 'Million', + 1000000000 => 'Billion', + 1000000000000 => 'Trillion', + 1000000000000000 => 'Quadrillion', + 1000000000000000000 => 'Quintillion' + ); + + if (!is_numeric($number)) + { + return false; + } + + if (($number >= 0 && (int) $number < 0) || (int) $number < 0 - PHP_INT_MAX) + { + // overflow + trigger_error( + 'convert_number_to_words only accepts numbers between -' . PHP_INT_MAX . ' and ' . PHP_INT_MAX, + E_USER_WARNING + ); + return false; + } + + if ($number < 0) + { + return $negative . convert_number_to_words(abs($number)); + } + + $string = $fraction = null; + + if (strpos($number, '.') !== false) + { + list($number, $fraction) = explode('.', $number); + } + + switch (true) + { + case $number < 21: + $string = $dictionary[$number]; + break; + case $number < 100: + $tens = ((int) ($number / 10)) * 10; + $units = $number % 10; + $string = $dictionary[$tens]; + if ($units) + { + $string .= $hyphen . $dictionary[$units]; + } + break; + case $number < 1000: + $hundreds = $number / 100; + $remainder = $number % 100; + $string = $dictionary[$hundreds] . ' ' . $dictionary[100]; + if ($remainder) + { + $string .= $conjunction . convert_number_to_words($remainder); + } + break; + default: + $baseUnit = pow(1000, floor(log($number, 1000))); + $numBaseUnits = (int) ($number / $baseUnit); + $remainder = $number % $baseUnit; + $string = convert_number_to_words($numBaseUnits) . ' ' . $dictionary[$baseUnit]; + if ($remainder) + { + $string .= $remainder < 100 ? $conjunction : $separator; + $string .= convert_number_to_words($remainder); + } + break; + } + + if (null !== $fraction && is_numeric($fraction)) + { + $string .= $decimal; + $words = array(); + foreach (str_split((string) $fraction) as $number) + { + $words[] = $dictionary[$number]; + } + + $string .= implode(' ', $words); + } + + return strtolower($string); } /** * Function for displaying what called function, useful for debugging */ -function _xls_whereCalled( $level = 1 ) { +// @codingStandardsIgnoreStart +function _xls_whereCalled($level = 1) +// @codingStandardsIgnoreEnd +{ $trace = debug_backtrace(); $file = isset($trace[$level]['file']) ? $trace[$level]['file'] : "file?"; $line = isset($trace[$level]['line']) ? $trace[$level]['line'] : "line?"; $object = isset($trace[$level]['object']) ? $trace[$level]['object'] : "object?"; - if (is_object($object)) { $object = get_class($object); } + if (is_object($object)) + { + $object = get_class($object); + } return "Where called: class $object was called on line $line of $file"; - } -function _dbx($sql) { - //Run SQL query directly +function _dbx($sql) +{ + // Run SQL query directly return Yii::app()->db->createCommand($sql)->execute(); } + function _xt($strToTranslate) { - echo Yii::t('global',$strToTranslate); + echo Yii::t('global', $strToTranslate); Yii::log("Called outdated _xt() function for string ".$strToTranslate, CLogger::LEVEL_WARNING, 'application.'.__CLASS__.".".__FUNCTION__); } +// @codingStandardsIgnoreStart function _xls_convert_date_to_js($strFormat) +// @codingStandardsIgnoreEnd { - - $strFormat = str_replace("y","yy",$strFormat); - $strFormat = str_replace("Y","yyyy",$strFormat); - $strFormat = str_replace("d","dd",$strFormat); - $strFormat = str_replace("m","mm",$strFormat); + $strFormat = str_replace("y", "yy", $strFormat); + $strFormat = str_replace("Y", "yyyy", $strFormat); + $strFormat = str_replace("d", "dd", $strFormat); + $strFormat = str_replace("m", "mm", $strFormat); return $strFormat; - } -function recurse_copy($src,$dst) { +// @codingStandardsIgnoreStart +function recurse_copy($src, $dst) +// @codingStandardsIgnoreEnd +{ $dir = opendir($src); @mkdir($dst); - while(false !== ( $file = readdir($dir)) ) { - if (( $file != '.' ) && ( $file != '..' )) { - if ( is_dir($src . '/' . $file) ) { - recurse_copy($src . '/' . $file,$dst . '/' . $file); + while(false !== ( $file = readdir($dir))) + { + if (( $file != '.' ) && ( $file != '..' )) + { + if (is_dir($src . '/' . $file)) + { + recurse_copy($src . '/' . $file, $dst . '/' . $file); } else { - copy($src . '/' . $file,$dst . '/' . $file); + copy($src . '/' . $file, $dst . '/' . $file); } } } + closedir($dir); } -function rrmdir($dir) { - if (is_dir($dir)) { +function rrmdir($dir) +{ + if (is_dir($dir)) + { $files = scandir($dir); foreach ($files as $file) - if ($file != "." && $file != "..") rrmdir("$dir/$file"); + { + if ($file != "." && $file != "..") + { + rrmdir("$dir/$file"); + } + } + rmdir($dir); } - else if (file_exists($dir)) unlink($dir); + elseif (file_exists($dir)) + { + unlink($dir); + } } // Function to Copy folders and files -function rcopy($src, $dst) { - if (file_exists ( $dst )) - rrmdir ( $dst ); - if (is_dir ( $src )) { - mkdir ( $dst ); - $files = scandir ( $src ); - foreach ( $files as $file ) +function rcopy($src, $dst) +{ + if (file_exists($dst)) + { + rrmdir($dst); + } + + if (is_dir($src)) + { + mkdir($dst); + $files = scandir($src); + foreach ($files as $file) + { if ($file != "." && $file != "..") - rcopy ( "$src/$file", "$dst/$file" ); - } else if (file_exists ( $src )) - copy ( $src, $dst ); + { + rcopy("$src/$file", "$dst/$file"); + } + } + } elseif (file_exists($src)) { + copy($src, $dst); + } } +// @codingStandardsIgnoreStart function RemoveEmptySubFolders($path) +// @codingStandardsIgnoreEnd { - $empty=true; + $empty = true; foreach (glob($path.DIRECTORY_SEPARATOR."*") as $file) { $empty &= is_dir($file) && RemoveEmptySubFolders($file); } + return $empty && @rmdir($path); } -function _xls_custom_css_folder($local=false) +// @codingStandardsIgnoreStart +function _xls_custom_css_folder($local = false) +// @codingStandardsIgnoreEnd { - if(Yii::app()->params['LIGHTSPEED_MT']=="1") + if(Yii::app()->params['LIGHTSPEED_MT'] == "1") + { return "http://lightspeedwebstore.s3.amazonaws.com/". Yii::app()->params['LIGHTSPEED_HOSTING_LIGHTSPEED_URL']."/themes/"; - else - { + } else { $strCustomFolder = Yii::app()->theme->info->useCustomFolderForCustomcss ? '/custom' : ''; return ($local ? YiiBase::getPathOfAlias('custom') : Yii::app()->baseUrl . $strCustomFolder) . "/themes/"; } - } +// @codingStandardsIgnoreStart function _upload_default_header_to_s3() +// @codingStandardsIgnoreEnd { Gallery::LoadGallery(1); $d = dir(YiiBase::getPathOfAlias('webroot')."/images/header"); - while (false!== ($filename = $d->read())) + while (false !== ($filename = $d->read())) { if ($filename == "defaultheader.png") { @@ -2387,33 +3004,33 @@ function _upload_default_header_to_s3() $model->description = ''; $model->thumb_ext = 'png'; $model->save(); - $arrImages["/images/header/".$filename] = - CHtml::image(Yii::app()->request->baseUrl."/images/header/".$filename); + $arrImages["/images/header/".$filename] = CHtml::image(Yii::app()->request->baseUrl."/images/header/".$filename); $src = YiiBase::getPathOfAlias('webroot')."/images/header/".$filename; $fileinfo = mb_pathinfo($filename); - $imageFile = new CUploadedFile($filename, + $imageFile = new CUploadedFile( + $filename, $src, "image/".$fileinfo['extension'], getimagesize($src), null ); - if(Yii::app()->params['LIGHTSPEED_MT']=='1') + if(Yii::app()->params['LIGHTSPEED_MT'] == '1') + { $model->setS3Image($imageFile); - _xls_set_conf('HEADER_IMAGE', + } + + _xls_set_conf( + 'HEADER_IMAGE', "//lightspeedwebstore.s3.amazonaws.com/". _xls_get_conf('LIGHTSPEED_HOSTING_LIGHTSPEED_URL'). "/gallery/1/".$model->id.".png" ); - } } - - - } /** @@ -2423,7 +3040,8 @@ function _upload_default_header_to_s3() * * @return string Indented version of the original JSON string. */ -function prettyjson($json) { +function prettyjson($json) +{ $result = ''; $pos = 0; @@ -2433,21 +3051,23 @@ function prettyjson($json) { $prevChar = ''; $outOfQuotes = true; - for ($i=0; $i<=$strLen; $i++) { - + for ($i = 0; $i <= $strLen; $i++) + { // Grab the next character in the string. $char = substr($json, $i, 1); // Are we inside a quoted string? - if ($char == '"' && $prevChar != '\\') { + if ($char == '"' && $prevChar != '\\') + { $outOfQuotes = !$outOfQuotes; // If this character is the end of an element, // output a new line and indent the next line. - } else if(($char == '}' || $char == ']') && $outOfQuotes) { + } elseif(($char == '}' || $char == ']') && $outOfQuotes) { $result .= $newLine; $pos --; - for ($j=0; $j<$pos; $j++) { + for ($j = 0; $j < $pos; $j++) + { $result .= $indentStr; } } @@ -2457,13 +3077,16 @@ function prettyjson($json) { // If the last character was the beginning of an element, // output a new line and indent the next line. - if (($char == ',' || $char == '{' || $char == '[') && $outOfQuotes) { + if (($char == ',' || $char == '{' || $char == '[') && $outOfQuotes) + { $result .= $newLine; - if ($char == '{' || $char == '[') { + if ($char == '{' || $char == '[') + { $pos ++; } - for ($j = 0; $j < $pos; $j++) { + for ($j = 0; $j < $pos; $j++) + { $result .= $indentStr; } } @@ -2476,7 +3099,6 @@ function prettyjson($json) { function _runMigrationTool($steps = null) { - $commandPath = Yii::app()->getBasePath() . DIRECTORY_SEPARATOR . 'commands'; $runner = new CConsoleCommandRunner(); $runner->addCommands($commandPath); @@ -2485,13 +3107,15 @@ function _runMigrationTool($steps = null) $commandPath = Yii::app()->getBasePath() . DIRECTORY_SEPARATOR . 'helpers' . DIRECTORY_SEPARATOR . 'SingleMigrateCommand'; $runner->addCommands($commandPath); if(is_null($steps)) - $strCommand = 'migrate'; - elseif($steps == 'set') - $strCommand = 'setmigrate'; - elseif($steps == 'upgrade') - $strCommand = 'upgrademigrate'; - else - $strCommand = 'singlemigrate'; + { + $strCommand = 'migrate'; + } elseif($steps == 'set') { + $strCommand = 'setmigrate'; + } elseif($steps == 'upgrade') { + $strCommand = 'upgrademigrate'; + } else { + $strCommand = 'singlemigrate'; + } Yii::log("Migrating with $strCommand", 'error', 'application.'.__CLASS__.".".__FUNCTION__); $args = array('yiic', $strCommand, '--interactive=0','--migrationTable=xlsws_migrations'); @@ -2499,7 +3123,6 @@ function _runMigrationTool($steps = null) ob_start(); $runner->run($args); return htmlentities(ob_get_clean(), null, Yii::app()->charset); - } diff --git a/core/protected/components/zip.php b/core/protected/components/zip.php index 2054b53d..68660def 100644 --- a/core/protected/components/zip.php +++ b/core/protected/components/zip.php @@ -1,4 +1,6 @@ user->setFlash( 'error', - Yii::t('global','This email address already exists but that is not the correct password so we cannot log you in.') + Yii::t('global', 'This email address already exists but that is not the correct password so we cannot log you in.') ); Yii::log( $model->contactEmail." login from checkout with invalid password", @@ -694,7 +694,7 @@ public function actionCheckout() ); $this->refresh(); return; - break; + case UserIdentity::ERROR_USERNAME_INVALID: $objCustomer = Customer::CreateFromCheckoutForm($model); $identity = new UserIdentity($model->contactEmail, $model->createPassword); @@ -711,16 +711,17 @@ public function actionCheckout() Yii::app()->user->setFlash( 'error', - Yii::t('global','Error logging in after creating account. Cannot continue.') + Yii::t('global', 'Error logging in after creating account. Cannot continue.') ); $this->refresh(); return; } - break; + case UserIdentity::ERROR_NONE: break; + default: Yii::log( "Error: Unhandled errorCode " . $identity->errorCode, diff --git a/core/protected/controllers/InstallController.php b/core/protected/controllers/InstallController.php index 05b22916..51d5a0b1 100644 --- a/core/protected/controllers/InstallController.php +++ b/core/protected/controllers/InstallController.php @@ -1134,7 +1134,6 @@ protected function actionUpdateConfiguration() $objConfig->save(); //What we're gonna do right here is go back.... way back... - _xls_set_conf('DATABASE_SCHEMA_VERSION',447); return array('result'=>"success",'makeline'=>50,'tag'=>'Migrating Database','total'=>50); } diff --git a/core/protected/controllers/LegacysoapController.php b/core/protected/controllers/LegacysoapController.php index 7cbdadcf..7d0f37f7 100644 --- a/core/protected/controllers/LegacysoapController.php +++ b/core/protected/controllers/LegacysoapController.php @@ -911,7 +911,7 @@ public function remove_product_images($passkey , $intRowid){ return self::OK; try { - $objProduct->DeleteImages(); + $objProduct->deleteImages(); } catch(Exception $e) { Yii::log('Error deleting product images for ' . $intRowid . @@ -1635,15 +1635,26 @@ public function add_quote_item($passkey if (empty($strDescription)) $strDescription=$objProduct->title; - if(_xls_get_conf('TAX_INCLUSIVE_PRICING') == '1') - list($fltTaxedPrice, $arrTaxes) = - Tax::CalculatePricesWithTax($fltSell, $objDocument->fk_tax_code_id, $objProduct->tax_status_id); - else $fltTaxedPrice = $fltSell; + if (_xls_get_conf('TAX_INCLUSIVE_PRICING') == '1') + { + $arr = Tax::calculatePricesWithTax($fltSell, $objDocument->fk_tax_code_id, $objProduct->tax_status_id); + + $fltTaxedPrice = $arr['fltSellTotalWithTax']; + } + else + { + $fltTaxedPrice = $fltSell; + } - $retVal = $objDocument->AddSoapProduct($objDocument->id, + $retVal = $objDocument->AddSoapProduct( + $objDocument->id, $objProduct, - $fltQty, $strDescription, - $fltTaxedPrice, $fltDiscount, CartType::quote); + $fltQty, + $strDescription, + $fltTaxedPrice, + $fltDiscount, + CartType::quote + ); if (!$retVal) return self::UNKNOWN_ERROR; diff --git a/core/protected/controllers/MyaccountController.php b/core/protected/controllers/MyaccountController.php index 8118fbda..bdeb32c1 100644 --- a/core/protected/controllers/MyaccountController.php +++ b/core/protected/controllers/MyaccountController.php @@ -49,77 +49,87 @@ public function actionEdit() { //For current customers $model = Customer::GetCurrent(); - } // collect user input data - if(isset($_POST['Customer'])) + if (isset($_POST['Customer'])) { if (is_null($model->id)) { $model->scenario = Customer::SCENARIO_INSERT; } - else $model->scenario = Customer::SCENARIO_UPDATE; + else + { + $model->scenario = Customer::SCENARIO_UPDATE; + } $strPassword = $_POST['Customer']['password']; + if (empty($strPassword) && isset($_POST['Customer']['password'])) { unset($_POST['Customer']['password']); if (empty($strPassword) && isset($_POST['Customer']['password_repeat'])) + { unset($_POST['Customer']['password_repeat']); + } + } + elseif ($model->scenario == Customer::SCENARIO_UPDATE) + { + $model->scenario = Customer::SCENARIO_UPDATEPASSWORD; } - elseif ($model->scenario == Customer::SCENARIO_UPDATE) $model->scenario = Customer::SCENARIO_UPDATEPASSWORD; - $model->attributes=$_POST['Customer']; + $model->attributes = $_POST['Customer']; - if($model->validate()) + if ($model->validate()) { //If we haven't created a new password, retain the old one -- need repeat to pass validation - if ($model->scenario== Customer::SCENARIO_INSERT || $model->scenario== Customer::SCENARIO_UPDATEPASSWORD) + if ($model->scenario == Customer::SCENARIO_INSERT || $model->scenario == Customer::SCENARIO_UPDATEPASSWORD) { - //$model->password = _xls_encrypt($strPassword); $model->password = $strPassword; $model->password_repeat = $model->password; } - if ($model->scenario== Customer::SCENARIO_INSERT && _xls_get_conf('MODERATE_REGISTRATION')==1) + if ($model->scenario == Customer::SCENARIO_INSERT && _xls_get_conf('MODERATE_REGISTRATION') == 1) { $model->allow_login = Customer::UNAPPROVED_USER; $model->record_type = Customer::REGISTERED; } - elseif ($model->scenario== Customer::SCENARIO_INSERT) + elseif ($model->scenario == Customer::SCENARIO_INSERT) { $model->allow_login = Customer::NORMAL_USER; $model->record_type = Customer::REGISTERED; } + if (!$model->save()) { //Put plain text passwords back for form refresh $model->password = $strPassword; $model->password_repeat = $strPassword; - Yii::log("Error creating new user ".print_r($model->getErrors(),true), 'error', 'application.'.__CLASS__.".".__FUNCTION__); + Yii::log("Error creating new user ".print_r($model->getErrors(), true), 'error', 'application.'.__CLASS__.".".__FUNCTION__); } else { - if (Yii::app()->user->isGuest) - $this->createAndLogin($model,$strPassword); + { + $this->createAndLogin($model, $strPassword); + } else - $this->triggerEmailCampaign($model,'onUpdateCustomer'); + { + $this->triggerEmailCampaign($model, 'onUpdateCustomer'); + } $this->redirect($this->createUrl("/myaccount")); } - } } $this->breadcrumbs = array( - Yii::t('global','My Account')=>$this->createUrl("/myaccount"), - Yii::t('global','Edit Account')=>$this->createUrl("myaccount/edit"), + Yii::t('global', 'My Account') => $this->createUrl("/myaccount"), + Yii::t('global', 'Edit Account') => $this->createUrl("myaccount/edit"), ); $model->password = null; //don't bother sending password to form - $this->render('edit',array('model'=>$model)); + $this->render('edit', array('model' => $model)); } /** @@ -281,7 +291,7 @@ public function actionCreate() */ protected function createAndLogin($model,$strPassword) { - if(Yii::app()->params['MODERATE_REGISTRATION']==1) + if (Yii::app()->params['MODERATE_REGISTRATION'] == 1) { $this->triggerEmailCampaign($model,'onAddCustomer'); @@ -292,34 +302,39 @@ protected function createAndLogin($model,$strPassword) } //We've successfully created the account, so just log in - $loginModel=new LoginForm; - $loginModel->email=$model->email; - $loginModel->password=$strPassword; + $loginModel = new LoginForm; + $loginModel->email = $model->email; + $loginModel->password = $strPassword; // validate user input and redirect to the previous page if valid - if($loginModel->validate() && $loginModel->login()) + if ($loginModel->validate() && $loginModel->login()) { Yii::app()->user->setFlash('success', Yii::t('customer','Your account has been created and you have been logged in automatically.')); } else { - Yii::log("Error logging in our newly created user ".print_r($loginModel->getErrors(),true), - 'error', 'application.'.__CLASS__.".".__FUNCTION__); - Yii::app()->user->setFlash('error', - Yii::t('customer','Your account has been created but we had an error logging you in.')); + Yii::log( + "Error logging in our newly created user " . print_r($loginModel->getErrors(), true), + 'error', + 'application.'.__CLASS__.".".__FUNCTION__ + ); + + Yii::app()->user->setFlash( + 'error', + Yii::t('customer','Your account has been created but we had an error logging you in.') + ); } $this->triggerEmailCampaign($model,'onAddCustomer'); //Common SSL mode means we need to pass back to the original URL and log in again automatically - if(Yii::app()->isCommonSSL) + if (Yii::app()->isCommonSSL) { $strIdentity = Yii::app()->user->id.",".Yii::app()->shoppingcart->id.",site,index"; Yii::log("Log in ".$strIdentity, 'info', 'application.'.__CLASS__.".".__FUNCTION__); $redirString = _xls_encrypt($strIdentity); - $url = Yii::app()->controller->createAbsoluteUrl( - 'commonssl/login',array('link'=>$redirString)); + $url = Yii::app()->controller->createAbsoluteUrl('commonssl/login', array('link'=>$redirString)); $url = str_replace( "https://".Yii::app()->params['LIGHTSPEED_HOSTING_LIGHTSPEED_URL'], diff --git a/core/protected/controllers/SoapController.php b/core/protected/controllers/SoapController.php index 4fe95ba6..15397fef 100644 --- a/core/protected/controllers/SoapController.php +++ b/core/protected/controllers/SoapController.php @@ -594,7 +594,7 @@ public function remove_product_images($passkey , $intRowid) return self::OK; try { - $objProduct->DeleteImages(); + $objProduct->deleteImages(); } catch(Exception $e) { $strMsg = "Error deleting product image for $intRowid"; @@ -1534,7 +1534,9 @@ protected function json_encode_orders($obj, $attributeNames) foreach ($arrItems as $itemKey => $objItem) { - list($taxCharged,$taxesIndividual,$taxRates) = Tax::CalculatePricesWithTax($objItem->sell_total,$order->tax_code_id,$objItem->product->tax_status_id); + $arr = Tax::calculatePricesWithTax($objItem->sell_total, $order->tax_code_id, $objItem->product->tax_status_id); + $taxRates = $arr['arrTaxRates']; + $arrTaxRatesForItem = array(); foreach ($taxRates as $key => $value) { if ($value > 0) { @@ -1658,4 +1660,4 @@ public function assign_lightspeed_id($passkey, $id, $lightspeed_id) Customer::model()->updateByPk($id,array('lightspeed_id'=>$lightspeed_id)); return self::OK; } -} \ No newline at end of file +} diff --git a/core/protected/extensions/umber/assets/customized/_base.scss b/core/protected/extensions/umber/assets/customized/_base.scss deleted file mode 100755 index 43b88324..00000000 --- a/core/protected/extensions/umber/assets/customized/_base.scss +++ /dev/null @@ -1,224 +0,0 @@ -$accent-background-color: #3287cc !default; -$accent-color: white !default; - -$overlay-background-color: #eee !default; -$overlay-color: #555 !default; - -$heading-font-weight: bold !default; -$heading-font-family: 'Open Sans', 'Helvetica Neue', Helvetica, sans-serif !default; - -$confirmation-color: green !default; - -// Font faces -$body-font-family: 'Open Sans', 'Helvetica Neue', Helvetica, sans-serif !default; - - -body.overlay, .editcartmodal.webstore-modal.show { - background-color: $overlay-background-color; -} - - -.webstore-overlay { - font-family: $body-font-family; - - h1 { - font-weight: $heading-font-weight; - font-family: $heading-font-family; - } - - section footer p { - $overlay-color-adjusted: $overlay-color; - @if(lightness($overlay-background-color) > 50) { - $overlay-color-adjusted: lighten($overlay-color, 25%); - } @else { - $overlay-color-adjusted: darken($overlay-color, 25%); - } - - color: $overlay-color-adjusted; - strong { color: $overlay-color-adjusted; } - a { color: $overlay-color-adjusted; } - } - - a { - color: $accent-background-color; - &:hover { border-bottom-color: $accent-background-color; } - - &.hasborder { - border-bottom-color: lighten($accent-background-color, 25%); - &:hover { border-bottom-color: $accent-background-color; } - } - } - - @if(lightness($overlay-background-color) < 20) { - .section-inner { border-color: #fff; } - } - - header.overlay { - #addcart .exit, h1 a { color: $overlay-color; } - #addcart .exit:hover { border-bottom-color: $overlay-color; } - } - - button, .button { - background-color: $calltoaction-color; - color: $accent-color; - - &:hover { background-color: darken($accent-background-color,10%); } - - &.inset:hover { - border-color: $accent-background-color; - background: $accent-background-color; - color: $accent-color; - } - - &.continue, &.share { - &:hover { - background: none; - border-color: $accent-background-color; - color: $accent-background-color; - &:before { color: $accent-background-color; } - } - } - } - - .choices { - button, .button { - &:hover { - background: $accent-background-color; - border-color: $accent-background-color; - color: $accent-color; - } - } - } - - .field-container select.modal-accent-color { color: $accent-background-color; } - - .thankyou a.print:hover, .thankyou a.print:active { - color: $accent-background-color; - border-color: $accent-background-color; - } - - .address-blocks { - p .controls { - a:hover { - border-color: $accent-background-color; - } - } - button:hover { - background-color: $accent-background-color; - border-color: $accent-background-color; - color: lighten($accent-background-color, 100%); - } - } - - .wishlists { - button:hover { - background-color: $accent-background-color; - border-color: $accent-background-color; - color: lighten($accent-background-color, 100%); - } - .wishlist-block { - span.title { - color: $accent-background-color; - } - p:hover { - background-color: $accent-background-color; - border-color: $accent-background-color; - span.title { - color: lighten($accent-background-color, 100%); - } - } - } - } - - .order-history { - table.lines td.date { - color: $accent-background-color; - } - } -} - - - -.wishlist-lines { - .save, .add-to-cart { - background: $accent-background-color; - border-color: $accent-background-color; - - &:hover { - background: darken($accent-background-color,10%); - border-color: darken($accent-background-color,10%) - } - } - a.edit:hover { - border-color: $accent-background-color; - color: $accent-background-color; - } -} - -.wishlist-share a.service { - color: $accent-background-color; - &:hover { color: darken($accent-background-color,10%); } -} - -.wishlist-buttons { - button { - background: none; - color: #888; - - &:hover { - border-color: $accent-background-color; - color: $accent-background-color; - background: none; - } - } -} - -//MO - Prevent text selection -button, .button, .no-selection { - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; -} - -.webstore-modal-overlay, -//MO added second line to include add to cart. -.webstore-modal-overlay .cart-summary footer{ - button, .button, input[type="button"] { - background-color: $accent-background-color; - color: $accent-color; - - &:hover { background-color: darken($accent-background-color,10%); } - - &.inset:hover { - border-color: $accent-background-color; - background: $accent-background-color; - color: $accent-color; - } - - &.continue, &.share, &.webstore-change-item { - &:hover { - background: none; - border-color: $accent-background-color; - color: $accent-background-color; - &:before { color: $accent-background-color; } - } - } - - //added by MO to target the exit button in the add to cart. - #addcart .continue-shopping.exit { - background-color: #ccc; - color: #888; - &:hover { - background-color: #999; - color: #fff; - } - } - } -} - - - -.webstore-modal-overlay .shipping-estimate-line th > a:first-child{ - font-weight: bold; -} \ No newline at end of file diff --git a/core/protected/extensions/umber/assets/customized/brooklyn2014.scss b/core/protected/extensions/umber/assets/customized/brooklyn2014.scss deleted file mode 100644 index 28a67e8c..00000000 --- a/core/protected/extensions/umber/assets/customized/brooklyn2014.scss +++ /dev/null @@ -1,4 +0,0 @@ -$accent-background-color: #3287CC; -$calltoaction-color: #3287CC; - -@import "base"; diff --git a/core/protected/extensions/umber/assets/docs.scss b/core/protected/extensions/umber/assets/docs.scss deleted file mode 100755 index 65c22f8f..00000000 --- a/core/protected/extensions/umber/assets/docs.scss +++ /dev/null @@ -1,379 +0,0 @@ -@import 'lib/normalize'; - -@charset "utf-8"; - -$break-mobile: 0px; // This is used in limited situations, generally styles layer-up, not down. -$break-small: 560px; -$break-medium: 720px; -$break-large: 1025px; - -$break-short: 500px; - -@import 'mixins/html5-input-types'; - -@mixin media($media) { - @if $media == 'mobile' { - @media (max-width: $break-mobile) { @content; } - } - @else if $media == 'small' { - @media (min-width: $break-small) { @content; } - } - @else if $media == 'medium' { - @media (min-width: $break-medium) { @content; } - } - @else if $media == 'large' { - @media (min-width: $break-large) { @content; } - } - @else if $media == 'short' { - @media (max-height: $break-short) { @content; } - } - @else { - @content; - } -} - -* { - @include box-sizing(border-box); -} - -// Colors -$font-color: #000; -$highlight: #ffc; - -$grey-medium: #666; - -$blue: #3d89d1; -$green: #95BE64; - -// Navigation - - -$header-bg-color: $blue; - -// Link colors -$link-color: $blue; -$link-hover-color: darken($blue,10%); -$link-active-color: darken($blue,20%); -//$link-focus-color: false; -//$link-visited-color: false; - -a { - color: $link-color; - &:active { color: $link-active-color; } - a:hover { color: $link-hover-color; } -} - -// Font Sets -$font-family: 'Lucida Grande', 'Lucida Sans Unicode', 'Lucida Sans', Tahoma, Verdana, Arial, sans-serif; -$font-family-enhanced: 'Open Sans', 'Helvetica Neue', Helvetica, Verdana, Arial, sans-serif; -$font-family-helvetica: 'Helvetica Neue', Helvetica, Verdana, Arial, sans-serif; - -body { - font-family: $font-family; - color: #444; - //MO boostrap override - font-size:16px; -} - -#{headings()} { - font-family: $font-family-enhanced; - font-weight: 600; - margin: 0 0 .25em; - - small { - color: $grey-medium; - font-weight: normal; - } - - a { - text-decoration: none; - border-bottom: 2px solid lighten($blue, 40%); - padding: 0; - color: $blue; - - &:hover { - border-bottom: 2px solid $blue; - } - } -} - -h1 { - font-family: $font-family-helvetica; - font-size: 6em; - font-weight: 100; - margin: 1em 0 .25em; - color: #999; -} -h2 { - font-size: 1.5em; - font-weight: 600; - margin: 1.5em 0 .25em; - color: #666; -} -h3 { - font-size: 1.25em; -} -h4 { - font-size: 1.125em; -} - -ol, ul { - -} -li { - font: .9em/1.6 $font-family; - -} - -p { - font: .9em/1.6 $font-family; - margin: 0 0 1em; - - &.large, &.medium { - font-family: $font-family-enhanced; - line-height: 1.5; - font-size: 1.1em; - } - - &.large { - font-size: 1.5em; - margin-bottom: .5em; - } -} - - -ol.products { - width: 100%; - margin: 0; - padding: 0; - border: 1px solid #ccc; - @include clearfix(); - - li { - width: 50%; - display: inline-block; - float: left; - padding: 1.25rem 1rem 1rem; - - } - - :first-child > li { border-right: 1px solid #ccc; } - :last-child > li { - margin-left: -1px; - border-left: 1px solid #ccc; - } - - a { - color: #888; - - &:hover li { background-color: #f8f8f8; } - } - - h2 { - color: $blue; - margin: 0 0 .125em; - font-weight: 400; - font-size: 2.5rem; - line-height: 1; - } - p { - margin: 0; - - } -} - - - -body { - margin-top: 68px; - - & > header { - h1 { - border-top: none; - margin: 0; - font: bold 1.25rem $font-family-enhanced; - - padding: 1em 5%; - color: #888; - font-weight: 600; - background-color: rgba(255,255,255,.9); - border-bottom: 1px solid #eee; - position: fixed; - top: 0; - left: 0; - width: 100%; - } - } -} - -#page { - margin: 5em 5%; -} - -img { - &.diagram { - border: 1px solid #ccc; - padding: 20px; - margin-bottom: 1em - } -} - -ol.images, ol.colors { - padding: 0; - list-style: none; - - display: -webkit-box; - display: -moz-box; - display: -ms-flexbox; - display: -webkit-flex; - display: flex; - - -webkit-flex-flow: row wrap; - flex-flow: row wrap; - - li { - margin: 0 1em 1em 0; - } -} - -ol.colors { - & > li { - width: 11em; - overflow: hidden; - - padding: 10px 10px 0 10px; - border: 1px solid #ccc; - - .swatch { - display: block; - width: 100%; - height: 150px; - margin: 0 0 .25em; - padding: 100px 0 0 0; - text-align: center; - font: 2em $font-family-enhanced; - text-transform: uppercase; - } - - h3 { - font-weight: 600; - font-size: 1.25em; - } - } - - p { - font-size: .7em; - } - - ul { - list-style: none; - padding: 0; - - li { - float: left; - width: 5em; - - } - } -} - - -.note, .pro, .future, .deprecated, .todo { - &:before { - text-transform: uppercase; - font-weight: 300; - font-size: .95em; - padding: 2px 4px; - margin: 0 5px 0 -2px; - } -} - -.deprecated { - color: #999; - background-color: #eee; - padding: 5px; - margin-top: -5px; - - &:before { - content: "Deprecated"; - font-weight: 300; - color: #999; - border: 1px dotted #999; - } -} -.future { - color: #777; - - &:before { - content: "Future"; - font-weight: 300; - background-color: #999; - color: #fff; - } -} -.pro { - color: #777; - - &:before { - content: "Pro"; - background-color: #84B745; - color: #fff; - } -} -.todo { - &:before { - font-weight: 600; - content: 'To Do'; - background-color: #ffc; - border: 1px dotted #ccc; - color: #666; - } -} - -.note { - // background-color: #ffc; - color: #777; - - &:before { - content: "Note"; - background-color: #ffc; - color: #999; - border: 1px dotted #ccc; - } -} - - -dl { - overflow: hidden; - border-bottom: 1px solid #eee; - - dd, dt { - border-top: 1px solid #eee; - - margin: 0; - padding: 10px 0; - font: normal .8em $font-family; - } - - dt { - font: 1.25em $font-family-enhanced; - width: 150px; - float: left; - margin: 0; - font-weight: bold; - } - - dd { - margin-left: 150px; - min-height: 5em; - - *:last-child { - margin-bottom: 0; - } - - p { - margin: 0 0 .5em; - } - } - -} diff --git a/core/protected/extensions/umber/assets/lib/_clearfix-hack b/core/protected/extensions/umber/assets/lib/_clearfix-hack deleted file mode 100644 index 47b5b22b..00000000 --- a/core/protected/extensions/umber/assets/lib/_clearfix-hack +++ /dev/null @@ -1,26 +0,0 @@ -/** - * For modern browsers - * 1. The space content is one way to avoid an Opera bug when the - * contenteditable attribute is included anywhere else in the document. - * Otherwise it causes space to appear at the top and bottom of elements - * that are clearfixed. - * 2. The use of `table` rather than `block` is only necessary if using - * `:before` to contain the top-margins of child elements. - */ -.cf:before, -.cf:after { - content: " "; /* 1 */ - display: table; /* 2 */ -} - -.cf:after { - clear: both; -} - -/** - * For IE 6/7 only - * Include this rule to trigger hasLayout and contain floats. - */ -.cf { - *zoom: 1; -} \ No newline at end of file diff --git a/core/protected/extensions/umber/assets/lib/_normalize.scss b/core/protected/extensions/umber/assets/lib/_normalize.scss deleted file mode 100755 index e93e9aca..00000000 --- a/core/protected/extensions/umber/assets/lib/_normalize.scss +++ /dev/null @@ -1,408 +0,0 @@ -.webstore-modal{ - /*! normalize.css v2.1.3 | MIT License | git.io/normalize */ - - /* ========================================================================== - HTML5 display definitions - ========================================================================== */ - - /** - * Correct `block` display not defined in IE 8/9. - */ - - article, - aside, - details, - figcaption, - figure, - footer, - header, - hgroup, - main, - nav, - section, - summary { - display: block; - } - - /** - * Correct `inline-block` display not defined in IE 8/9. - */ - - audio, - canvas, - video { - display: inline-block; - } - - /** - * Prevent modern browsers from displaying `audio` without controls. - * Remove excess height in iOS 5 devices. - */ - - audio:not([controls]) { - display: none; - height: 0; - } - - /** - * Address `[hidden]` styling not present in IE 8/9. - * Hide the `template` element in IE, Safari, and Firefox < 22. - */ - - [hidden], - template { - display: none; - } - - /* ========================================================================== - Base - ========================================================================== */ - - /** - * 1. Set default font family to sans-serif. - * 2. Prevent iOS text size adjust after orientation change, without disabling - * user zoom. - */ - - html { - font-family: sans-serif; /* 1 */ - -ms-text-size-adjust: 100%; /* 2 */ - -webkit-text-size-adjust: 100%; /* 2 */ - } - - /** - * Remove default margin. - */ - - body { - margin: 0; - } - - /* ========================================================================== - Links - ========================================================================== */ - - /** - * Remove the gray background color from active links in IE 10. - */ - - a { - background: transparent; - } - - /** - * Address `outline` inconsistency between Chrome and other browsers. - */ - - a:focus { - outline: thin dotted; - } - - /** - * Improve readability when focused and also mouse hovered in all browsers. - */ - - a:active, - a:hover { - outline: 0; - } - - /* ========================================================================== - Typography - ========================================================================== */ - - /** - * Address variable `h1` font-size and margin within `section` and `article` - * contexts in Firefox 4+, Safari 5, and Chrome. - */ - - h1 { - font-size: 2em; - margin: 0.67em 0; - } - - /** - * Address styling not present in IE 8/9, Safari 5, and Chrome. - */ - - abbr[title] { - border-bottom: 1px dotted; - } - - /** - * Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome. - */ - - b, - strong { - font-weight: bold; - } - - /** - * Address styling not present in Safari 5 and Chrome. - */ - - dfn { - font-style: italic; - } - - /** - * Address differences between Firefox and other browsers. - */ - - hr { - -moz-box-sizing: content-box; - box-sizing: content-box; - height: 0; - } - - /** - * Address styling not present in IE 8/9. - */ - - mark { - background: #ff0; - color: #000; - } - - /** - * Correct font family set oddly in Safari 5 and Chrome. - */ - - code, - kbd, - pre, - samp { - font-family: monospace, serif; - font-size: 1em; - } - - /** - * Improve readability of pre-formatted text in all browsers. - */ - - pre { - white-space: pre-wrap; - } - - /** - * Set consistent quote types. - */ - - q { - quotes: "\201C" "\201D" "\2018" "\2019"; - } - - /** - * Address inconsistent and variable font size in all browsers. - */ - - small { - font-size: 80%; - } - - /** - * Prevent `sub` and `sup` affecting `line-height` in all browsers. - */ - - sub, - sup { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline; - } - - sup { - top: -0.5em; - } - - sub { - bottom: -0.25em; - } - - /* ========================================================================== - Embedded content - ========================================================================== */ - - /** - * Remove border when inside `a` element in IE 8/9. - */ - - img { - border: 0; - } - - /** - * Correct overflow displayed oddly in IE 9. - */ - - svg:not(:root) { - overflow: hidden; - } - - /* ========================================================================== - Figures - ========================================================================== */ - - /** - * Address margin not present in IE 8/9 and Safari 5. - */ - - figure { - margin: 0; - } - - /* ========================================================================== - Forms - ========================================================================== */ - - /** - * Define consistent border, margin, and padding. - */ - - fieldset { - border: 1px solid #c0c0c0; - margin: 0 2px; - padding: 0.35em 0.625em 0.75em; - } - - /** - * 1. Correct `color` not being inherited in IE 8/9. - * 2. Remove padding so people aren't caught out if they zero out fieldsets. - */ - - legend { - border: 0; /* 1 */ - padding: 0; /* 2 */ - } - - /** - * 1. Correct font family not being inherited in all browsers. - * 2. Correct font size not being inherited in all browsers. - * 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome. - */ - - button, - input, - //select, - textarea { - font-family: inherit; /* 1 */ - font-size: 100%; /* 2 */ - margin: 0; /* 3 */ - } - - /** - * Address Firefox 4+ setting `line-height` on `input` using `!important` in - * the UA stylesheet. - */ - - button, - input { - line-height: normal; - } - - /** - * Address inconsistent `text-transform` inheritance for `button` and `select`. - * All other form control elements do not inherit `text-transform` values. - * Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+. - * Correct `select` style inheritance in Firefox 4+ and Opera. - */ - - button, - select { - text-transform: none; - } - - /** - * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` - * and `video` controls. - * 2. Correct inability to style clickable `input` types in iOS. - * 3. Improve usability and consistency of cursor style between image-type - * `input` and others. - */ - - button, - html input[type="button"], /* 1 */ - input[type="reset"], - input[type="submit"] { - -webkit-appearance: button; /* 2 */ - cursor: pointer; /* 3 */ - } - - /** - * Re-set default cursor for disabled elements. - */ - - button[disabled], - html input[disabled] { - cursor: default; - } - - /** - * 1. Address box sizing set to `content-box` in IE 8/9/10. - * 2. Remove excess padding in IE 8/9/10. - */ - - input[type="checkbox"], - input[type="radio"] { - box-sizing: border-box; /* 1 */ - padding: 0; /* 2 */ - } - - /** - * 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome. - * 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome - * (include `-moz` to future-proof). - */ - - input[type="search"] { - -webkit-appearance: textfield; /* 1 */ - -moz-box-sizing: content-box; - -webkit-box-sizing: content-box; /* 2 */ - box-sizing: content-box; - } - - /** - * Remove inner padding and search cancel button in Safari 5 and Chrome - * on OS X. - */ - - input[type="search"]::-webkit-search-cancel-button, - input[type="search"]::-webkit-search-decoration { - -webkit-appearance: none; - } - - /** - * Remove inner padding and border in Firefox 4+. - */ - - button::-moz-focus-inner, - input::-moz-focus-inner { - border: 0; - padding: 0; - } - - /** - * 1. Remove default vertical scrollbar in IE 8/9. - * 2. Improve readability and alignment in all browsers. - */ - - textarea { - overflow: auto; /* 1 */ - vertical-align: top; /* 2 */ - } - - /* ========================================================================== - Tables - ========================================================================== */ - - /** - * Remove most spacing between table cells. - */ - - table { - border-collapse: collapse; - border-spacing: 0; - } -} \ No newline at end of file diff --git a/core/protected/extensions/umber/assets/mixins/_animations.scss b/core/protected/extensions/umber/assets/mixins/_animations.scss deleted file mode 100644 index 8d863a0e..00000000 --- a/core/protected/extensions/umber/assets/mixins/_animations.scss +++ /dev/null @@ -1,35 +0,0 @@ -//MO -//This mixin file can be removed when we update compass to latest version -//which would require first to update sass scss currently 3.2.12 to version like 3.4.2 or later. - -@mixin animation-duration($val) { - -webkit-animation-duration:$val; - -moz-animation-duration:$val; - -ms-animation-duration:$val; - -o-animation-duration:$val; - animation-duration:$val; -} - -@mixin animation-fill-mode($val) { - -webkit-animation-fill-mode:$val; - -moz-animation-fill-mode:$val; - -ms-animation-fill-mode:$val; - -o-animation-fill-mode:$val; - animation-fill-mode:$val; -} - -@mixin animation-iteration-count($val) { - -webkit-animation-iteration-count:$val; - -moz-animation-iteration-count:$val; - -ms-animation-iteration-count:$val; - -o-animation-iteration-count:$val; - animation-iteration-count:$val; -} - -@mixin animation-name($val) { - -webkit-animation-name:$val; - -moz-animation-name:$val; - -ms-animation-name:$val; - -o-animation-name:$val; - animation-name:$val; -} \ No newline at end of file diff --git a/core/protected/extensions/umber/assets/mixins/_arrows.scss b/core/protected/extensions/umber/assets/mixins/_arrows.scss deleted file mode 100644 index 1b36cb57..00000000 --- a/core/protected/extensions/umber/assets/mixins/_arrows.scss +++ /dev/null @@ -1,78 +0,0 @@ - -// CSS Arrows -@mixin arrow($box-edge : bottom, - $edge-side : center, - $arrow-size : 10px, - $edge-side-offset : 0, - $fill-color : black, - $border-color : none, - $border-style : border) { - - // initiate internal variables - $box-edge-inverse: bottom; - $edge-side-pos: $edge-side; - $edge-side-pos-value: 0; - - // establish inverse variables - @if $box-edge == top { $box-edge-inverse: bottom; } - @else if $box-edge == right { $box-edge-inverse: left; } - @else if $box-edge == bottom { $box-edge-inverse: top; } - @else if $box-edge == left { $box-edge-inverse: right; } - - // calculate remaining internal variables - @if ($box-edge == 'top' or - $box-edge == 'bottom') { - @if $edge-side == center { - $edge-side-pos: left; - $edge-side-pos-value: 50%; - $edge-side-offset: (-$arrow-size); - } - } - @if ($box-edge == 'left' or - $box-edge == 'right') { - @if $edge-side == center { - $edge-side-pos: top; - $edge-side-pos-value: 50%; - $edge-side-offset: (-$arrow-size); - } - } - - &:after, &:before { - content: " "; - height: 0; - width: 0; - position: absolute; - pointer-events: none; - border: solid rgba(#fff, 0); - } - - &:after { - border-color: rgba(#fff, 0); - border-width: $arrow-size - 1; - #{$box-edge}: (-$arrow-size) - $arrow-size + 2; - border-#{$box-edge-inverse}-color: $fill-color; - #{$edge-side-pos}: $edge-side-pos-value; - margin-#{$edge-side-pos}: $edge-side-offset + 1; - } - - @if $border-style == flag { - @include border-radius(2px); - &:before { - border-color: rgba(#fff, 0); - border-width: $arrow-size - 1; - #{$box-edge}: (-$arrow-size) - $arrow-size + 2; - border-#{$box-edge-inverse}-color: $border-color; - #{$edge-side-pos}: $edge-side-pos-value; - margin-#{$edge-side-pos}: $edge-side-offset + 2; - } - } @else { - &:before { - border-color: rgba(#fff, 0); - border-width: $arrow-size; - #{$box-edge}: (-$arrow-size) - $arrow-size; - border-#{$box-edge-inverse}-color: $border-color; - #{$edge-side-pos}: $edge-side-pos-value; - margin-#{$edge-side-pos}: $edge-side-offset; - } - } -} diff --git a/core/protected/extensions/umber/assets/mixins/_borders.scss b/core/protected/extensions/umber/assets/mixins/_borders.scss deleted file mode 100644 index 7c4b659f..00000000 --- a/core/protected/extensions/umber/assets/mixins/_borders.scss +++ /dev/null @@ -1,6 +0,0 @@ -@mixin border-radius($radius) { - -webkit-border-radius: $radius; - -moz-border-radius: $radius; - -ms-border-radius: $radius; - border-radius: $radius; -} \ No newline at end of file diff --git a/core/protected/extensions/umber/assets/mixins/_flexbox.scss b/core/protected/extensions/umber/assets/mixins/_flexbox.scss deleted file mode 100644 index 2d874566..00000000 --- a/core/protected/extensions/umber/assets/mixins/_flexbox.scss +++ /dev/null @@ -1,47 +0,0 @@ -@mixin flexbox() { - display: -moz-box; - display: -ms-flexbox; - display: -webkit-flex; - display: flex; -} - -@mixin flex($values) { - -webkit-box-flex: $values; - -moz-box-flex: $values; - -webkit-flex: $values; - -ms-flex: $values; - flex: $values; -} - -@mixin order($val) { - -webkit-box-ordinal-group: $val; - -moz-box-ordinal-group: $val; - -ms-flex-order: $val; - -webkit-order: $val; - order: $val; -} - -@mixin direction($val) { - -webkit-flex-direction: $val; - flex-direction: $val; -} - -@mixin flow($val) { - -webkit-flex-flow: $val; - flex-flow: $val; -} - -@mixin wrap($val) { - -webkit-flex-wrap: $val; - flex-wrap: $val; -} - -@mixin justify-content($val) { - -webkit-justify-content: $val; - justify-content: $val; -} - -@mixin align-self($val) { - -webkit-align-self: $val; - align-self: $val; -} diff --git a/core/protected/extensions/umber/assets/mixins/_html5-input-types.scss b/core/protected/extensions/umber/assets/mixins/_html5-input-types.scss deleted file mode 100755 index d4bb9f4c..00000000 --- a/core/protected/extensions/umber/assets/mixins/_html5-input-types.scss +++ /dev/null @@ -1,87 +0,0 @@ -//************************************************************************// -// Generate a variable ($all-text-inputs) with a list of all html5 -// input types that have a text-based input, excluding textarea. -// http://diveintohtml5.org/forms.html -//************************************************************************// -$inputs-list: 'input[type="email"]', - 'input[type="number"]', - 'input[type="password"]', - 'input[type="search"]', - 'input[type="tel"]', - 'input[type="text"]', - 'input[type="url"]', - - // Webkit & Gecko may change the display of these in the future - 'input[type="color"]', - 'input[type="date"]', - 'input[type="datetime"]', - 'input[type="datetime-local"]', - 'input[type="month"]', - 'input[type="time"]', - 'input[type="week"]'; - -$unquoted-inputs-list: (); - -@each $input-type in $inputs-list { - $unquoted-inputs-list: append($unquoted-inputs-list, unquote($input-type), comma); -} - -$all-text-inputs: $unquoted-inputs-list; - -// You must use interpolation on the variable: -// #{$all-text-inputs} -//************************************************************************// -// #{$all-text-inputs}, textarea { -// border: 1px solid red; -// } - -// :hover and :focus pseudo elements -// Added by Ricardo Zea -// http://ricardozea.net -// @ricardozea -// Tracking: http://stackoverflow.com/questions/13180807/sass-create-mixin-for-input-fields - -$inputs-list-hf:'input[type="email"]:hover', - 'input[type="number"]:hover', - 'input[type="password"]:hover', - 'input[type="search"]:hover', - 'input[type="tel"]:hover', - 'input[type="text"]:hover', - 'input[type="url"]:hover', - 'input[type="color"]:hover', - 'input[type="date"]:hover', - 'input[type="datetime"]:hover', - 'input[type="datetime-local"]:hover', - 'input[type="month"]:hover', - 'input[type="time"]:hover', - 'input[type="week"]:hover', - - 'input[type="email"]:focus', - 'input[type="number"]:focus', - 'input[type="password"]:focus', - 'input[type="search"]:focus', - 'input[type="tel"]:focus', - 'input[type="text"]:focus', - 'input[type="url"]:focus', - 'input[type="color"]:focus', - 'input[type="date"]:focus', - 'input[type="datetime"]:focus', - 'input[type="datetime-local"]:focus', - 'input[type="month"]:focus', - 'input[type="time"]:focus', - 'input[type="week"]:focus'; - -$unquoted-inputs-list-hf: (); - -@each $input-type-hf in $inputs-list-hf { - $unquoted-inputs-list-hf: append($unquoted-inputs-list-hf, unquote($input-type-hf), comma); -} - -$all-text-inputs-hf: $unquoted-inputs-list-hf; - -// You must use interpolation on the variable: -// #{$all-text-inputs-hf} -//************************************************************************// -// #{$all-text-inputs-hf}, textarea { -// border: 1px solid red; -// } \ No newline at end of file diff --git a/core/protected/extensions/umber/assets/mixins/_keyframes.scss b/core/protected/extensions/umber/assets/mixins/_keyframes.scss deleted file mode 100755 index 76f23d3f..00000000 --- a/core/protected/extensions/umber/assets/mixins/_keyframes.scss +++ /dev/null @@ -1,15 +0,0 @@ -// keyframes mixin -@mixin keyframes($name) { - @-webkit-keyframes #{$name} { - @content; - } - @-moz-keyframes #{$name} { - @content; - } - @-ms-keyframes #{$name} { - @content; - } - @keyframes #{$name} { - @content; - } -} \ No newline at end of file diff --git a/core/protected/extensions/umber/assets/mixins/_placeholders.scss b/core/protected/extensions/umber/assets/mixins/_placeholders.scss deleted file mode 100644 index 777069f4..00000000 --- a/core/protected/extensions/umber/assets/mixins/_placeholders.scss +++ /dev/null @@ -1,6 +0,0 @@ -@mixin placeholder-styles() { - &::-webkit-input-placeholder { @content; } - &:-moz-placeholder { @content; } - &::-moz-placeholder { @content; } - &::-ms-input-placeholder { @content; } -} diff --git a/core/protected/extensions/umber/assets/mixins/_transitions.scss b/core/protected/extensions/umber/assets/mixins/_transitions.scss deleted file mode 100644 index 6f3b39f5..00000000 --- a/core/protected/extensions/umber/assets/mixins/_transitions.scss +++ /dev/null @@ -1,13 +0,0 @@ -@mixin transition-property($val) { - -webkit-transition-property: $val; - -moz-transition-property: $val; - -o-transition-property: $val; - transition-property: $val; -} - -@mixin transition-duration($val) { - -webkit-transition-duration: $val; - -moz-transition-duration: $val; - -o-transition-duration: $val; - transition-duration: $val; -} diff --git a/core/protected/extensions/umber/assets/modal/.DS_Store b/core/protected/extensions/umber/assets/modal/.DS_Store deleted file mode 100644 index d6c294b9..00000000 Binary files a/core/protected/extensions/umber/assets/modal/.DS_Store and /dev/null differ diff --git a/core/protected/extensions/umber/assets/modal/_address_blocks.scss b/core/protected/extensions/umber/assets/modal/_address_blocks.scss deleted file mode 100644 index 7523479b..00000000 --- a/core/protected/extensions/umber/assets/modal/_address_blocks.scss +++ /dev/null @@ -1,172 +0,0 @@ -.webstore-modal-overlay { - .wishlists, .address-blocks { - .add { - //MO added the button class to support links with button like look-n-feel - button, .button { - border: 1px solid #ccc; - background: none; - color: #999; - width: 100%; - padding: 20px 0; - - @include transition(color .3s, border .3s, background .3s); - - &:before { - content: '+'; - margin-right: 5px; - } - - &:hover { - background: $blue; - border-color: $blue; - color: #fff; - } - } - } - } - - .address-blocks, .wishlists { - @include flexbox(); - @include justify-content(space-between); - @include wrap(wrap); - - width: 100%; - - margin: 0; - padding: 0; - list-style: none; - - li { - width: 100%; - position: relative; - margin: 0 0 1rem; - - @include media(small) { - width: 47%; - } - } - - } - .billing-block { - p{ - font-size: .75rem; - } - - } - .address-block{ - p { - position: relative; - - margin: 0; - padding: 10px 2px 10px 25px; - - border: 1px solid #ddd; - - font-size: .75rem; - color: #777; - line-height: 1.5; - - &:before { - font-size: .75rem; - content: "TO"; - font-weight: bold; - color: #666; - border: 1px solid #ccc; - background-color: #eee; - position: absolute; - top: 10px; - padding: 3px 6px 2px; - left: -15px; - } - - .controls { - display: block; - margin-top: 5px; - - a { - &.delete { color: #c00; - &:hover { - border-bottom: 1px solid #c00; - } - } - &:hover { - border-bottom: 1px solid $blue; - } - } - } - - .shipper { - display: block; - margin-top: 5px; - - .price { - font-size: .75em; - color: #888; - } - } - - &.default { - &:after { - font-size: .75rem; - color: #888; - border: 1px solid #ccc; - background-color: #eee; - position: absolute; - top: 10px; - padding: 3px 6px 2px; - right: -10px; - text-transform: uppercase; - - } - } - &.default { - &:after { - content: 'Default Shipping'; - } - } - } - - button.small { - width: 100%; - margin-bottom: .5rem; - - &.default { - background-color: darken($blue,10%); - &:before { - content: '\2713'; - margin-right: 5px; - } - } - - &.secondary { - background-color: #eee; - color: #666; - width: 48%; - margin-bottom: 0; - - &:last-child { - margin-left: 4%; - } - } - } - - &.address-block-alter { - position: relative; - margin-bottom: 15px; //MO - - p { - width: 60%; - } - button { - width: auto; - position: absolute; - top: 32%; - left: 60%; - margin-left: 15px; - } - } - } - .address-block-pickable { - p { border-bottom: none; } - } -} \ No newline at end of file diff --git a/core/protected/extensions/umber/assets/modal/_animations.scss b/core/protected/extensions/umber/assets/modal/_animations.scss deleted file mode 100755 index ccdf330f..00000000 --- a/core/protected/extensions/umber/assets/modal/_animations.scss +++ /dev/null @@ -1,40 +0,0 @@ -.animated { - @include animation-duration(0.5s); - @include animation-fill-mode(both); -} - -.animated.infinite { - @include animation-iteration-count(infinite); -} - -@-webkit-keyframes shake { - 0%, 100% { - @include transform(translateX(0)); - } - - 20%, 60% { - @include transform(translateX(-5px)); - } - - 40%, 80% { - @include transform(translateX(5px)); - } -} - -@keyframes shake { - 0%, 100% { - @include transform(translateX(0)); - } - - 20%, 60% { - @include transform(translateX(-5px)); - } - - 40%, 80% { - @include transform(translateX(5px)); - } -} - -.shake { - @include animation-name(shake); -} diff --git a/core/protected/extensions/umber/assets/modal/_basic_modal.scss b/core/protected/extensions/umber/assets/modal/_basic_modal.scss deleted file mode 100755 index 4d75bcbe..00000000 --- a/core/protected/extensions/umber/assets/modal/_basic_modal.scss +++ /dev/null @@ -1,422 +0,0 @@ -#webstore-container { - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; - width: 100%; - height: 100%; -} - -.webstore-modal { - //MO - input{ - font-size: 100%; - margin-bottom: 0; - line-height: normal; - background-color: #fff; - border: $input-border; - &:focus{ - background-color: transparent; - line-height: normal; - } - } - - input[type="text"]{ - border: none; - line-height: normal; - &:focus{ - line-height: normal; - } - } - - visibility: hidden; - cursor: pointer; - position: fixed; - z-index: 2; - - // Sets overlay background color - background-color: rgba(#000,0); - top: 0; - bottom: 0; - left: 0; - right: 0; - font-family: $webstore-modal-font; - text-align: center; - - @include perspective(1300px); - @include transition-property(background-color); - @include transition-duration(.5s); - - @include media(medium) { - &:before { - content: ''; - display: inline-block; - height: 100%; - vertical-align: middle; - margin-right: -0.25em; /* Adjusts for spacing */ - } - } - - &.show { - visibility: visible; - background-color: rgba(#000,.5); - overflow-y: scroll; - - & section { - visibility: visible; - @include transform(translateY(0%) rotateX(0deg)); - opacity: 1; - } - } - - section { - z-index: 2000; - visibility: hidden; - max-width: $modal-width; - - @include transform(translateY(100%) rotateX(90deg)); - @include transform-style(preserve-3d); - @include transform-origin(0 100%); - @include transition(all 0.3s ease-out); - - position: relative; - min-height: 100%; - padding-bottom: 59px; - - text-align: left; - display: inline-block; - vertical-align: middle; - - // Sets modal shadow - box-shadow: 1px 1px 5px rgba(0,0,0,.2); - width: 100%; - - @include media(small) { - min-height: 0; - padding-bottom: 0; - } - &:hover { cursor: default; } - } - - article, aside, main, form { background-color: #fff; } - form, header { padding: $modal-padding $modal-padding*2; } - header { padding: $modal-padding/2 $modal-padding; } - form { padding: 0; } - .breakaway { margin-top: 20px; } - - button, input[type="button"], .button { - font: 1.25rem "Open Sans", "Helvetica Neue", Helvetica, sans-serif; - - &.webstore-modal-close { - @include media(small) { - display: none; - } - - position: absolute; - bottom: 0; - left: 0; - right: 0; - - display: block; - - background-color: #eee; - color: #999; - font: .875rem 'Open Sans', 'Helvetica Neue', sans-serif; - text-transform: uppercase; - - &:hover { - background-color: #eee; - color: #666; - } - &:focus { outline: none; } - } - } - - .twocolumn { - @extend %clearfix; - margin: 0; - - .column { @extend %clearfix; } - - @include media(small) { - .column { - float: left; - width: 50%; - padding: 0; - } - } - .content { - padding: 10px 20px 0; - } - } - - - form { - ol { - margin: 0; - list-style: none; - padding: 0; - } - li { - overflow: hidden; - position: relative; - - &.split-3 { - label { - width: 32%; - display: inline-block; - vertical-align: top; - font-size: .7rem; - &:last-child { - width: 33%; - } - } - } - - &.options-split { - overflow: hidden; - width: 100%; - - > *:first-child { - float: left; - } - > *:last-child { - float: right; - } - } - } - } - - h1 { - - font-weight: 600; - //MO conflicting with Edit cart Is this needed anywhere else? - font: 1rem $webstore-modal-header-font-family; - font-weight: $webstore-modal-header-font-weight; - margin: .25rem 0; - - .cancel { - position: absolute; - right: 20px; - top: 16px; - font-size: .75rem; - color: #777; - text-transform: none; - border-bottom: 1px solid #ccc; - } - small { - float: right; - color: #aaa; - - } - } - - h2 { - font-size: 1.5rem; - margin: .5em 0 1em; - color: #555; - } - h4 { - text-transform: uppercase; - margin: 0 0 .75em; - font-weight: 400; - color: #888; - font-size: 1rem; - } - - header { - background-color: #eee; - border-bottom: 1px solid #ccc; - } - - .invisible { visibility: hidden; } - - footer.submit { - padding: 0; - background-color: #eee; - color: #999; - overflow: hidden; - - input[type="submit"] { - @include transition-property(background-color); - @include transition-duration(.3s); - - font: 1.25rem $webstore-modal-header-font-family; - font-weight: $webstore-modal-header-font-weight; - - padding: $modal-padding; - background: $calltoaction-color; - width: 100%; - border: none; - color: #fff; - float: left; - - &:hover { - background-color: darken($calltoaction-color,10%); - } - } - } - - .hint, .info { - p { - margin: 0; - padding: 12px $modal-padding 11px; - color: #666; - font-size:.875rem; - } - } - - .hint p { margin-right: 80px; } - - input[type="text"], input[type="email"], input[type="password"], input[type="tel"] { - &.split-2 { - width: 50%; - float: left; - border-right: $input-border; - &:last-child { - border-right: none; - } - } - &.split-3 { - width: 33%; - float: left; - border-right: $input-border; - &:last-child { - border-right: none; - width: 34%; - } - } - - &:focus { - box-shadow: inset 1px 1px 3px #ccc; - background-color: #f8f8f8; - outline: none; - } - } - label { - &.transient { - display: none; - color: #666; - position: absolute; - top: 3px; - left: $modal-padding; - font-size: .5rem; - text-transform: uppercase; - font-weight: bold; - } - &.text { - @include transition-property(background-color, color); - @include transition-duration(.3s); - display: block; - padding: $modal-padding; - font-size: .85rem; - color: #888; - cursor: pointer; - @include transition-property(color); - @include transition-duration(.3s); - background-color: #fff; - } - &.checkbox { - @include transition-property(background-color, color); - @include transition-duration(.3s); - - display: block; - padding: $modal-padding; - font-size: .85rem; - color: #888; - cursor: pointer; - @include transition-property(color); - @include transition-duration(.3s); - background-color: #fff; - - &:hover { - color: #555; - } - - input { - font-size: 2em; - //MO - margin-right: 2px; - } - } - } - - .minor { - @include transition-property(background-color, color, border-color); - @include transition-duration(.3s); - text-decoration: none; - width: auto; - @include border-radius(0); - background: none; - color: #aaa; - padding: 7px 6px; - text-align: right; - font-size: .75rem; - line-height: 1; - position: absolute; - right: 18px; - top: 18px; - - strong { - font-weight: normal; - color: $calltoaction-color; - text-decoration: underline; - } - - &:hover { - color: #888; - strong { color: darken($calltoaction-color,10%); } - } - } - - label { - margin: 0 0 2px; - display: block; - color: #666; - } - - input { - padding: 8px; - background-color:transparent; - @include border-radius(0); - } -} - -.webstore-modal-narrow { - @include media(small) { - &:before { - content: ''; - display: inline-block; - height: 100%; - vertical-align: middle; - margin-right: -0.25em; /* Adjusts for spacing */ - } - } - section { - max-width: $modal-width-narrow; - } -} - -//webstore Montreal override -.webstore-modal.show { - visibility: visible; - text-align: center; - -webkit-font-smoothing: initial; - font-smoothing: initial; - display: inline-block; - -} -//MO -.estimator-zip-error{ - float:left; - color: #a44039; - margin: 0; - font-size: 0.75rem; - padding: 3px 0 6px; - text-align: left; - p{ - margin: 0; - } -} - diff --git a/core/protected/extensions/umber/assets/modal/_browsers_unistyle.scss b/core/protected/extensions/umber/assets/modal/_browsers_unistyle.scss deleted file mode 100644 index b4e28ceb..00000000 --- a/core/protected/extensions/umber/assets/modal/_browsers_unistyle.scss +++ /dev/null @@ -1,16 +0,0 @@ -::-webkit-input-placeholder { color: #aaa !important; } -:-moz-placeholder { /* Firefox 18- */ color: #aaa !important; } -::-moz-placeholder { /* Firefox 19+ */ color: #aaa !important ; } -:-ms-input-placeholder { color: #aaa !important; } - -.quantity input, input.cc-exp , input.creditcard-number ,.editcartmodal input.promo-code-value, #MultiCheckoutForm_orderNotes{ - &:focus{ - /* -webkit-focus-ring-color = '#5B9DD9' */ - outline: #5B9DD9 auto 5px!important; - } -} - -//remove "clear field" X buttons IE -::-ms-clear { - display: none; -} \ No newline at end of file diff --git a/core/protected/extensions/umber/assets/modal/_cart.scss b/core/protected/extensions/umber/assets/modal/_cart.scss deleted file mode 100755 index df98e859..00000000 --- a/core/protected/extensions/umber/assets/modal/_cart.scss +++ /dev/null @@ -1,481 +0,0 @@ -.webstore-overlay-cart { - - display:block; - overflow-y:scroll; - - .webstore-estimator-form,.shipping-postal-entry { - background: none; - display:none; - } - .shipping-postal-entry { - margin-top: 16px; - } - - .shipping-city-state-link{ - font-size:11px; - } - .lines-container, .totals, .submit { - - @media(width:640px) { - margin: 0; - } - } - - @media(min-width:640px) { - // Push delete buttons into margin - .lines { margin-right: -15px; } - } - - header { - position: relative; - - a.button.edit, a.button.edit:focus { - @media(min-width:640px) { display: none; } - top: 9px; - right: 8px; - font-weight: bold; - border-color: #ccc; - text-decoration: none; - background: none; - font-size: .8375rem; - color: #aaa; - - &:hover { - border-color: $calltoaction-color; - color: $calltoaction-color; - background: none; - } - } - } - .cart-footer { - clear: both; - @extend %clearfix; - - .pricechange { - display: none; - font-size: 0.75rem; - float: right; - width: 18rem; - color: #666; - background-color: #ffc; - padding: 12px; - margin-right: 15px; - border-bottom: 1px solid #ccc; - - @media(max-width: 640px) - { - width: 100%; - float: none; - } - } - } - - table { - border-collapse: collapse; - - td, th { - text-align: left; - vertical-align: middle; - padding: 0; - } - - &.lines { - a { color: #555; } - - tr td:first-child, tr th:first-child { - padding-left: 8px; - @media(min-width:640px) { - padding-left: 0; - } - } - tr:last-child { - td { - border-bottom: 1px solid #ccc; - &:last-child { border-bottom-color: #fff; } - } - } - - td { border-bottom: 1px solid #eee; } - } - - a { - font-weight: bold; - border-bottom: 1px solid #bbb; - } - - td.image { - width: 0; - @media(min-width:640px) { width: 62px; } - img { - display: none; - vertical-align: middle; - width: 56px; - margin-right: -62px; - padding: 6px 6px 6px 0; - - @media(min-width:640px) { display: block; } - } - } - - td.description { - height: 62px; - padding-right:5px; - - strong, img { float: left; } - strong { - line-height: 1.4; - - @media(min-width:640px) { - font-size: 1.125rem; - } - } - img { - display: none; - vertical-align: middle; - width: 56px; - padding: 6px 6px 6px 0; - - @media(min-width:640px) { display: block; } - } - } - - .price { - text-align: right; - - strike { - font-size: .75rem; - color: #ccc; - text-align: -1000em; - overflow: hidden; - display: block; - line-height: 1; - height: 12px; - margin-top: -12px; - - &:after { - color: #888; - content: attr(data-text); - } - } - } - - .quantity { - text-align: center; - width: 3rem; - @media(min-width:640px) { width: 7rem; } - } - - .subtotal { - width: 5rem; - padding-right: 12px; - padding-left: 5px; - } - - @include media(mobile) { - &.edit { - td.quantity, th.quantity { display: none; } - td.remove, th.remove { - display: table-cell; - width: 40px; - - a { - color: #fff; - border-color: $red; - background-color: $red; - - &:hover { - border-color: darken($red,10%); - background-color: darken($red,10%); - } - } - } - th.remove { border-bottom: 1px solid #ccc; } - //MO removing this is breaking the cart when edited on mobile and then screen is resized - //tr:last-child td:last-child { border-bottom: 1px solid #ccc; } - } - } - - .price, .remove { - display: none; - } - @media(min-width:640px) { - .price, .remove { display: table-cell; } - .price { width: 6rem; } - } - } - - tr { - opacity: 1; - @include transition-property(opacity); - @include transition-duration(.5s); - - - &.delete { - opacity: 0; - } - } - - table.lines thead { - th,a { - border-bottom: 1px solid #ccc; - text-transform: uppercase; - color: #999; - font-size: .875rem; - padding-bottom: 3px; - font-weight: bold; - } - } - - .subtotal, #PromoCodeStr { text-align: right; } - - table.lines { - th.remove, td.remove { - width: 30px; - border-bottom-color: #fff; - - a { - text-decoration: none; - display: block; - border: 2px solid #eee; - color: #ccc; - background-color: #fff; - @include border-radius(20px); - height: 28px; - width: 28px; - line-height: 22px; - padding-left: 5px; - font-size: 25px; - font-weight: bold; - margin: 0; - - @include transition-property(border-color, background-color,color); - @include transition-duration(.3s); - - &:hover { - color: #fff; - border-color: $red; - background-color: $red; - } - } - } - - } - - input[type="number"] { - width: 3rem; - //webstore montreal override - height:2rem; - text-align: center; - padding: 2px 4px; - - &::-webkit-inner-spin-button, &::-webkit-outer-spin-button { - -webkit-appearance: none; - margin: 0; - } - //MO remove spinner in mozilla number inputs - -moz-appearance:textfield; - - } - - .submit button{ - &.continue { - border-bottom: 1px solid #ddd; - } - } - .cart-footer button, .cart-footer .button { - @include media(small) { - width: auto; - } - - &.checkout, &.continue { float: right; } - &.checkout { - margin: 0 0 0 1em; - @media(min-width:640px) { - width: 18rem; - } - } - - &.continue { - display:none; - color: #999; - background: none; - @include media(small) { - display: block; - } - - @media(min-width:640px) { - margin: 20px; - padding: 0 0 2px; - } - - @include transition-property(border, background-color,color); - @include transition-duration(.3s); - - &:hover { - color: $calltoaction-color; - border-color: lighten($calltoaction-color, 20%); - } - } - } - - .submit { - padding: 0; - clear: both; - overflow: hidden; - - @media(min-width:640px) { margin: 0 15px 0 0; } - } - - .webstore-estimator { - &.recalculate { - td { - visibility: hidden; - color: #f8f8f8; - - &:after { visibility: visible; } - } - td.csspinner:after { - top: 27px; - left: 45px; - } - } - - form { - margin-top: 6px; - display: block; - } - input, button { - float: left; - - &:focus { - outline: none; - box-shadow: inset 1px 1px 2px rgba(0,0,0,.1); - border: 1px solid #bbb; - } - } - input { - border: $input-border; - padding: 9px 8px; - &:focus{ - padding: 9px 8px; - } - } - - select.webstore-estimator-country-form { - margin: 8px 0 0; - } - - button { - padding-left: 8px; - padding-right: 8px; - } - - a.webstore-estimator-country { - float: right; - color: #999; - text-decoration: none; - border-bottom: 1px dotted #ccc; - font-size: .75rem; - display: inline-block; - padding: 2px 0 0; - font-weight: normal; - } - } - - .webstore-promo-line { - small { text-transform: uppercase; } - } - - .totals { - min-height: 135px; - background-color: #f8f8f8; - width: auto; - margin: 0 15px 0 0; - width: 100%; - - @media(min-width:640px) { - float: right; - width: 18rem; - } - - tr:first-child { - th, td { - padding-top: 8px; - } - } - - small a { - color: #999; - border-bottom: 1px dotted #ccc; - text-decoration: none; - } - - td, th { - color: #888; - padding: 4px 8px; - - @media(min-width:640px){ - padding: 4px 12px; - } - } - th { - text-align: left; - } - td { - @include transition(color 1s) - } - - .active a { - text-decoration: none; - color: #888; - } - - .total { - font-weight: bold; - - td, th { - padding: 4px 8px 16px; - color: #444; - font-size: 1.25rem; - - @media(min-width:640px) { - padding-right: 12px; - padding-left: 12px; - } - } - } - } -} - - -//MO -.hide-me { - display: none; visibility: hidden; -} - -.editcartmodal{ - .promo input{ - min-width: 16rem; - } -} - -@media (max-width: 640px){ - .webstore-overlay-cart table.edit{ - th.remove, tr:last-child td:last-child { - border-bottom: 1px solid #ccc; - } - td.remove a { - color: #fff; - border-color: #a44039; - background-color: #a44039; - } - } -} -//MO override against bootstrap background -.editcartmodal { - @include media(medium) { - &:before { - height:0; - } - } -} diff --git a/core/protected/extensions/umber/assets/modal/_cartadd.scss b/core/protected/extensions/umber/assets/modal/_cartadd.scss deleted file mode 100755 index af26ddad..00000000 --- a/core/protected/extensions/umber/assets/modal/_cartadd.scss +++ /dev/null @@ -1,440 +0,0 @@ -$cart-confirmation-image-width: 140px; -.webstore-modal-cart-confirm { - img { - width: $cart-confirmation-image-width; - } - - //D--.webstore-estimator-form P--shipping-postal-entry - .webstore-estimator-form,.shipping-postal-entry { - background: none; - display:none; - - } - table a, table a:hover { - font-weight: bold; - } - table a{ - border-bottom: 1px solid #bbb; - } - - .totals { - small a { - color: #999; - border-bottom: 1px dotted #ccc; - text-decoration: none; - - // - font-size:0.9167em; - } - - td{ - color: #888; - } - th{ - text-align: left; - } - - .active a { - text-decoration: none; - color: #888; - } - } -} - -aside.related-products { - overflow: hidden; - padding: 20px; - - @include media(small) { - border-top: 1px solid #ccc; - padding: 20px 30px; - } - - a { text-decoration: none; } - - h4 { - margin-bottom: .5em; - } - - ul { - margin: 0; - padding: 0; - overflow: hidden; - list-style: none; - - a:last-child li { - margin-right: 0; - margin-bottom: 0; - } - } - li { - @include clearfix(); - border: 1px solid #ddd; - padding: 10px; - margin-bottom: 10px; - position: relative; - - @include media(medium) { - float: left; - width: 210px; - margin-right: 15px; - } - - - } - - img { - width: 80px; - margin: 0 12px 0 0; - float: left; - } - - h3, p { - font-size: 1rem; - @include media(medium) { font-size: .8rem; } - margin: 0; - } - h3 { - color: #666; - max-height: 4.5em; - overflow: hidden; - } - p.price { - color: #888; - position: absolute; - bottom: 8px; - left: 102px; - } -} - -.cart-summary { - background-color: #eee; - border-left: 1px solid #ccc; - - table { - color: #888; - margin: 0 0 .5rem; - } - td { - line-height: 2; - } - tfoot td { - font-weight: bold; - color: #444; - } - - .webstore-promo-form { - position: relative; - //MO - line-height:normal; - - input { - border: none; - background-color: #eee; - border-top: $input-border; - font-size: .9375rem; - padding: 12px 20px 13px; - width: 100%; - //MO - min-height: 46px; - margin-bottom: 0; - &:focus{ - //MO - border:0; - width:100%; - padding:12px 20px 13px; - } - } - button { - @include transition-property(opacity); - @include transition-duration(.5s); - - opacity: 0; - position: absolute; - top: auto; - right:20px; - background: none; - //MO - bottom: 9.5px; - height:27px; - } - - &:hover button { - opacity: 1; - } - } - - .webstore-promo-line { - small { - text-transform: uppercase; - float: none; - font-weight: bold; - padding: 6px 0; - } - } - - small { - font-size: .75rem; - float: right; - font-weight: normal; - color: #999; - - a { - color: #999; - border-bottom: 1px dotted #ccc; - - //MO - text-decoration: none; - } - } - - footer { - button, .button, .button:focus{ - width: 100%; - - @include media(medium) { - width: 50%; - } - - float: left; - height: 60px; - font-size: 1rem; - - &.exit { - background-color: #ccc; - color: #888; - - &:hover { - background-color: #999; - color: #fff; - } - } - - &.continue-shopping{ - display: none; - @include media(small) { - display: block; - } - } - - } - } - - button.checkout, .button.checkout, - .button.checkout:focus{ - float: right; - } - - .pricechange { - display: none; - font-size: 0.75rem; - color: #666; - background-color: #ffc; - padding: 12px; - border-bottom: 1px solid #ccc; - } -} -.item-confirm { - header { - background: none; - border-bottom: none; - - padding: 15px 30px; - - @include media(medium) { - padding: 24px 30px; - } - - h1 { - text-transform: none; - color: #589141; - font-size: 1.3rem; - - &::before { - font-family: 'Lucida Grande'; - content: '\2713'; - padding-right: 8px; - } - } - } - - &.column .content { - padding: 0px 30px 15px; - //MO added clearfix to fix change button coming out of its parent div. - @include clearfix(); - } - - .webstore-change-item { - padding: 4px 6px; - font-size: .75rem; - text-decoration: none; - margin: .75em 0 0 0; - display: inline-block; - color: #aaa; - border: 2px solid #ccc; - font-weight: bold; - text-transform: uppercase; - @include transition-property(border-color,background-color,color); - @include transition-duration(.5s); - - &:hover { - border-color: $calltoaction-color; - color: $calltoaction-color; - } - } - - img { //MO - float: left; - margin-bottom: 20px; - position: absolute; - } - - .product-data {//MO - padding-left: 100px; - margin-left: 20px; - } - - h3 { - margin-top: 0; - font-size: 1.125rem; - margin-bottom: .25em; - } - - p { - margin-bottom: .125rem; - margin-top: 0; - color: #888; - } -} - -//webstore montreal ovewrites -@media (min-width: 720px) { - /* line 173, /app/source/stylesheets/webstore/_cartadd.scss */ - .item-confirm header { - padding: 5px 30px; } } - -.webstore-modal-cart-confirm h1{ - color: #777; - font-weight: 600; - text-transform: uppercase; - font: 1rem "Open Sans", "Helvetica Neue", Helvetica, sans-serif; - font-weight: normal; - margin: .25rem 0; -} - -/* override fonts */ -.webstore-modal .item-confirm .content h3, -.webstore-modal .item-confirm header h1, -.webstore-modal .cart-summary header h1, -.webstore-modal .cart-summary footer .button, -.webstore-modal .cart-summary footer button, -.webstore-modal aside.related-products h4, -.webstore-modal aside.related-products h3 { font-family: 'Open Sans','Helvetica Neue',Helvetica,sans-serif; } - -/* left side tweaks */ -.webstore-modal .item-confirm header h1 { margin: 12px 0; } -.webstore-modal .item-confirm .content { text-transform: none; } -.webstore-modal .item-confirm .content p { font-size: 15px; } -.webstore-modal .item-confirm .content h3 { font-weight: bold; line-height: 24px; margin-bottom: 10px; word-wrap: break-word; overflow-x: auto; overflow-y: -moz-hidden-unscrollable;} -.webstore-modal .item-confirm .content .sku { text-transform: uppercase; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; } -.webstore-modal .item-confirm button.webstore-change-item { background-color: #ffffff; width: auto; } //MO -.webstore-modal .item-confirm button.webstore-change-item:hover { background-color: #ffffff; } -.webstore-modal .item-confirm img { max-width: 100px; max-height: 140px; width: auto; margin-bottom: 55px; } -.webstore-modal .item-confirm.column .content { padding: 0 20px 15px 25px; } - - -/* right side tweaks */ -.webstore-modal .cart-summary header { font-family: 'Open Sans','Helvetica Neue',Helvetica,sans-serif; } -.webstore-modal .cart-summary .webstore-promo-form button.inset { max-height: 30px; min-width: 50px; } -.webstore-modal input[type="text"] { min-height: 41px; margin-bottom: 0; } -.webstore-modal form { background-color: #EEE; margin-bottom: 0; } -.webstore-modal button, .cart-summary footer .button { margin-bottom: 0; } -.webstore-modal .cart-summary table td, -.webstore-modal .cart-summary footer .button, -.webstore-modal .cart-summary footer button { text-transform: none; } -.webstore-modal .cart-summary footer a{ - color: #FFF; - text-shadow: none; -} -.webstore-modal .cart-summary footer .button:hover { - background: $link-hover-color; - border: none; -} -.webstore-modal h1 small { - line-height: normal; -} - - -/* related products */ -.webstore-modal aside.related-products h3 { line-height: 18px; text-transform: none; font-weight: bold; } -.webstore-modal aside.related-products img { max-height: 80px; width: auto; } -.webstore-modal aside.related-products p.price { position: static; } - -@media (max-width: 640px) { - .webstore-modal .promo input[type="text"]:focus { max-width: 100%; } -} - -@media (max-width: 740px) { - .webstore-modal .item-confirm img { margin-bottom: 154px; } -} - -@media (max-width: 719px) { - .webstore-modal .item-confirm header { padding: 5px 30px; } - .webstore-modal aside.related-products h3 { line-height: 24px; } -} - -@media (max-width: 670px) and (min-width: 560px) { - .webstore-modal .item-confirm header h1 { font-size: 1rem; } -} - -@media (max-width: 559px) { - .webstore-modal .item-confirm.column .content { padding: 0 0 15px 10px; } - .webstore-modal .item-confirm img { margin-bottom: 76px; } - .webstore-modal .product-data .webstore-change-item { margin-bottom: 18px; } -} - -@media (max-width: 360px) { - .webstore-modal .item-confirm header h1 { font-size: 1rem; } -} - -form.webstore-promo-form.promo{ - width:100%; -} - -//Note that webstore-shipping-options was updated to shipping-options. The -//* webstore prefix was dropped. TODO Update CSS upstream. -// -// Default to the initial screen. -.shipping-estimate-line, -.tax-estimate-line, -.shipping-country-link, -.shipping-country-picker, -.shipping-options { - display: none; -} - -.webstore-shipping-choices li.webstore-shipping-choices-notice { - border-top: none; - border-bottom: 1px solid #ddd; - background-color: #ffc; -} - -.webstore-shipping-choices li.webstore-shipping-choices-notice.grey{ - background-color: #eee; -} - - -.webstore-modal-overlay button .continue-shopping.exit, .webstore-modal-overlay .cart-summary footer button.exit{ - background-color: #ccc; - color: #888; - &:hover{ - background-color: #999; - color: #fff; - } - -} - - -.estimate-shipping-and-taxes-link:hover{ - border-bottom-color: $calltoaction-color; -} diff --git a/core/protected/extensions/umber/assets/modal/_checkout.scss b/core/protected/extensions/umber/assets/modal/_checkout.scss deleted file mode 100755 index 6d3e1552..00000000 --- a/core/protected/extensions/umber/assets/modal/_checkout.scss +++ /dev/null @@ -1,218 +0,0 @@ -.webstore-checkout { - - //MO - input[type] { margin-bottom: 0;} - *, *:before, *:after { - -moz-box-sizing: border-box; -webkit-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box;} - - ol { - list-style: none; - margin: 0; - padding: 0; - } - - p { - font-size: .8375rem; - color: #777; - line-height: 1.5; - } - - label.checkbox { - text-align: center; - width: 100%; - display: block; - font-size: .875rem; - - input { - font-size: 1rem; - margin: 0 .25rem 0 0; - width: auto; - display: inline-block; - } - - //MO alignment of store pickup checkbox - input.instore-toggle { - margin: 0.2rem 0.5rem 0 0; - } - } - - footer.submit { - @extend %clearfix; - margin-bottom: 15px; - } - //MO - input[type="submit"]:focus{ - &#Payment{ - height:64px; - line-height: normal; - font-size: 1.125rem; - padding: 20px 0; - } - } - - input[type="submit"], button, .button { - width: 100%; - font-size: 1.125rem; - padding: 20px 0; - border: none; - &#login-button, &#login-button:focus, - &#guest-button, &#guest-button:focus{ - height: 64px; - font-size: 1.125rem; - } - @include transition-property(border,background); - @include transition-duration(.5s); - - &.small { - width: auto; - font-size: .8375rem; - padding: 9px; //MO - } - } - - .notice { - padding: 15px 30px; - margin: 0 -30px 1em; - - background-color: #ffc; - border-top: 1px solid #ddd; - border-bottom: 1px solid #ddd; - - p { margin: 0; } - strong { color: #333; } - } - - - .choices { - overflow: hidden; - - button, .button { - width: 100%; - font-size: .9375rem; - float: left; - background: #eee; - border: 1px solid #ccc; - color: #777; - margin-top: 6px; - padding: 12px 0; - //override light.css - height: 46px; - - @include media(verysmall) { - width: 50%; - &:last-child { - border-left: none; - } - } - - &:hover { - font-weight: bold; - border-color: $calltoaction-color; - background: $calltoaction-color; - color: #fff; - } - } - } -} - -//TODO:MO have path similar to design? -@import 'address_blocks'; -@import 'checkout_sidebar'; -@import 'checkout_forms'; -@import 'checkout_begin'; -@import 'checkout_shipping'; -@import 'checkout_payment'; -@import 'checkout_confirm'; -@import 'checkout_thankyou'; - - -select[name="city_state"] { max-width: 12em; } - - -.webstore-checkout footer.submit-small { - height: 65px; - - input[type="submit"], .button { - font-size: .9375rem; - padding: 15px 0; - } - - //MO - p { margin: 1rem 0; } -} - -p.tip { - margin: .25em 0 1.25em; - font-size: .8375rem; - color: #aaa; -} - -.or-block { - border-top: 1px solid #ccc; - margin-top: 1rem; - height: .5rem; - - &:before { - text-align: center; - content: 'OR'; - color: #888; - display: block; - background-color: #fff; - margin: -.5rem auto 0; - font-size: .875rem; - width: 2.5rem; - height: 1rem; - line-height: 1; - } -} - -.modal-conditional-block { - overflow: hidden; - height: 0; - opacity: 0; - @include transition(opacity .6s); - - &.active { - height: auto; - opacity: 1; - overflow: visible; - } - -} - - -.note { - background-color: #ffc; - border-top: 1px solid #ccc; - border-bottom: 1px solid #ccc; - padding: 15px 30px; - margin: 0 -30px .5em; - - h5 { - text-transform: uppercase; - margin: 0 0 .25em; - } - p { - margin: 0; - } -} - -.button-paragraph { - margin-left: 1em; - - button { - display: inline-block; - float: none; - margin: 0 .5em; - } -} - -#checkout section > header { - @include media(medium) { - padding: 0; - a.exit{ - margin-right: 0!important; - } - } -} - diff --git a/core/protected/extensions/umber/assets/modal/_checkout_begin.scss b/core/protected/extensions/umber/assets/modal/_checkout_begin.scss deleted file mode 100644 index 46b5891d..00000000 --- a/core/protected/extensions/umber/assets/modal/_checkout_begin.scss +++ /dev/null @@ -1,70 +0,0 @@ -@include media(medium) { - #start { - & > footer p { - margin-right: -60px; - margin-left: -60px; - } - } -} - - -#start { - //MO to avoid text overlapping - //and too narrow inputs on login page. - .section-inner{ - padding: 15px 10px 20px; - @include media(verysmall){ - padding: 15px 20px 20px; - } - } - - footer.submit { - text-align: center; - height: 91px; - - p { - color: #999; - font-size: .9375rem; - margin: 0 0; - } - a.alternate { - text-align: center; - background: #fff; - color: #999; - margin: 12px auto 0; - display: inline-block; - border-bottom: 1px dotted #ccc; - } - - opacity: 1; - - & > div { - @include transition(opacity .5s); - - } - - .invisible { - overflow: hidden; - height: 0; - visibility: none; - opacity: 0; - } - - } - - li.password-block { - margin-top: -1px; - input { border-bottom: none; } - - .reset { - .inset { right: 0; } - p { margin-right: 5em; } - } - } - - //MO - .form-error{ - border-bottom: none; - margin-bottom: 0; - } -} diff --git a/core/protected/extensions/umber/assets/modal/_checkout_confirm.scss b/core/protected/extensions/umber/assets/modal/_checkout_confirm.scss deleted file mode 100644 index f5396a7c..00000000 --- a/core/protected/extensions/umber/assets/modal/_checkout_confirm.scss +++ /dev/null @@ -1,408 +0,0 @@ -#confirm { - .section-inner{ width:100%; } //MO fix for IE10 order summary. - - .section-content { - width: inherit; //MO fix for IE10 order summary. - border-right: none; - } - - h4 { - text-transform: uppercase; - color: #666; - margin: 1em 0 .5em; - font-size: .875rem; - } - - .final-confirmation { - border-bottom: 1px solid #ddd; - padding-bottom: 30px; - - label { - margin-top: .5em; - text-align: left; - padding-left: 25px; - input { - margin-top: 3px; - margin-left: -25px; - float: left; - } - - &:hover { cursor: pointer; } - } - - .terms { - line-height: 1.4; - font-size: .75rem; - margin: 0; - margin-left: 25px; - } - - .button.paypal { - font-size: 0.875rem; - width: 11rem; - background-color: #f8f8f8; - overflow: hidden; - border: 1px solid #ccc; - color: #666; - &:hover { - background-color: darken(#f8f8f8, 10%); - } - span { - background: url("images/altpayments/logo-paypal.png") no-repeat scroll center center; - background-size: 100% auto; - position: relative; - display: inline-block; - height: 25px; - margin-left: 5px; - top: -2px; - vertical-align: middle; - width: 75px; - } - - } - @include media(small) { - .button.paypal { - width: 37%; - margin-right: 11%; - float: right; - font-size: 1.25rem; - span { - margin-left: 10px; - width: 101px; - } - } - } - } - - .comments { - margin: 1.25rem 0 1.25rem 25px; - - a, textarea { font-size: .875rem; } - - a:before { - @extend %icon-prereqs; - @extend %icon-chat-bubble; - - float: left; - margin-top: 4px; - margin-right: 5px; - border-bottom: none; - } - - textarea { - display: none; - width: 16rem; - padding: 10px; - border: $input-border; - } - } - - - %twocolumn { - @extend %clearfix; - - .column { - width: 96%; - float: left; - margin-left: 2%; - - @include media(verysmall) { - width: 48%; - } - - @include media(small) { - margin-left: 0; - &:first-child { - margin-right: 4%; - } - } - } - } - - .order-details { - @extend %twocolumn; - margin: .5rem 0; - - h2 { - margin: 0; - } - } - - .shipping { - p{ - a { display: block; } - } - } - - .payment { - p { - font-size: 0.75rem; - margin: 0 0 1.25em; - border: 1px solid #ddd; - padding: 15px 5px 15px 75px; - - a { - display: block; - margin-top: 5px; - } - - } - - //MO - p.sim { - padding: 7px 5px 8px 15px; - - .instructions { - font-size: 0.6rem; - } - } - - .payment-note { - margin-bottom: 10px; - display: inline-block; - font-size: 0.75rem; - } - - .card-tiny { - display: inline-block; - padding: 8px 4px; - margin-left: -60px; - width: 45px; - border: 1px solid #ccc; - float: left; - } - .card-only { - display: inline-block; - margin-left: -60px; - width: 45px; - float: left; - } - } - - .lines { - tbody { - border-bottom: 1px solid #ddd; - } - - td { - border-top: 1px solid #ddd; - line-height: 40px; - } - - //MO override bootstrap - td.controls { - vertical-align: middle; - } - - .quantity { - font-weight: bold; - text-align: center; - padding: 0; - line-height: 4rem; - min-width: 1.75rem; - - input { - display: none; - width: 2.60rem; - padding: 3px 3px; - text-align: center; - font-weight: bold; - - &::-webkit-inner-spin-button, &::-webkit-outer-spin-button { - -webkit-appearance: none; - margin: 0; - } - //MO remove spinner from number inputs mozilla - -moz-appearance:textfield; - } - } - - .image { - display: none; - white-space: nowrap; - width: 65px; - vertical-align: middle; //MO bootstrap override - @include media(small) { - display: table-cell; - } - - &:before { - display: inline-block; - padding: 0 .5em 0 0; - height: 40px; - font-weight: normal; - font-size: 1.25rem; - content: '\d7'; - float: left; - } - - img { - float: left; - max-height: 40px; - max-width: 40px; - } - } - - .description { - line-height: 1.3; - font-size: .875rem; - padding-right: .5em; - padding-left: .5em; - font-weight: bold; - //override base.css l.25 - vertical-align: middle; - - .price { - font-weight: normal; - font-size: .8375em; - color: #888; - } - a > strong{ - margin-right: 15px; - } - } - - .subtotal { - text-align: right; - font-weight: bold; - } - - .controls { - padding: 0 1em; - text-transform: uppercase; - font-size: .75rem; - width: 2.5rem; - - a { float: right; } - - a.edit { - line-height: 1; - padding: 6px 4px 5px; - border: 1px solid #ccc; - color: #aaa; - - &:hover { - color: $blue; - border-color: $blue; - } - } - a.remove { - @extend %remove-icon; - display: none; - } - } - - - tr.active { - .quantity { - strong { display: none; } - input { display: inline-block; } - } - .controls { - a.edit { display: none; } - a.remove { display: block; } - } - } - } - - .lines-footer { @extend %clearfix; } - - .totals { - margin-top: .5rem; - float: right; - width: 100%; - @media(min-width:640px) { - float: right; - width: 16rem; - } - - td, th { - color: #666; - line-height: 1.75rem; - font-size: 1rem; - } - - small { - font-size: .75rem; - color: #999; - font-weight: normal; - } - - th{ - text-align:left; - } - - td { - text-align: right; - border-top: none; - line-height: 1; - } - - .total { - td, th { - color: #333; - font-size: 1.25rem; - line-height: 1.5em; - - } - td { font-weight: bold;} - - } - } -} - - -//MO -#place-order{ - width: 48%; - float: right; - margin-left: 4%; - margin-bottom: 25px; - text-shadow: 0 0; - &:focus{ - font-size: 1.125rem; - } -} -#checkout .quantity input{ - height:30px; - font-size:16px; -} -#checkout .address-block button a{ - color: white; - text-decoration: none; - //MO override base.css line 183. - &:focus{ - outline:none; - } - -} -.webstore-overlay table.lines a { - color: #555; - text-decoration: none; -} -#confirm .promo input[type="text"] { - height: 41px; -} - -.thankyou input[type="password"]{ - height:40px; -} -.thankyou h2 { - font-weight: normal; - font-size: 1.5rem; - color: #589141; - margin: -.25em 0 .25em; -} - -.webstore-overlay #confirm form.promo{ - p{ - line-height: 1.3; - font-size: 0.6875rem; - } -} -p.webstore-label.confirmation span { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - display: block; -} diff --git a/core/protected/extensions/umber/assets/modal/_checkout_forms.scss b/core/protected/extensions/umber/assets/modal/_checkout_forms.scss deleted file mode 100644 index f51d00c5..00000000 --- a/core/protected/extensions/umber/assets/modal/_checkout_forms.scss +++ /dev/null @@ -1,174 +0,0 @@ -.field-containers-small { - @extend %clearfix; - - .field-container { - input, select { - height: 2.75rem; - font-size: .875rem; - padding: .25em 8px; - } - select { - font-size: .875rem; - color: #444; - } - p.hint { - color: #999; - top: 0px; - right: 10px; - font-size: .8375rem; - line-height: 1rem; - } - } -} - - -.fieldgroup { - @extend %clearfix; - - border: 1px solid #ddd; - border-top: none; - overflow: hidden; - - //MO - &.city-fieldgroup ol li:nth-child(1){ - width: 25%; - @include media(verysmall){ - width: 20%; - } - input{ - width:100%; - &:focus{ - width: 100%!important; - } - } - } - &.city-fieldgroup ol li:nth-child(2){ - width: 50%; - @include media(verysmall){ - width: 65%; - } - input{ - width: 100%; - &:focus{ - width: 100%!important; - } - } - } - &.city-fieldgroup ol li:nth-child(3){ - width: 25%; - @include media(verysmall){ - width: 15%; - } - input{ - width: 100%; - &:focus{ - width: 100%!important; - } - } - } - .field-container { - float: left; - border-right: 1px solid #ddd; - - input, select { - width: auto; - border: none; - margin: 0; - } - } - - .field-container:last-child { - border-right: none; - } - -} - -.field-container.field-container-select { - select { - padding-right: 1.75rem; - - &:hover, &:focus { - background: none; - cursor: pointer; - } - } - - &:after { - font-family: FontAwesome; - display: inline-block; - content: "\f0d7"; - font-size: 21px; - color: #bbb; - position: absolute; - right: .5rem; - top: 0; - pointer-events:none; - line-height: 2.75rem; - } - - &.field-container-select-no-handle { - select { padding-right: 0; } - &:after { - content: ' '; - } - } -} - -.fieldgroup .field-container.country { - float: right; - select { max-width: 7rem; } -} - - //TODO:MO temporary until no-handle style is fully implemented on country inputs. -.country-container{ - border: 1px solid #ddd; - border-top: none; -} - -.field-container select.modal-accent-color { color: $blue; } - -ol.field-container-gap { - margin-bottom: 1rem; -} - -.field-container-split { - width: 50%; - float: left; -} -.field-container-split-latter { -// MO removed this, company input is misaligned with -// names input with this -// margin-left: -1px; -} -.field-container-toggle { - font-size: .8125rem; - - a { - display: inline-block; - padding: 9px 9px 3px; - } -} - -.company-container { - clear: both; -} - -.field-container-select { - height: 2.75rem; - line-height: 2.75rem; - - select { font-size: .875rem; } -} - -.field-container-narrowed { - width: 75%; - float: left; -} - -.webstore-modal-overlay .address-form .fieldgroup .field-container input:focus, -.webstore-modal-overlay .address-form .fieldgroup .field-container input:focus:required:invalid:focus{ - width: auto; - border: none; - margin: 0; -} - diff --git a/core/protected/extensions/umber/assets/modal/_checkout_payment.scss b/core/protected/extensions/umber/assets/modal/_checkout_payment.scss deleted file mode 100644 index ce717c51..00000000 --- a/core/protected/extensions/umber/assets/modal/_checkout_payment.scss +++ /dev/null @@ -1,405 +0,0 @@ -.cvc-container { - position: relative; -} -.cvc-hint { - position: absolute; - top: -50%; - left: 100%; - width: 180px; - - display: none; - - margin-left: 5px; - - box-shadow: 0 2px 4px rgba(0,0,0,.1); - border: 1px solid #ccc; - background-color: #fff; - padding: 10px 15px 0 15px; - - p { - margin: 0 0 .75em; - font-size: .6875rem; - } - - img { - width: 100px; - margin-bottom: -5px; - } -} - -#payment { - .outofbandpayment { - padding-top: 5px; - padding-bottom: 45px; - margin-bottom: -8px; - position: relative; - - .buttons { - @extend %clearfix; - - @include flexbox(); - @include justify-content(center); - } - - button { - display: inline-block; - text-align: center; - font-size: .875rem; - padding: 10px; - @include border-radius(2px); - width: 140px; - margin-top: 0; - - &.paypal { - width: 11rem; - background-color: #f8f8f8; - overflow: hidden; - border: 1px solid #CCC; - color: #666; - &:hover { - background-color: darken(#f8f8f8, 10%); - } - span{ - background: url("images/altpayments/logo-paypal.png") no-repeat scroll center center; - background-size: 100% auto; - position: relative; - display: inline-block; - height: 25px; - margin-left: 5px; - top: -2px; - vertical-align: middle; - width: 75px; - } - } - } - //MO - .or-block { - position: absolute; - left: 0; - right: 0; - bottom: 0; - } - - .spacer { - margin: 12px 0; - } - } - - h4 { - margin: 0 0 .5em; - } - - .address-form { - @extend %clearfix; - margin-bottom: 15px; - - //MO - h4 { margin-top: 20px; } - } - - //MO - .address-form.invisible { - display: none; - visibility: visible; // override bootstrap - .fieldgroup .field-container input, .fieldgroup .field-container select { - height: 2.375rem; - font-size: .75rem; - } - } - - .payment-methods { - input[type=radio] { - vertical-align: baseline; - margin: 4px 5px 0.5em 0; - width: 13px; - height: 13px; - - &:checked + label { - color: #333; - } - } - - label { - color: #777; - font-size: 0.875rem; - padding-left: 10px; - margin-bottom: 0.5rem; - } - - //MO payment-simple page cc label - .sim-cc { - font-size: 19px; - font-weight: bold; - margin-left: 10px; - } - - //MO payment-simple page cc radio - input.sim-cc-radio { - margin-top: 8px; - } - } - - .checkset { - input[type=radio], input[type=checkbox] { - display: none; - - &:checked + label.checklabel { - color: #333; - - &:before { - border-color: #ccc; - @extend %icon-check-mark; - } - } - } - } - - label.checklabel { - display: block; - margin: 0 0 .5em; - color: #999; - @include transition(all .4s); - - &:before { - @extend %icon-prereqs; - margin: 0 8px -4px 0; - @include border-radius(16px); - content: ""; - display: inline-block; - width: 20px; - - height: 20px; - border: 2px solid #ccc; - font-size: 24px; - color: #444; - text-align: center; - line-height: 15px; - text-indent: -2px; - float: left; - } - - &:hover { - color: #444; - &:before { border-color: #999; } - } - - &.error { color: #999; } - } - - .alt-payment-methods { - padding: 15px 30px 10px; - border: 1px solid #ccc; - - h4 { - text-transform: uppercase; - color: #444; - font-size: .8125rem; - margin: 0 0 1em; - } - - .subform { - input { - width: 12em; - min-height: 35px; - padding: 6px 7px; - display: none; - } - } - } - - //MO - .alt-payment-methods.borderclose { - border-top: 0; - } - - } - - .address-blocks { - - - p { - font-size: .6875rem; - padding: 10px; - - &:before { - display: none; - } - } - } - - .creditcard { - @extend %clearfix; - - border: 1px solid #ccc; - border-bottom: none; - padding: 30px 15px 0; - margin: 0; - - @include media(verysmall){ - padding: 30px 30px 0; - } - - &.creditcard-nosubmit { - border-bottom: 1px solid #ccc; - margin-bottom: 15px; - } - - h3 { - margin: 0 0 .25em; - } - - p.large { - margin: 0; - font-size: 1rem; - } - - input.creditcard-number { - padding-left: 10px; - padding-right: 10px; - font-size: 1.325rem; - - &::-webkit-input-placeholder { - font-size: 1.2rem; - line-height: 1.5; - font-family: $default-font-family; - } - &:-moz-placeholder { - font-size: 1.2rem; - line-height: 1.5; - font-family: $default-font-family; - } - &:-ms-input-placeholder { - font-size: 1.2rem; - line-height: 1.5; - font-family: $default-font-family; - } - } - - .card-details { - input, input#MultiCheckoutForm_cardExpiry:focus, - input#MultiCheckoutForm_cardNumber:focus, input#MultiCheckoutForm_cardCVV:focus { - background-color: #fff; - } - input#MultiCheckoutForm_cardNumber:focus{ - font-size: 1.325rem; - } - @include media(verysmall){ - background-color: #f8f8f8; - border: 1px solid #ddd; - padding: 20px 20px 15px; - $height: 204px; - height: $height; - max-width:($height*1.76) - } - margin-top: 20px; - @include border-radius(10px); - - ol.field-container-gap { - margin-bottom: 1rem; - } - - input:focus { - background-color: #fff; - outline-color: rgb(91, 157, 217); - outline-offset: -2px; - outline-style: auto; - outline-width: 5px; - } - - p.cardholder { - margin: .65em 0 0; - text-transform: uppercase; - font-size: 1.125rem; - color: #999; - - a { - font-family: $default-font-family; - font-size: .8375rem; - text-transform: none; - border-bottom: 1px dotted #999; - } - } - .cardholder-field { - margin-top: 1em; - - input { - height: 2.75rem; - font-size: .9375rem; - padding: 0 10px; - } - } - - } - .cart-details-secondary { - - li { - float: left; - - &:first-child { margin-right: 1rem; } - } - - .card-logo { - float: right; - height: 44px; - - - img, div { - display: none; - max-height: 44px; - position: relative; - top: 50%; - @include transform(translateY(-50%)); - - &.active { - display: block; - } - } - } - } - } - - .shippingasbilling { - display: inline-block; - font-size: .8375rem; - color: #999; - font-weight: bold; - width: 100%; - margin: 15px 0 20px; - padding: 20px 15px 15px 0; - @include media(verysmall){ - padding: 20px 10px 15px; - } - - //MO - div.text{ - font-size: .8rem; - font-weight: normal; - margin-top: 0.40em; - } - - :checked + .text { - color: #444; - } - - .address-abbr { - color: #999; - font-weight: normal; - font-size: .75rem; - margin: .125em 0 .75em 30px; - } - - input { - float: left; - line-height: 2rem; - margin: .45em .5em 1em 0; - font-size: 1.25rem; - } - } - -//temporary fix, confirm exact styling with Kevin and Luke -input#MultiCheckoutForm_cardNumber { - &:focus{ - padding-left: 10px; - padding-right: 10px; - } -} diff --git a/core/protected/extensions/umber/assets/modal/_checkout_shipping.scss b/core/protected/extensions/umber/assets/modal/_checkout_shipping.scss deleted file mode 100644 index 99174cbd..00000000 --- a/core/protected/extensions/umber/assets/modal/_checkout_shipping.scss +++ /dev/null @@ -1,108 +0,0 @@ -#shipping { - p.introduction { - margin: -.5rem 0 1.5rem; - font-size: .9375rem; - } - - table.shipping-options { - margin: 0; - border: 1px solid #ccc; - display: table; - - td, th { - font-size: .875rem; - padding: .75em; - } - - thead { - th { - color: #666; - font-weight: normal; - font-size: .8375rem; - background-color: #eee; - border-bottom: 1px solid #ccc; - } - } - - tbody { - td, th { - color: #999; - border-bottom: 1px solid #eee; - padding: 1em .75em; - } - th { - color: #555; - font-size: .9375rem; - - input { font-size: 1rem; } - } - - } - - label { - input { margin-right: 8px; } - &:hover { cursor: pointer; } - } - - } - - label.checkbox { - text-align: left; - font-size: 1rem; - margin-bottom: 1rem; - - input.residential-toggle { - margin: 0.2rem 0.5rem 0 0; - } - } -} - -.shipping-instore { - label.checkbox { - text-align: left; - font-weight: bold; - font-size: 1rem; - - &:hover { cursor: pointer; } - - p { - font-weight: normal; - font-size: .8375rem; - margin: .125em 0 .75em 24px; - } - } - - .shipping-instore-details { - @include clearfix(); - margin: .25em 0 0 24px; - - p.contact-info { - float: left; - width: 100%; - margin: 0 0 1.5em; - @include media(verysmall) { - width: 50%; - } - } - } - - h4 { - margin: 0 0 .25em; - font-size: .8375rem; - color: #333; - text-transform: uppercase; - } -} - - -//MO -.overlay #checkout label { - color: #555; font-size: 15px; -} - -#MultiCheckoutForm_shippingFirstName, #MultiCheckoutForm_pickupFirstName{ - border-right: none; -} -#MultiCheckoutForm_shippingAddress1:focus{ - border-bottom: none; -} \ No newline at end of file diff --git a/core/protected/extensions/umber/assets/modal/_checkout_sidebar.scss b/core/protected/extensions/umber/assets/modal/_checkout_sidebar.scss deleted file mode 100644 index 4abd2504..00000000 --- a/core/protected/extensions/umber/assets/modal/_checkout_sidebar.scss +++ /dev/null @@ -1,136 +0,0 @@ -.webstore-sidebar-summary { - - @include flexbox(); - @include flow(column); - @include justify-content(space-between); - - h2, h3 { - color: #666; - text-transform: uppercase; - } - - h2 { - margin: 0 0 .25em; - font-size: 1rem; - } - h3 { - font-size: .875rem; - margin: 0 0 .5em; - } - - a { - text-decoration: none; - border-bottom: 1px dotted #ccc; - padding-bottom: 1px; - - &:hover { - border-bottom: 1px solid $blue; - } - } - - - table { - margin: 0; - color: #888; - - td, th { - font-size: .8375rem; - padding: .5em 0; - } - td { text-align: right; } - - tbody { - th { - font-weight: normal; - //MO - text-align: left; - } - - td, th { - border-bottom: 1px solid #eee; - } - } - - tfoot { - td, th { - color: #333; - font-weight: bold; - text-transform: uppercase; - } - //MO - th { - text-align: left; - } - } - } - - .summary { - max-width: 100%; //MO fix for IE10 order summary. - padding: 30px 15px 15px; - } - - .pricechange { - width: 239px; - font-size: 0.8375rem; - color: #666; - background-color: #ffc; - padding: 15px; - margin: -30px 0px 10px -15px; - border-bottom: 1px solid #ccc; - - @media(max-width: 640px) - { - width: 100%; - margin-left: 0px; - } - } - - .promo { - margin-top: 2rem; - min-width: 100%; - - input { border-color: #eee; - // MO override bootstrap - height:41px; - } - - p.description { display: none; } - } - - .contact { - padding: 15px 15px 20px; - - p { - font-size: .8375rem; - margin: 0; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - } - h3 { - text-transform: none; - margin: 0 0 .125em; - } - } - - .account { - margin: 0 0 0; - background-color: #f8f8f8; - border-top: 1px solid #eee; - padding: 15px; - - @include align-self(flex-end); - - p { - margin: 0 0 .75em; - font-size: .875rem; - line-height: 1.4; - - &.hint { - margin: 0; - font-size: .8375em; - color: #aaa; - } - } - } -} diff --git a/core/protected/extensions/umber/assets/modal/_checkout_thankyou.scss b/core/protected/extensions/umber/assets/modal/_checkout_thankyou.scss deleted file mode 100644 index f74e8d0d..00000000 --- a/core/protected/extensions/umber/assets/modal/_checkout_thankyou.scss +++ /dev/null @@ -1,199 +0,0 @@ -#thankyou { - .section-content { - width: inherit; //MO fix for IE10 order summary. - border-right: none; - } - - -} -$check-width: 3.25rem; - -.thankyou { - padding-bottom: 2rem; - margin-bottom: 1.5rem; - border-bottom: 1px solid #ccc; - - h1 { - font-size: 1.75rem; - margin: .25em 0 .75em; - @include media(small){ - font-size: 2.25rem; - } - } - - - h2, h3, p, .create-account ol { - margin-left: 0; - } - - @include media(small){ - h2, h3, p, .create-account ol{ - margin-left: $check-width; - } - } - - - h2 { - font-weight: normal; - font-size: 1.3rem; - color: $confirmation-color; - margin: -.25em 0 .25em; - @include media(small){ - font-size: 1.5rem; - } - - &:before { - margin-top: .35rem; - padding-left: .25rem; - margin-right: -.6rem; - float: left; - width: $check-width; - font-size: 1.85rem; - @include media(small){ - margin-top: -.125rem; - padding-left: .25rem; - margin-right: -.25rem; - font-size: 2.5rem; - } - - - - @extend %icon-prereqs; - @extend %icon-check-mark; - } - } - - h3 { - margin-bottom: .125em; - font-size: 1rem; - color: #444; - font-weight: normal; - } - p { - color: #999; - font-size: .8375rem; - margin-top: 0; - margin-bottom: .5em; - - &.large { - font-size: 1.125rem; - color: #444; - margin-bottom: .25rem; - - - } - - - } - - a.print { - font-size: .8125rem; - margin-bottom: 1em; - margin-top: .5em; - border: 1px solid #ddd; - color: #888; - padding: 10px 12px; - display: inline-block; - - &:before { - @extend %icon-prereqs; - @extend %icon-print; - - float: left; - margin-top: 1px; - font-size: 18px; - margin-right: 6px; - } - - &:hover, &:active { - color: $calltoaction-color; - border-color: $calltoaction-color; - } - } - -} -.create-account { - @extend %clearfix; - - li { - &:last-child{ - clear: both; - margin-top: 0.75em; - @include media(small){ - clear: none; - margin-top: 0; - } - } - @include media(verysmall){ - float: left; - margin-right: .5rem; - } - } - input { - border: $input-border; - padding: 10px; - font-size: .8375rem; - width: 12em; - //MO to override style.css l.24. - &:focus{ - padding: 10px; - font-size: .8375rem; - } - } - button { - font-size: .8375rem; - padding: 11px 10px; - color: #666; - background-color: #eee; - // border: 1px solid #ccc; - - &:hover { - color: #fff; - } - } - .hint { - margin: .5em 0 0; - font-size: .675rem; - color: #999; - } -} -.create-account-confirm { - margin-left: $check-width; - font-size: 1rem; - padding: 12px; - color: #999; - border: 1px solid #ccc; - max-width: 24rem; - - h3, p { margin: 0; } - h3 { font-weight:bold; } -} - -.receipt { - h2 { - font-size: 1.3rem; - margin: 0 0 -.5em; - @include media(small) { - font-size: 1.5rem; - } - - .order-id { - border: 1px solid #ddd; - float: right; - padding: 6px 10px; - margin-bottom: -1rem; - font-size: 1rem; - text-transform: uppercase; - color: #bbb; - font-weight: normal; - line-height: normal; //MO override bootstrap - - strong { color: #555; } - } - } -} - -//MO override -.create-account p.form-error { - width: 20rem; -} diff --git a/core/protected/extensions/umber/assets/modal/_config.scss b/core/protected/extensions/umber/assets/modal/_config.scss deleted file mode 100755 index 77dc4fa3..00000000 --- a/core/protected/extensions/umber/assets/modal/_config.scss +++ /dev/null @@ -1,154 +0,0 @@ -@charset "utf-8"; - -$break-mobile: 0px; // This is used in limited situations, generally styles layer-up, not down. -$break-narrow-modal: 360px; -$break-verysmall: 450px; -$break-small: 640px; -$break-medium: 720px; -$break-cart-width: 840px; -$break-large: 1025px; -$break-verylarge: 1240px; - - -@import 'compass'; -@import '../mixins/html5-input-types'; - - -@mixin media($media) { - @if $media == 'mobile' { - @media (max-width: $break-small) { @content; } - } - @if $media == 'narrow-modal' { - @media (min-width: $break-narrow-modal) { @content; } - } - @else if $media == 'verysmall' { - @media (min-width: $break-verysmall) { @content; } - } - @else if $media == 'small' { - @media (min-width: $break-small) { @content; } - } - @else if $media == 'medium' { - @media (min-width: $break-medium) { @content; } - } - @else if $media == 'cartwidth' { - @media (min-width: $break-cart-width) { @content; } - } - @else if $media == 'large' { - @media (min-width: $break-large) { @content; } - } - @else if $media == 'short' { - @media (max-height: $break-short) { @content; } - } - @else { - @content; - } -} - -.webstore-modal * { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - padding-bottom: 0; -} - -// Colors -$font-color: #000; - -$blue: #3287CC; -$blue-steel: #435261; - -$purple: #897897; -$green: #589141; -$green-pale: #DBEBD6; -$pink: #CC89A6; -$red: #A44039; -$orange: #E27E38; -$yellow: #F6B444; - -$light-grey-border: #ccc; -$light-grey-text: #aaa; - -// Input borders -$input-border:1px solid $light-grey-border; - -// Link colors -$link-color: $blue; -$link-hover-color: darken($blue,10%); -$link-active-color: darken($blue,20%); - - - -.webstore-modal-overlay{ - a { - color: $link-color; - text-decoration: none; - - &:active { color: $link-active-color; } - &:hover { - color: $link-hover-color; - //MO boostrap override - text-decoration: none; - } - - &.hasborder { - padding-bottom: 1px; - border-bottom: $input-border !important; - - &:hover, &:active { - border-bottom-color: $blue; - } - } - } - -} - -$modal-padding: 20px; - -$modal-width: 720px; -$modal-width-narrow: 480px; - -$error-color: #B4282E; -$success-color: #ffffcc; - -$calltoaction-color: $blue; -$confirmation-color: $green !default; - -$default-font-family: 'Open Sans', 'Helvetica Neue', Helvetica, sans-serif;; - -$webstore-modal-font: $default-font-family; -$webstore-modal-header-font-weight: normal; -$webstore-modal-header-font-family: $default-font-family; - - -%clearfix { - &:after { - content: ""; - display: table; - clear: both; - } -} - -%remove-icon { - text-decoration: none; - display: block; - border: 2px solid #eee; - color: #ccc; - background-color: #fff; - @include border-radius(20px); - height: 28px; - width: 28px; - line-height: 22px; - padding-left: 5px; - font-size: 25px; - font-weight: bold; - margin: 0; - - @include transition-property(border-color, background-color,color); - @include transition-duration(.3s); - - &:hover { - color: #fff; - border-color: $red; - background-color: $red; - } -} diff --git a/core/protected/extensions/umber/assets/modal/_estimator.scss b/core/protected/extensions/umber/assets/modal/_estimator.scss deleted file mode 100644 index fe1c5065..00000000 --- a/core/protected/extensions/umber/assets/modal/_estimator.scss +++ /dev/null @@ -1,308 +0,0 @@ -.webstore-estimator { - &.recalculate { - td { - visibility: hidden; - color: #f8f8f8; - - &:after { visibility: visible; } - } - td.csspinner:after { - top: 27px; - left: 45px; - } - } - - form { - margin-top: 6px; - display: block; - } - input, button { - float: left; - - &:focus { - outline: none; - box-shadow: inset 1px 1px 2px rgba(0,0,0,.1); - border: 1px solid #bbb; - } - } - input { - border: $input-border; - padding: 9px 8px; - &:focus{ - padding: 9px 8px; - } - } - - select.webstore-estimator-country-form, select#webstore-estimator-country-form { - -webkit-appearance: menulist; - -moz-appearance: menulist; - appearance: menulist; - margin: 8px 0 0; - border: solid 1px #ccc; - } - - button { - padding-left: 8px; - padding-right: 8px; - } - - a.webstore-estimator-country { - float: right; - color: #888; - text-decoration: none; - border-bottom: 1px dotted #ccc; - font-size: .75rem; - display: inline-block; - padding: 10px 1px 0; - font-weight: normal; - line-height: normal; - &:active, &:hover { - color: #888; - font-weight: normal; - } - } -} - -.webstore-shipping-choices{ - background-color: rgba(0,0,0,.7); - height: 100%; - position: absolute; - top: 0; - right: 0; - left: 0; - z-index: 20; - - - @include media(small) { - position: relative; - background: none; - top: auto; - right: auto; - left: auto; - height: auto; - } - - form { - z-index:10; - position: absolute; - left: 0; - top: 0; - right: 0; - background-color: #fff; - margin: 0; - padding: 0 0 67px; - box-shadow: 1px 1px 3px rgba(0,0,0,.1); - - ol{ - min-height: 120px; - } - - @include media(small) { - left: -265px; - top: -24px; - width: 250px; - padding: 0 0 39px; - - &:after, &:before { - left: 249px; - top: 75px; - border: solid transparent; - content: " "; - height: 0; - width: 0; - position: absolute; - pointer-events: none; - } - - &:after { - border-color: rgba(255, 255, 255, 0); - border-left-color: #ffffff; - border-width: 10px; - margin-top: -10px; - } - &:before { - border-color: rgba(204, 204, 204, 0); - border-left-color: #bbb; - border-width: 11px; - margin-top: -11px; - } - } - } - - ol { - margin: 0; - padding: 0 0 4px; - list-style: none; - border: 1px solid #ccc; - border-bottom: none; - - li:last-child label { border-bottom: none; } - } - - li { - display: inline; - //MO - margin-bottom: 0; - - &.webstore-shipping-choices-more, - &.webstore-shipping-choices-notice { - display: block; - padding: 8px 10px; - color: #555; - background-color: #eee; - border-top: 1px solid #ccc; - font-size: .75rem; - margin-bottom: 0; - } - &.webstore-shipping-choices-notice { - border-top: none; - border-bottom: 1px solid #ddd; - background-color: #ffc; - } - - small{ - font-weight: normal; - color: #999; - } - } - - button, input[type="button"] { - width: 100%; - position: absolute; - bottom: 0; - left: 0; - right: 0; - - @include media(small) { - font-size: .875rem; - padding: 10px; - } - } - - //MO - .radio input[type="radio"]{ - float: left; - margin-left: -18px; - margin-top: 2px; - } - - label { - padding: 8px 48px 8px 24px; - color: #666; - margin: 0; - font-weight: bold; - display: block; - - small { - float: right; - font-weight: normal; - color: #999; - font-size: .9375rem; - margin-right: -42px; - @include media(small) { font-size: .75rem; } - } - - &:hover{ - background-color: #eee; - cursor: pointer; - } - } - - input{ - margin-right: 3px; - } -} - -.shipping-postal-entry{ - position: relative; - display: block; - height: 47px; - width: 100%; - overflow: hidden; - - button.inset{ - right: 8px; - top: 7px; - } - - input, input:focus{ - font-size: .875rem; - width: 100%; - outline: none; - box-shadow: inset 1px 1px 2px rgba(0,0,0,.1); - border: 1px solid #bbb!important; - } -} - -.webstore-modal-cart-confirm .shipping-postal-entry input, .shipping-postal-entry input:focus { - padding: 10px; -} - - -@media (min-width: 560px){ - .webstore-shipping-choices{ - input[type="button"] { - font-size: .875rem; - padding: 10px; - } - - form { - left: -265px; - top: -24px; - width: 250px; - padding: 0 0 39px; - } - } - - input.close-shipping-options.close-shipping-choices:focus{ - padding: 10px!important; - font-size: 0.875rem!important; - } - .close-shipping-options, .close-shipping-options:focus{ - max-height: 39px; - font-size: 0.875rem; - } -} - -@media (max-width: 560px){ - .webstore-shipping-choices label{ - font-size: 16px; - } - .webstore-shipping-choices li small{ - font-size: .9375rem; - } -} - - -.webstore-modal-cart-confirm{ - .shipping-postal-entry button.inset{ - left: calc(100% - 80px); - top:-34px; - position: relative; - } - a.webstore-estimator-country { - margin-bottom: 10px; - } - .shipping-postal-entry button.inset-spinner{ - left: calc(100% - 37px); - } -} - -.editcartmodal{ - .shipping-postal-entry button.inset{ - left: calc(100% - 85px); - top:-34px; - position: relative; - } - a.webstore-estimator-country { - margin-bottom: 10px; - padding-top: 5px; - } - .shipping-postal-entry button.inset-spinner{ - left: calc(100% - 42px); - } -} - - - - diff --git a/core/protected/extensions/umber/assets/modal/_icons.scss b/core/protected/extensions/umber/assets/modal/_icons.scss deleted file mode 100644 index 38753b4c..00000000 --- a/core/protected/extensions/umber/assets/modal/_icons.scss +++ /dev/null @@ -1,29 +0,0 @@ -//TODO: MO FONTS -@font-face { - font-family: "ls-webstore"; - src:url("fonts/ls-webstore.eot"); - src:url("fonts/ls-webstore.eot?#iefix") format("embedded-opentype"), - url("fonts/ls-webstore.woff") format("woff"), - url("fonts/ls-webstore.ttf") format("truetype"), - url("fonts/ls-webstore.svg#ls-webstore") format("svg"); - font-weight: normal; - font-style: normal; - -} - -%icon-prereqs { - font-family: "ls-webstore" !important; - font-style: normal !important; - font-weight: normal !important; - font-variant: normal !important; - text-transform: none !important; - speak: none; - line-height: 1; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -%icon-pencil { content: "\e000"; } -%icon-check-mark { content: "\e001"; } -%icon-chat-bubble { content: "\e002"; } -%icon-print { content: "\e003"; } diff --git a/core/protected/extensions/umber/assets/modal/_lines.scss b/core/protected/extensions/umber/assets/modal/_lines.scss deleted file mode 100644 index 3cf05037..00000000 --- a/core/protected/extensions/umber/assets/modal/_lines.scss +++ /dev/null @@ -1,143 +0,0 @@ -.webstore-lines { - tbody { - border-bottom: 1px solid #ddd; - } - - td { - border-top: 1px solid #ddd; - line-height: 40px; - } - - .quantity { - font-weight: bold; - text-align: center; - padding: 0; - line-height: 4rem; - min-width: 1.75rem; - - input { - display: none; - width: 1.75rem; - padding: 3px 3px; - text-align: center; - font-weight: bold; - - &::-webkit-inner-spin-button, &::-webkit-outer-spin-button { - -webkit-appearance: none; - margin: 0; - } - -moz-appearance:textfield; - } - } - - .image { - white-space: nowrap; - width: 65px; - - &:before { - display: inline-block; - padding: 0 .5em 0 0; - height: 40px; - font-weight: normal; - font-size: 1.25rem; - content: '\d7'; - float: left; - } - - img { - float: left; - max-height: 40px; - max-width: 40px; - } - } - - .description { - line-height: 1.3; - font-size: .875rem; - padding-right: .5em; - padding-left: .5em; - font-weight: bold; - - .price { - font-weight: normal; - font-size: .8375em; - color: #888; - } - } - - .subtotal { - text-align: right; - font-weight: bold; - } - - .controls { - padding-left: 1em; - text-transform: uppercase; - font-size: .75rem; - width: 2.5rem; - - a { float: right; } - } - a.edit { - line-height: 1; - padding: 6px 4px 5px; - border: 1px solid #ccc; - color: #aaa; - - &:hover { - color: $blue; - border-color: $blue; - } - } - a.remove { - @extend %remove-icon; - display: none; - } - - - tr.active { - .quantity { - strong { display: none; } - input { display: inline-block; } - } - .controls { - a.edit { display: none; } - a.remove { display: block; } - } - } -} - -.lines-footer { @extend %clearfix; } - -.webstore-lines-totals { - margin-top: .5rem; - float: right; - max-width: 16rem; - - td, th { - color: #666; - line-height: 1.75rem; - font-size: 1rem; - } - small { - font-size: .75rem; - color: #999; - font-weight: normal; - } - td { - text-align: right; - border-top: none; - line-height: 1; - } - - .total { - td, th { - color: #333; - font-size: 1.25rem; - line-height: 1.5em; - - } - td { font-weight: bold;} - - } -} \ No newline at end of file diff --git a/core/protected/extensions/umber/assets/modal/_modal_overlay_shared.scss b/core/protected/extensions/umber/assets/modal/_modal_overlay_shared.scss deleted file mode 100755 index 28bbf7c3..00000000 --- a/core/protected/extensions/umber/assets/modal/_modal_overlay_shared.scss +++ /dev/null @@ -1,439 +0,0 @@ -// Shared styles used by modals and overlays -.webstore-modal-overlay { - button, textarea { - @include border-radius(0); - //MO - text-transform:none; - } - - //webstore Montreal override see .webstore-modal * in _basic_modal.scss - * { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - } - - input[type="submit"] { - outline: none; - } - - button, .button, input[type="button"], .button:focus, input[type="button"]:focus { - @include transition-property(background-color,color); - @include transition-duration(.3s); - - font-size: 1.25rem; - font-weight: $webstore-modal-header-font-weight; - - padding: $modal-padding 0; - background: $calltoaction-color; - width: 100%; - border: none; - color: #fff; - float: left; - @include border-radius(0); - text-decoration: none; - text-align: center; - - &:hover { - background-color: darken($calltoaction-color,10%); - } - &:focus { - outline: none; - } - - &.inline { - font-family: $webstore-modal-font; - float: none; - width: auto; - padding: 11px 14px; - margin-left: -1px; - font-size: .9375rem; - } - - &.inset { - @include transition-property(background-color, color, border-color); - @include transition-duration(.3s); - - background: none; - border: 1px solid rgba(0,0,0,.1); - @include border-radius(0); - text-transform: uppercase; - color: #bbb; - padding: 7px 6px; - width: auto; - font-size: .7rem; - font-weight: 600; - line-height: 1; - position: absolute; - right: 18px; - top: 21px; - - &:hover { - border-color: $calltoaction-color; - color: #fff; - background: $calltoaction-color; - } - } - } - - table { - width: 100%; - - th, td { - font-size: 1rem; - } - .money { - text-align: right; - } - } - - .field-container { - position: relative; - - &:before, &:after { - content: " "; /* 1 */ - display: table; /* 2 */ - } - &:after { clear: both; } - - p.hint { - line-height: 2rem; - color: #888; - font-size: 1rem; - position: absolute; - right: 20px; - top: 20px; - z-index: 1; - pointer-events:none; - - @include transition-property(opacity); - @include transition-duration(.2s); - - strong { - padding: 3px; - text-transform: uppercase; - color: #bbb; - font-size: .875rem; - font-weight: normal; - } - - &.show { - opacity: 0; - } - } - - label.placeheld { - opacity: 0; - z-index: 1; - position: absolute; - visibility: hidden; - top: 24px; - left: 20px; - transition: all 0.1s linear; - color: #aaa; - font-size: .875rem; - - &.show, &.locked { - visibility: visible; - top: 12px; - opacity:1; - } - } - - input { height: 4.25rem; } - - input{ - transition: all 0.1s linear; - - padding: .75em 20px; - box-shadow: none; - font-size: 1.25rem; - width: 100%; - //MO - @include border-radius(0); - border: 1px solid #ddd; - - &.show { - padding: 1.25em 20px .25em; - } - - &:focus { - background-color: #f8f8f8; - outline: none; - box-shadow: inset 0 1px 1px rgba(0,0,0,.1); - } - } - - select { - transition: all 0.1s linear; - border: none; - margin: 0; - font: 1.5rem $default-font-family; - @include border-radius(0); - padding: .9375em 20px; - box-shadow: none; - width: 100%; - background: none; - color: #bbb; - -webkit-appearance: none; - -moz-appearance:none; - -ms-appearance:none; - appearance:none; - - &.show { - color: #333; - padding: 1.25em 20px .5em; - } - - - &:focus { - background-color: #f8f8f8; - outline: none; - } - } - - &.field-container-nobottomborder { - input, input:focus { - border-bottom: none !important; - } - } - &.field-container-notopborder { - input { - border-top: none; - } - } - } - - - - .flippable { - height: 68px; - margin: 0 auto; - @include perspective(600px); - - .side { - top: 0; - right: 0; - left: 0; - overflow: hidden; - height: inherit; - position: absolute; - - @include transform(rotateX(-180deg)); - @include transform-style(preserve-3d); - @include backface-visibility(hidden); - /* -- transition is the magic sauce for animation -- */ - @include transition(all 0.4s ease-in-out); - - p { - //MO bootstrap override - margin: 13px 0; - } - - } - - .front { - z-index: 900; - @include transform(rotateX(0deg) rotateY(0deg)); - @include transform-style(preserve-3d); - @include backface-visibility(hidden); - /* -- transition is the magic sauce for animation -- */ - @include transition(all .4s ease-in-out); - } - .back { - z-index: 800; - @include transform(rotateX(-180deg)); - @include transform-style(preserve-3d); - @include backface-visibility(hidden); - /* -- transition is the magic sauce for animation -- */ - @include transition(all .4s ease-in-out); - } - - &.flip { - .front { - z-index: 900; - @include transform(rotateX(180deg)); - } - .back { - z-index: 1000; - @include transform(rotateX(0deg) rotateY(0deg)); - } - } - } - - .form-error { - border-top: 3px solid $error-color; - padding: 12px 15px; - background-color: #FFF2F2; - border-bottom: 1px solid #ddd; - margin: -.5em 0 1em; - - p { - - color: $error-color; - font-size: .8125rem; - line-height: 1.5; - } - } - - .success .form-error{ - border-top: 1px solid #ddd; - border-right: 1px solid #ddd; - border-left: 1px solid #ddd; - padding: 12px 20px; - background-color: $success-color; - border-bottom: 1px solid #ddd; - margin: -0.5em 0 1em; - - p { - margin: 0; - color: #666; - font-size: .85rem; - } - } - - form.error { - input { - &::-webkit-input-placeholder { - color: #aaa; - @include transition-property(color); - @include transition-duration(1s); - } - &:-moz-placeholder { - color: #aaa; - @include transition-property(color); - @include transition-duration(1s); - } - &::-moz-placeholder { - color: #aaa; - @include transition-property(color); - @include transition-duration(1s); - } - &:-ms-input-placeholder { - color: #aaa; - @include transition-property(color); - @include transition-duration(1s); - } - - &.error, &:invalid, { - box-shadow: none; - color: #B4282E; - - &::-webkit-input-placeholder { color: #B4282E; } - &:-moz-placeholder { color: #B4282E; } - &::-moz-placeholder { color: #B4282E; } - &:-ms-input-placeholder { color: #B4282E; } - &:focus { color: inherit; } - } - } - - .field-container { - .required { - position: absolute; - top: 26px; - right: 20px; - - font-weight: bold; - text-transform: uppercase; - color: $error-color; - font-size: .75rem; - } - &.password .required { - right: 160px; - } - } - .field-container-password .required { - right: 160px; - } - } - -} - -#confirm h4 { - margin: .5em 0 .25em; -} - - -.steps { - display: none; - @include clearfix(); - background-color: #f8f8f8; - border-bottom: 1px solid #ddd; - margin: -15px -30px 15px; - padding: 0; - @include media(verysmall) { - display: block; - } - - - li { - position: relative; - width: 33.3%; - height: 40px; - - float: left; - - color: #777; - font-size: .8375rem; - font-weight: bold; - line-height: 40px; - text-transform: uppercase; - - text-align: center; - border-right: 1px solid #ddd; - - &:last-child { border-right: none; } - - &.completed { - color: #aaa; - - //MO .webstore-label previously .label refractored to avoid boostrap conflict. - .webstore-label { - position: relative; - width: 28px; - display: inline-block; - height: 18px; - - &:before { - - @extend %icon-prereqs; - @extend %icon-check-mark; - - position: absolute; - top: 2px; - left: 0; - height: 20px; - width: 20px; - - display: inline-block; - color: #ccc; - line-height: 18px; - @include border-radius(20px); - border: 2px solid #ccc; - text-align: center; - } - } - } - &.current { - background-color: #eee; - color: #000; - } - } -} - -//MO temporary fix -p.hint{ - margin:13.4px 0; -} -.controls a{ - font-size: .75rem; -// TODO:remove this; - max-width: 43px; -} - -//confirmation quantity on focus -.webstore-overlay input, .webstore-overlay input:focus { - border: solid 1px #ddd; - background-color: initial; -} \ No newline at end of file diff --git a/core/protected/extensions/umber/assets/modal/_overlay.scss b/core/protected/extensions/umber/assets/modal/_overlay.scss deleted file mode 100755 index 8dc51039..00000000 --- a/core/protected/extensions/umber/assets/modal/_overlay.scss +++ /dev/null @@ -1,325 +0,0 @@ -body.overlay { - background-color: #eee; -} - -.editcartmodal{ - @include media(medium) { - &:before { - content: ''; - display: inline-block; - //breaking on certain browser widths - height: 5%; - vertical-align: middle; - margin-right: -0.25em; /* Adjusts for spacing */ - } - } - } -.webstore-modal-cart-confirm{ - @include media(medium) { - &:before { - content: ''; - display: inline-block; - //breaking on certain browser widths - height: 85%; - vertical-align: middle; - margin-right: -0.25em; /* Adjusts for spacing */ - } - } -} -.webstore-overlay { - height: 100%; - position: absolute; - padding: 0; - z-index: 2; - - top: 0; - bottom: 0; - left: 0; - right: 0; - font-family: $webstore-modal-font; - - .field-container { - input { - border: 1px solid #ddd; - } - } - - .section-inner { - background-color: #fff; - padding: 15px 20px 20px; - border-top: 1px solid #ccc; - border-bottom: 1px solid #ccc; - - @media(min-width:640px) { - padding: 15px 30px 30px; - border: 1px solid #ccc; - } - } - - .section-inner.jumper { - text-align: center; - margin-top: 50px; - } - - section { - box-shadow: none; - display: inline-block; - vertical-align: middle; - width: 100%; - max-width: 840px; - margin: 0 auto; - text-align: left; - - & > header { - padding: 0 10px; - overflow: hidden; - position: relative; - - @include media(small) { - padding: 0 30px; - border-bottom: none; - button.exit, a.exit{ - margin-right: 30px; - } - } - - @include media(cartwidth) { - padding: 0; - button.exit, a.exit{ - margin-right: 0; - } - } - - h1, .exit { - margin: .75rem 0; - display: inline-block; - float: left; - line-height: 1.5rem; - } - - h1 { - font-size: 1.125rem; - width: 50%; - font-weight: bold; - - a { - text-decoration: none; - color: #555; - } - - img + span { display: none; } - - img { - max-height: 80px; - max-width: 100%; - } - } - - .exit { - color: #777; - //MO - padding: 0; - background:none; - border-bottom: 1px dotted #ccc; - text-align: right; - font-size: .8375rem; - text-decoration: none; - display: none; - position: absolute; - right: 0; - bottom: 0; - - &:hover { border-bottom: 1px solid #777; } - - @media(min-width:640px) { - display: block; - width: auto; - } - } - - .logo-placement{ - outline: none; - img{ - outline: none; - } - } - } - - footer { - padding: 0; - - &.submit input{ - float: none; - } - - img { margin: 0 3px 0 0; } - - &.submit input{ float:none; } - p { - margin: 3rem 0 1rem; - text-align: center; - font-size: 12px; - line-height: 16px; - color: #999; - } - strong { - color: #777; - font-size: 13px; - } - a { color: #999; } - } - } - - h1 { - font-size: 1.35rem; - margin: 0 0 .75em; - //MO - font-weight: bold; - - @include media(small) { - margin: .5em 0 .75em; - font-size: 1.75rem; - } - } - - &.show { background-color: #fff; } - - header.webstore-brand { - border-bottom: 1px solid #ccc; - background: #eee; - padding: 10px; - - @include media(small) { padding: 10px 30px; } - - h3 { - font: normal 1rem $webstore-modal-header-font-family; - font-weight: $webstore-modal-header-font-weight; - text-transform: uppercase; - color: #666; - text-align: left; - margin: 0 auto; - max-width: 1000px; - - } - } - - header { - padding: none; - background: none; - padding: 0 8px; - border: none; - - @include media(small) { - padding-right: 30px; - padding-left: 30px; - } - - h1 { - font: normal 2.25rem $webstore-modal-header-font-family; - font-weight: $webstore-modal-header-font-weight; - margin: .5em 0 .35em; - text-transform: none; - color: #555; - } - } - - .field-container { - label.placeheld { - font-size: .8375rem; - } - input { - height: 4.25rem; - &.show { - } - - } - } - - footer button.continue, footer button.continue:focus{ - display: block; - background: none; - border: 1px solid #999; - color: #999; - font-size: 1.125rem; - margin-botom:0; - @include transition-property(border); - @include transition-duration(0.3s); - margin-top: 25px; - margin-bottom: 30px; - } - section>footer{ - padding: 15px 20px 20px!important; - } - @include media(small){ - footer button.continue{ - display:none; - } - - } -} - -.webstore-overlay-narrow { - section { max-width: 480px; } -} -.webstore-overlay-aside { - $section-sidebar-width: 240px; - $section-content-width: 480px; - - @include media(small) { - section { max-width: $section-sidebar-width + $section-content-width; } - } - - .section-inner { - padding: 0; - margin-bottom: 30px; - @include clearfix(); - - @include media(small) { - - @include flexbox(); - @include direction(row); - - .section-content, .section-sidebar { - -webkit-flex: 1 1 auto; - flex: 1 1 auto; - } - } - - .section-content { - @extend %clearfix; - padding: 15px; - - @include media(small) { - width: $section-content-width; - padding-left: 30px; - padding-right: 30px; - &.full { - width: auto; - } - } - - } - .section-sidebar { - background: #f8f8f8; - - @include media(small) { - border-top: none; - background: none; - width: $section-sidebar-width - 1px; - padding: 0; - margin-left: -1px; - border-left: 1px solid #ccc; - } - } - } -} - -@media(max-width: 640px){ - .mobile-hide{ - display:none; - } -} - - - - diff --git a/core/protected/extensions/umber/assets/modal/_override_legacy.scss b/core/protected/extensions/umber/assets/modal/_override_legacy.scss deleted file mode 100644 index 7ec36f9a..00000000 --- a/core/protected/extensions/umber/assets/modal/_override_legacy.scss +++ /dev/null @@ -1,196 +0,0 @@ -body{ - color: rgb(0, 0, 0); -} - -//override light.css, style.css, base.css -//bootstrap.css -a, a:hover, a:focus, a:visited, a * { - outline: none; -} - -.webstore-overlay{ - line-height:normal; - body{ - line-height:normal; - } - //override: base.css l.119 - p { - margin-bottom:0px; - } - .button, button, input[type="submit"], input[type="reset"], input[type="button"]{ - text-shadow:none; - } - - h3 { - display: block; - -webkit-margin-before: 1em; - -webkit-margin-after: 1em; - -webkit-margin-start: 0px; - -webkit-margin-end: 0px; - -moz-margin-before: 1em; - -moz-margin-after: 1em; - -moz-margin-start: 0px; - -moz-margin-end: 0px; - margin-before: 1em; - margin-after: 1em; - margin-start: 0px; - margin-end: 0px; - font-weight: bold; - line-height: normal; - font-size: 19px; - } - h1, h2, h3, h4, h5, h6{ - font-family: "Open Sans", "Helvetica Neue", Helvetica, sans-serif; - font-weight: bold; - } - button, input, select, textarea { - vertical-align: baseline; - } - h1 { - line-height: inherit; - } - li { - margin-bottom:0; - } - .button, - button, - input[type="submit"], - input[type="reset"], - input[type="button"] { - font-family:inherit; - text-transform: none; - margin-bottom: 0; - } - - //override bootstrap:1518 - input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, select:focus:required:invalid:focus{ - border-color:#ddd; - -webkit-box-shadow:none; - -moz-box-shadow:none; - box-shadow:none; - } - //override bootstrap:1511 - input:focus:required:invalid, textarea:focus:required:invalid, select:focus:required:invalid{ - color:#000000; - border-color:#ddd; - } - - input:focus { - outline: -webkit-focus-ring-color auto 5px; - } - - select, input[type="text"], input[type="password"], input[type="email"],input[type="text"]:focus, - input[type="password"]:focus, input[type="email"]:focus { - width: 100%; - background-color: transparent; - line-height: normal; - max-width: none; - } - - select, textarea, input[type="text"], input[type="password"], input[type="datetime"], input[type="datetime-local"], - input[type="date"], input[type="month"], input[type="time"], input[type="week"], input[type="number"], - input[type="email"], input[type="url"], input[type="search"], input[type="tel"], input[type="color"], - .uneditable-input{ - @include border-radius(0); - line-height:normal; - } - - @media only screen and (max-width: 960px){ - select, input[type="text"], input[type="password"], input[type="email"], input[type="text"]:focus, input[type="password"]:focus, input[type="email"]:focus { - max-width: none; - } - } - - input[type=submit] { - margin-top: 0; - } - - //override light l.154, l.141 height auto height 30px - .submit-small{ - .button:focus, input[type="button"]:focus { - //MO - min-height:50px; - } - } - - //override base.css l.350 - form{ - margin-bottom: 0; - } - - section footer.submit p { - display: block; - -webkit-margin-before: 1em; - -webkit-margin-after: 1em; - -webkit-margin-start: 0px; - -webkit-margin-end: 0px; - } -} - -.overlay{ - #checkout input[type="text"], #checkout input[type="password"], - #checkout input[type="email"], #checkout input[type="select"], - #checkout input[type="text"]:focus, #checkout input[type="password"]:focus, - #checkout input[type="email"]:focus, #checkout input[type="select"]:focus { -// border: 1px solid #ddd; - } - #checkout label{ - text-transform: none; - } -} - - -.webstore-modal{ - select{ - font-size: 11px; - height: 18px; - line-height: normal; - } - - //override style.css l.27 and bootstrap. - input[type="radio"] { - width: initial; - height: initial; - } - - //bootstrap override - .radio input[type="radio"], .checkbox input[type="checkbox"] { - margin-left:0; - } - - .webstore-checkout .choices .button:focus { - height:46px; - } - - button, input, select, textarea{ - vertical-align:baseline; - } - - //override light.css - input[type=button], input[type=submit], button, label{ - text-transform:none; - } - - //override style.css - select, input[type="text"], input[type="password"], input[type="email"] { - max-width: none; - } - - //override base.css - - //l.119 - p{ margin-bottom: 0; } - - //l.265 - .button, button, input[type="submit"], input[type="reset"], input[type="button"] { - margin-bottom: initial; - } - //l.350 - form{ - margin-bottom: initial; - } - - /* JPickard - added this because in base.css: #shoppingcart {text-transform: uppercase} */ - text-transform: none; -} - diff --git a/core/protected/extensions/umber/assets/modal/_overview.scss b/core/protected/extensions/umber/assets/modal/_overview.scss deleted file mode 100644 index 165577c4..00000000 --- a/core/protected/extensions/umber/assets/modal/_overview.scss +++ /dev/null @@ -1,177 +0,0 @@ -.address-blocks { - @include transition(opacity .5s); - height: auto; - opacity: 1; - &.flipped { - height: 0; - opacity: 0; - overflow: hidden; - } -} - -.address-new { - position: relative; - footer { - max-width: 200px; - .button { - padding: 10px 0; - } - } - .select-options { - font-size: .9rem; - color: #888; - label.checkbox { - padding-bottom: 5px; - display: block; - padding-right: 10px; - @include media(medium) { - display: inline-block; - padding-bottom: 0; - } - &:last-child { - padding-right: 0; - } - } - } - .address-form { - max-width: 420px; - .submit-small .button { - font-size: .9rem; - } - ol { - padding-left: 0; - li { - list-style: none; - } - } - } - @include transition(opacity .5s); - height: 0; - opacity: 0; - overflow: hidden; - &.flipped { - height: auto; - opacity: 1; - } -} -.account-address { - .address-block { - width: 100%; - margin-right: 0; - margin-bottom: 30px; - display: inline-block; - vertical-align: top; - p:before { - display: none; - } - @include media(medium) { - width: 47%; - margin-right: 4%; - &:last-child { - margin-right: 0; - } - } - } -} - -.order-history { - table { - border-collapse: collapse; - color: #444; - - th, td { - text-align: left; - } - tr { - @include transition(color .1s, border .1s, background .1s); - &:hover { - cursor: pointer; - background-color: #f8f8f8; - } - } - - &.lines { - a { color: #555; } - td { - padding: 10px 0; - font-size: 0.875rem; - &.date { - color: $blue; - font-weight: bold; - } - &.num { - font-weight: bold; - } - } - tr td:first-child, tr th:first-child { - padding-left: 8px; - @include media(small) { - padding-left: 10px; - } - } - tr td:last-child, tr th:last-child { - padding-right: 8px; - @include media(small) { - padding-right: 10px; - } - } - tbody { - border-top: 1px solid #eee; - } - td { border-bottom: 1px solid #eee; } - } - - - } - .subtotal { - text-align: right; - } - -} - -//MO added the .add .small class to support links with button like look-n-feel -button.small, .add .small { - float: none; - padding: 9px 12px; - margin-bottom: 30px; - width: auto; - display: inline-block; - vertical-align: top; - font-size: .8rem; -} - -.modify { - font-size: .8rem; - padding-left: 0; - list-style: none; - li { - display: inline; - margin-right: 20px; - &:last-child { - margin-right: 0; - } - } - a { - text-decoration: none; - border-bottom: 1px solid #fff; - padding-bottom: 1px; - - &:hover { - border-bottom-color: $blue; - } - } -} - -.customer p { - font-size: 1.1em; - strong { - font-size: 1.2em; - } -} - -.customerorder p { - font-size: .75em; - strong { - font-size: 1.2em; - } -} diff --git a/core/protected/extensions/umber/assets/modal/_print.scss b/core/protected/extensions/umber/assets/modal/_print.scss deleted file mode 100644 index 7d656c3f..00000000 --- a/core/protected/extensions/umber/assets/modal/_print.scss +++ /dev/null @@ -1,31 +0,0 @@ -@media print { - - body.overlay { - background: none; - } - .webstore-overlay { - section { - border: none; - width: 100%; - max-width: 100%; - - header { - padding: 0 15px; - - .exit { display: none; } - } - footer { display: none; } - } - .section-inner { - border: none; - - .section-content { - padding: 0 15px; - } - - } - } - - .controls { display: none; } - .thankyou { display: none; } -} diff --git a/core/protected/extensions/umber/assets/modal/_promo.scss b/core/protected/extensions/umber/assets/modal/_promo.scss deleted file mode 100644 index 8dde2168..00000000 --- a/core/protected/extensions/umber/assets/modal/_promo.scss +++ /dev/null @@ -1,109 +0,0 @@ -.promo { - min-width: 16rem; - position: relative; - - @media(min-width:640px) { - float: left; - margin: 2rem 0 0; - } - - input, input[type="text"],input:focus,input[type="text"]:focus { - font-size: .875rem; - width: 100%; - padding: 10px; - border: none; - border-bottom: 1px solid #ddd; - box-shadow: none; - padding-right: 64px; - - @media (min-width: 640px) { - border: 1px solid #ddd; - } - } - - button.inset { - right: 8px; - top: 7px; - opacity: 1; - @include transition(opacity .3s); - - @include media(small) { - opacity: 0; - } - - &:hover, &:active { - color: #fff; - border-color: $blue; - background-color: $calltoaction-color; - } - } - - .form-error { - clear: both; - padding: 10px 10px; - border-top: none; - border-bottom: 3px solid $red; - margin-bottom: 0; - width: 100%; - - p { - font-weight: bold; - color: $red; - padding: 0; - line-height: 1.3; - } - } - - .description { - display: none; - - padding: 0; - margin: .25em 0 0; - - color: #aaa; - font-size: .75rem; - @media(min-width:640px) { display: block; } - - } - - &:hover button { opacity: 1; } -} - -//MO -//add to cart view promo code -#addcart { - .promo{ - input[type="text"]{ - border-top: $input-border; - width:100%; - padding-right:90px; - padding-left:20px; - height:46px; - &:focus{ - box-shadow: inset 1px 1px 3px #ccc; - background-color: #f8f8f8; - outline: none; - } - } - button.inset { - right:20px; - top:9.5px; - } - } -} - -#confirm, .editcartmodal{ - .promo{ - //MO not working for order_summary - width:100%; - @media (min-width: 640px) { - width: 256px; - } - } - -} - -#Checkout_promoCode,#EditCart_promoCode{ - background-color:#fff; -} - diff --git a/core/protected/extensions/umber/assets/modal/_spinner.scss b/core/protected/extensions/umber/assets/modal/_spinner.scss deleted file mode 100755 index 129eaabe..00000000 --- a/core/protected/extensions/umber/assets/modal/_spinner.scss +++ /dev/null @@ -1,104 +0,0 @@ -/* -(cs)spinner.css - http://jh3y.github.io/-cs-spinner -Licensed under the MIT license - -Jhey Tompkins (c) 2014. - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*/ - -//(cs)spinner base variables -$height: 40px; -$width: 40px; -$border-width: 4px; -//TODO:MO conflicting with $overlay-color: #555 !default; and altering colors in cart checkout. -//$overlay-color: #999; -$base-color: #555; - -/* (cs)spinner base styling */ -.csspinner { - position: relative; -} -// .csspinner:before { -// content: ""; -// z-index: 1; -// position: absolute; -// top: 0; -// left: 0; -// display: block; -// height: 100%; -// width: 100%; -// } -.csspinner:after { - z-index: 2; - content: ""; - height: $height; - width: $width; - position: absolute; - top: 50%; - left: 50%; - margin: (-$width / 2) 0 0 (-$width / 2); - @include border-radius(100%); - border-top: $border-width solid $base-color; - - @include transition(all .75s ease 0s); - -webkit-animation: standard .75s infinite linear; - -moz-animation: standard .75s infinite linear; - -o-animation: standard .75s infinite linear; - animation: standard .75s infinite linear; -} -.csspinner.no-overlay:before { - content: none; - display: none; -} - -/* (cs)spinner traditional spinner. -Makes use of standard animation spin and minimally extends core.*/ -$traditional-color-one: #aaa; -$traditional-color-two: #bbb; -$traditional-color-three: #ccc; - -.csspinner:after { - border-right: $border-width solid $traditional-color-one; - border-top: $border-width solid $traditional-color-one; - border-left: $border-width solid $traditional-color-two; - border-bottom: $border-width solid $traditional-color-three; -} - -/* (cs)spinner standard rotation animation used for duo, double-up etc. */ -@-o-keyframes standard { - from { - transform: rotate(0deg); - } - to { - transform: rotate(360deg); - } -} -@-webkit-keyframes standard { - from { - -webkit-transform: rotate(0deg); - } - to { - -webkit-transform: rotate(360deg); - } -} -@-moz-keyframes standard { - from { - transform: rotate(0deg); - } - to { - transform: rotate(360deg); - } -} -@keyframes standard { - from { - transform: rotate(0deg); - } - to { - transform: rotate(360deg); - } -} diff --git a/core/protected/extensions/umber/assets/modal/_tooltip b/core/protected/extensions/umber/assets/modal/_tooltip deleted file mode 100644 index bc33d847..00000000 --- a/core/protected/extensions/umber/assets/modal/_tooltip +++ /dev/null @@ -1,34 +0,0 @@ -// TODO: add error message in tooltip when item quantity is not available. -.alert-tooltip { - position: absolute; - width: 200px; - background: rgb(255, 255, 204); - border: 1px solid rgb(102, 102, 102); - color: rgb(102, 102, 102); - font-size: 12px; - line-height: 1.3; - padding:5px 2px 0; - z-index: 10; -} -.alert-tooltip:after { - content: ""; - position: absolute; - width: 0; - height: 0; - border-width: 10px; - border-style: solid; - border-color: #FFFFCC transparent transparent transparent ; - top: 100%; - left: 50%; -} -.alert-tooltip:before { - content: ""; - position: absolute; - width: 0; - height: 0; - border-width: 12px; - border-style: solid; - border-color: rgb(102, 102, 102) transparent transparent transparent ; - top: 100%; - left: 49%; -} \ No newline at end of file diff --git a/core/protected/extensions/umber/assets/modal/_wishlist.scss b/core/protected/extensions/umber/assets/modal/_wishlist.scss deleted file mode 100755 index b77448b0..00000000 --- a/core/protected/extensions/umber/assets/modal/_wishlist.scss +++ /dev/null @@ -1,228 +0,0 @@ -.webstore-modal-wishlist { - .search-results { - display: none; - } - - .list { - ul { - list-style: none; - padding: 0; - margin: 0; - - &:last-child { - border-bottom: none; - } - } - li { - border-bottom: 1px solid #ccc; - padding: $modal-padding*.75 $modal-padding; - background-color: #fff; - @include transition(background-color .3s,color .3s); - } - - a { - text-decoration: none; - &:hover { - li { - background-color: #f8f8f8; - } - h3 { - color: darken($calltoaction-color,10%); - } - } - } - h3 { - @include transition-property(color); - @include transition-duration(.3s); - - color: $calltoaction-color; - margin: 0; - font-weight: bold; - font-size: 1rem; - - small { - color: #999; - background-color: #eee; - padding: 2px 4px; - - margin: -3px 0 0 3px; - display: inline-block; - } - } - p { - line-height: 1.5; - font-size: .875rem; - color: #999; - margin: 0; - } - } -} - - -.wishlist-block { - p { - @include transition(color .1s, border .1s, background .1s); - position: relative; - margin: 0; - padding: 10px 2px 10px 10px; - border: 1px solid #ddd; - color: #999; - font-size: .75rem; - min-height: 80px; - line-height: 1.5; - span.title { - color: $blue; - font-weight: bold; - font-size: 1rem; - } - span.date { - display: block; - color: #aaa; - font-size: .7rem; - } - a { - font-weight: bold; - font-size: 1rem; - } - - &:hover { - color: #FFF; - cursor: pointer; - span { - color: #FFF; - } - p { - color: #FFF; - a { - color: #FFF; - } - } - border-color: $blue; - background-color: $blue; - } - - &.private, &.public, &.personal { - &:after { - font-size: .75rem; - color: #888; - border: 1px solid #ccc; - background-color: #eee; - position: absolute; - top: 10px; - padding: 3px 6px 2px; - right: -10px; - text-transform: uppercase; - - } - } - &.private { - &:after { - content: "Private"; - } - } - &.public { - &:after { - content: "Public"; - } - } - &.personal { - &:after { - content: "Personal"; - } - } - } -} - -.lines-footer { - &.purchased { - @include transition(opacity .3s); - opacity: 0; - overflow: hidden; - height: 0; - clear: both; - &.active { - opacity: 1; - height: auto; - } - .lines { - opacity: .4; - } - } -} - -.field-container { - &.optional:after { - content: 'Optional'; - background: none repeat scroll 0 0 rgba(0, 0, 0, 0); - border: 1px solid rgba(0, 0, 0, 0.1); - @include border-radius(0); - color: #bbb; - font-size: 0.7rem; - font-weight: 600; - line-height: 1; - padding: 7px 6px; - position: absolute; - right: 18px; - text-transform: uppercase; - top: 21px; - transition-duration: 0.3s; - transition-property: background-color, color, border-color; - width: auto; - } - button{ - color: #999; - } -} - - -.webstore-modal .radio-box { - border-bottom: 1px solid #ddd; - li { - label { - float:left; - width: 32.75%; - border-left: 1px solid #DDD; - border-right: 1px solid #DDD; - display: inline-block; - margin-bottom: 0; - @include transition-property(background-color,color); - @include transition-duration(.2s); - - &:first-child { - border-right: 0; - } - &:last-child { - border-left: 0; - } - &.active { - background-color: #e8e8e8; - border-color: #DDD; - } - &:first-child { - border-left: 0; - } - &:last-child { - width: 34.25%; - border-right: 0; - } - &:hover { - box-shadow: inset 0 10px 20px -20px rgba(0, 0, 0, 0.9); - background-color: #DDD; - border-color: #DDD; - } - color: #666; - font-size: 1rem; - font-weight: bold; - span { - font-weight: normal; - color: #888; - font-size: .75rem; - display: block; - } - &:hover { - color: $calltoaction-color; - cursor: pointer; - } - } - } -} diff --git a/core/protected/extensions/umber/assets/modal/_wishlist_view.scss b/core/protected/extensions/umber/assets/modal/_wishlist_view.scss deleted file mode 100644 index 3838ac1e..00000000 --- a/core/protected/extensions/umber/assets/modal/_wishlist_view.scss +++ /dev/null @@ -1,256 +0,0 @@ -.webstore-wishlist-view { - .section-content { position: relative; } - - .wishlist-description { - padding: 0 0 10px; - max-width: 400px; - } - - .wishlist-date { - position: relative; - margin: 0; - padding: 10px; - - color: #666; - font-size: .9375rem; - border: 1px solid #ccc; - - @include media(small) { - position: absolute; - right: 30px; - top: 30px; - } - } - - h1 { - small { - font-size: .75rem; - color: #888; - border: 1px solid #ccc; - background-color: #f8f8f8; - padding: 3px 6px 2px; - margin-left: 10px; - text-transform: uppercase; - } - } -} - -$share-block-height: 70px; - -.wishlist-share { - @extend %clearfix; - margin: 30px 0; - border: 1px solid #ddd; - height: $share-block-height; - - h3 { - line-height: $share-block-height - 2px; - color: #666; - padding: 0 20px; - margin: 0; - display: inline-block; - - float: left; - } - - a { - display: inline-block; - line-height: $share-block-height - 2px; - float: left; - color: #666; - - &.url { - display: none; - width: 50%; - overflow: hidden; - padding: 20px 10px 0; - line-height: 1.2; - font-size: .75rem; - word-wrap: break-word; - color: #888; - - @include media(medium) { - display: inline-block; - } - } - - &.service { - font-size: 0; - line-height: 1; - padding: 0 15px; - text-align: center; - float: right; - color: $blue; - - &:before { - font-family: FontAwesome; - font-size: 1.5rem; - line-height: $share-block-height - 2px; - } - &:hover {color: darken($blue,10%); } - - &.email:before { content: '\f003'; } - &.twitter:before { content: '\f099'; } - &.facebook:before { content: '\f09a'; } - } - } -} - -.wishlist-buttons { - @extend %clearfix; - - button { - border: 1px solid #ccc; - background: #fff; - color: #999; - width: auto; - padding: 20px; - margin-bottom: 20px; - - - &:hover { - color: $blue; - border-color: $blue; - background: #fff; - } - } - .wishlist-settings { - float: right; - display: none; - } -} - -.wishlist-lines { - thead { - th { - border-bottom: 1px solid #ccc; - color: #999; - text-transform: uppercase; - font-size: .875rem; - font-weight: normal; - } - } -} - - -.webstore-wishlist-view { - td.description { - .item-note { - color: #aaa; - display: block; - font-size: .8125rem; - font-weight: normal; - } - textarea { - display: none; - margin-top: 3px; - padding: 5px; - width: 100%; - border: 1px solid #ddd; - } - } - - td.priority { - .label { - color: #888; - text-transform: uppercase; - font-size: .8125rem; - } - select { display: none; } - } - - - - .purchased { - display: none; - } -} - -.wishlist-lines { - .controls { - white-space: nowrap; - a { float: none; } - } - - .edit, .save, .add-to-cart { - padding: 6px 8px 5px; - display: inline-block; - line-height: 1; - font-size: .75rem; - white-space: nowrap; - float: none; - - background-color: $blue; - border: 1px solid $blue; - color: #fff; - - @include transition(background-color .3s, color .3s, border-color .3s); - - &:hover { - border-color: darken($blue,10%); - background-color: darken($blue,10%); - } - } - - .save { display: none; } - .edit { - border-color: #ccc; - color: #999; - background: none; - margin-right: 6px; - - &:hover { - background: none; - border-color: $blue; - color: $blue; - } - } - - .in-cart { - .add-to-cart { - color: #999; - border-color: transparent; - background: transparent; - - } - } - - tr.active { - td.description { - padding-top: 10px; - padding-bottom: 10px; - - textarea { display: block; } - .item-note { display: none; } - } - - td.priority { - // span { display: block; } - .custom-select { display: block; } - } - td.controls { - a.save { display: inline-block; } - a.remove { - display: inline-block; - margin-left: 25px; - margin-top: -1px; - } - a.add-to-cart { display: none; } - a.save, a.remove { float: left; } - } - } -} - - -.webstore-wishlist-owner { - button.wishlist-settings { display: block; } - button.wishlist-purchases { display: none; } - .purchased { display: block; } - .wishlist-lines { - a.edit { display: inline-block; } - } - td.priority { - .label { display: none; } - select { display: block; } - } -} \ No newline at end of file diff --git a/core/protected/extensions/umber/assets/modal/modal.scss b/core/protected/extensions/umber/assets/modal/modal.scss deleted file mode 100755 index 9bea695c..00000000 --- a/core/protected/extensions/umber/assets/modal/modal.scss +++ /dev/null @@ -1,108 +0,0 @@ -@import "../mixins/arrows"; -@import "../mixins/borders"; -@import "../mixins/flexbox"; -@import "../mixins/transitions"; -@import "../mixins/animations"; -@import "../lib/normalize"; -@import "override_legacy"; -@import "browsers_unistyle"; -@import "config"; -@import 'icons'; - -#modal-trigger { - position: absolute; - right: 30px; - top: 20px; - padding: 10px 20px; - color: #fff; - font: .875rem $webstore-modal-font; - z-index: 1; - - background-color: #999; - text-transform: uppercase; - &:hover { cursor: pointer; } -} - -#wrapper { - width: 100%; - height: 100%; - text-align: center; -} - -@import 'basic_modal'; -@import 'modal_overlay_shared'; -@import 'overlay'; -@import 'cart'; -@import 'cartadd'; -@import 'wishlist'; -@import 'promo'; -@import 'tooltip'; -@import 'estimator'; -@import 'animations'; -@import 'spinner'; -@import 'checkout'; -@import 'overview'; -@import 'lines'; -@import 'wishlist_view'; - -@import 'print'; - -main.verification { - padding: 1px $modal-padding; - - p { - font-size: 1.125rem; - line-height: 1.5; - color: #666; - } - strong { - color: $calltoaction-color; - } -} -.webstore-overlay{ - @media (max-width: 640px){ - //MO hack for input zoom bug ios. http://www.ampedupdesigns.com/blog/show?bid=53 - //Do not override without finding an alternate solution. - input[type="text"], input[type="password"], input[type="phone"], input[type="email"], - input[type="tel"], textarea, .field-container-toggle a, .field-container-select select{ - font-size: 16px !important; } - } -} - - -@font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 300; - src: local('Open Sans Light'), local('OpenSans-Light'), url('//themes.googleusercontent.com/static/fonts/opensans/v6/DXI1ORHCpsQm3Vp6mXoaTXhCUOGz7vYGh680lGh-uXM.woff') format('woff'); -} - -@font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 400; - src: local('Open Sans'), local('OpenSans'), url('//themes.googleusercontent.com/static/fonts/opensans/v8/cJZKeOuBrn4kERxqtaUH3bO3LdcAZYWl9Si6vvxL-qU.woff') format('woff'); -} - -@font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 600; - src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url('//themes.googleusercontent.com/static/fonts/opensans/v8/MTP_ySUJH_bn48VBG8sNSqRDOzjiPcYnFooOUGCOsRk.woff') format('woff'); -} - -@font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 400; - src: local('Open Sans'), local('OpenSans'), url('//themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3T8E0i7KZn-EPnyo3HZu7kw.woff') format('woff'); -} - - -th{ - font-family: "Open Sans", "Helvetica Neue", Helvetica, sans-serif; - font-weight: bold; -} - -//MO temporary -@import '../customized/brooklyn2014'; \ No newline at end of file diff --git a/core/protected/extensions/umber/assets/theme/_config.scss b/core/protected/extensions/umber/assets/theme/_config.scss deleted file mode 100755 index 676cd040..00000000 --- a/core/protected/extensions/umber/assets/theme/_config.scss +++ /dev/null @@ -1,76 +0,0 @@ -@charset "utf-8"; - -$break-mobile: 0px; // This is used in limited situations, generally styles layer-up, not down. -$break-narrow-modal: 360px; -$break-verysmall: 450px; -$break-small: 560px; -$break-medium: 720px; -$break-large: 1025px; -$break-verylarge: 1240px; - -@import 'compass'; -@import '../mixins/html5-input-types'; - -@mixin media($media) { - @if $media == 'mobile' { - @media (max-width: $break-small) { @content; } - } - @if $media == 'narrow-modal' { - @media (min-width: $break-narrow-modal) { @content; } - } - @else if $media == 'verysmall' { - @media (min-width: $break-verysmall) { @content; } - } - @else if $media == 'small' { - @media (min-width: $break-small) { @content; } - } - @else if $media == 'medium' { - @media (min-width: $break-medium) { @content; } - } - @else if $media == 'large' { - @media (min-width: $break-large) { @content; } - } - @else if $media == 'short' { - @media (max-height: $break-short) { @content; } - } - @else { - @content; - } -} - -* { - @include box-sizing(border-box); -} - -// Colors -$font-color: #000; - -$blue: #3287CC; - -// Link colors -$link-color: $blue; -$link-hover-color: darken($blue,10%); -$link-active-color: darken($blue,20%); -//$link-focus-color: false; -//$link-visited-color: false; - -a { - color: $link-color; - &:active { color: $link-active-color; } - a:hover { color: $link-hover-color; } -} - -$modal-padding: 20px; - -$modal-width: 720px; -$modal-width-narrow: 540px; - -$error-color: #B4282E; - -$calltoaction-color: $blue; - -$default-font-family: 'Open Sans', 'Helvetica Neue', Helvetica, sans-serif; - -$fa-font-path: "/fonts" !default; -$fa-css-prefix: fa !default; -$fa-version: "4.1.0" !default; diff --git a/core/protected/extensions/umber/assets/theme/_footer.scss b/core/protected/extensions/umber/assets/theme/_footer.scss deleted file mode 100755 index 9cf6ab24..00000000 --- a/core/protected/extensions/umber/assets/theme/_footer.scss +++ /dev/null @@ -1,153 +0,0 @@ -.footer { - background-color: #eee; - color: #777; - font-size: .875rem; - - h3 { - text-transform: uppercase; - color: #888; - font-size: .875rem; - margin: 0; - font-weight: 600; - margin-bottom: .5rem; - } - p, ol, ul { - margin: 0; - } -} -.footer-section { - @include clearfix(); -} - -.footer-primary { - padding: 30px 0; - - article { - width: 20.6%; - margin: 1% 0 1% 2.6%; - float: left; - word-wrap: break-word; - - p { margin-bottom: 1.25rem;} - &:first-child { - margin-left: 0; - } - &.about { - width: 34%; - } - &.nav { - width: 17%; - } - &.vcard { - table.hours { - th { - text-align: right; - padding-right: .5rem; - } - } - } - &.contact { - .phone { - font-size: 1.9rem; - margin-bottom: 0; - } - .email { - margin-bottom: 0; - } - } - } - &:last-child { - margin-right: 0; - } -} -.footer-secondary { - border-top: 1px solid #ccc; - margin-top: 30px; - padding: 15px 0; - color: #999; - font-size: .75rem; - - p, .paymentmethods { float: left; } - - .paymentmethods { - padding: 0; - float: right; - - li { display: inline-block; } - } -} - -.footer { - .page-collection { - font-size: .75rem; - - ul { - list-style: none; - padding: 0; - } - } - - .newsletter { - form { - position: relative; - max-width: 300px; - } - - input { - box-sizing: border-box; - width: 100%; - border: 1px solid #999; - background: #fff; - padding: 10px 95px 10px 10px; - } - button { - font-size: .75rem; - text-transform: uppercase; - height: 40px; - background-color: #555; - padding: 0 10px; - border: none; - color: #fff; - position: absolute; - top: 1px; - right: 0; - - &:hover { background: #666; } - } - } - - .social { - margin-top: .5rem; - - a { - font-size: 0; - - &:after { - font-size: 1.8rem; - margin-right: 2px; - } - - &.facebook:after { content: '\f082'; } - &.twitter:after { content: '\f081'; } - &.googleplus:after { content: '\f0d4'; } - &.instagram:after { content: '\f16d'; } - &.pinterest:after { content: '\f0d3'; } - &.linkedin:after { content: '\f08c'; } - } - } - - .paymentmethods { - margin-top: -10px; - position: relative; - li { - display: inline-block; - background-color: #333; - width: 45px; - height: 25px; - /* Hide the text. */ - text-indent: 100%; - white-space: nowrap; - overflow: hidden; - } - } -} diff --git a/core/protected/extensions/umber/assets/theme/_header.scss b/core/protected/extensions/umber/assets/theme/_header.scss deleted file mode 100755 index c59895ce..00000000 --- a/core/protected/extensions/umber/assets/theme/_header.scss +++ /dev/null @@ -1,89 +0,0 @@ -header { - @include background-image(linear-gradient(#ffffff, rgba(#ffffff,0))); - width: 100%; - position: fixed; - top: 0; - // left: 0; - // right: 0; - -} - -.header { - background-color: transparent; - -webkit-transition: background-color 400ms linear; - -moz-transition: background-color 400ms linear; - -o-transition: background-color 400ms linear; - -ms-transition: background-color 400ms linear; - transition: background-color 400ms linear; - &.scrolled { - background-color: #FFF; - } - padding: 2rem 0; - @include clearfix(); - .brand, .webstore-features { - display: inline-block; - } - - .brand { - width: 240px; - float: left; - - p { display: none; } - } - .webstore-features { - float: right; - } - - .brand { - img { - max-height: 50px; - } - img + h1 { - display: none; - } - - } - .webstore-features { - .pages, form { - float: right; - } - - .pages { - list-style: none; - padding: 0; - margin: 0; - - li { - display: inline-block; - line-height: 50px; - font-size: .8375rem; - } - a { - display: inline-block; - line-height: 50px; - padding: 0 10px; - } - - } - .language-choices { - display: none; - } - } - - .page-collection { - width: 100%; - @include clearfix(); - - ul { - padding: 0; - display: inline; - } - li { - display: inline; - } - a { - display: inline-block; - padding: 10px; - } - } -} diff --git a/core/protected/extensions/umber/assets/theme/_products.scss b/core/protected/extensions/umber/assets/theme/_products.scss deleted file mode 100755 index 1f92d536..00000000 --- a/core/protected/extensions/umber/assets/theme/_products.scss +++ /dev/null @@ -1,121 +0,0 @@ -.product-browser { - border-top: 1px solid #ccc; - border-bottom: 1px solid #ccc; - - .inner { - display: box; - display: flexbox; - display: -webkit-flex; - display: flex; - - -webkit-flex-flow: row; - flex-flow: row; - - // align-content: flex-start; - // @TODO - background should scale to match full-page width - // @TODO - background should maintain a minimum height - - padding: 0; - - @include media(small) { - article { - -webkit-flex: 3 1 80%; - flex: 3 1 80%; - -webkit-order: 2; - order: 2; - border-right: 1px solid #ccc; - } - - aside { - -webkit-flex: 1 6 20%; - flex: 1 6 20%; - -webkit-order: 1; - order: 1; - - padding-right: 15px; - } - } - } -} - -.product-categories { - ul { - list-style: none; - padding: 0; - } -} -.product-narrowing { - h3 { - margin: 15px 0; - background-color: #eee; - padding: 8px 12px; - text-transform: uppercase; - color: #666; - font-size: .75rem; - } - ul { - margin: 0 15px 30px; - } - li { - margin: 0 0 5px; - } -} - -.product-cards { - // @include clearfix; - list-style: none; - margin: 0 0 -1px; - padding: 0; - - display: box; - display: flexbox; - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; - display: flex; - - -webkit-flex-direction: row; - -ms-flex-direction: row; - flex-direction: row; - - -webkit-flex-wrap: wrap; - -ms-flex-wrap: wrap; - flex-wrap: wrap; -} - -.product-card { - border-bottom: 1px solid #ccc; - border-left: 1px solid #ccc; - padding: 15px; - - -webkit-box-flex: 1; - -webkit-flex-grow: 1; - -ms-flex-positive: 1; - flex-grow: 1; - -webkit-flex-basis: 0; - -ms-flex-preferred-size: 0; - flex-basis: 0; - - background-color: #fff; - - min-width: 200px; - - - -webkit-transition: width 0.7s ease-out; - transition: width 0.7s ease-out; - - - img { - width: 100%; - } - - h2, p { - margin: 0; - } - h2 { - font-size: .75rem; - } - p { - font-size: .875rem; - } -} diff --git a/core/protected/extensions/umber/assets/theme/_search.scss b/core/protected/extensions/umber/assets/theme/_search.scss deleted file mode 100755 index 48be86a4..00000000 --- a/core/protected/extensions/umber/assets/theme/_search.scss +++ /dev/null @@ -1,13 +0,0 @@ -form.search { - line-height: 50px; - input { - display: inline-block; - font-size: .8375rem; - padding: 6px 8px; - - } - - button { - display: none; - } -} diff --git a/core/protected/extensions/umber/assets/theme/basic.scss b/core/protected/extensions/umber/assets/theme/basic.scss deleted file mode 100755 index 183726d9..00000000 --- a/core/protected/extensions/umber/assets/theme/basic.scss +++ /dev/null @@ -1,59 +0,0 @@ -@import "normalize"; -@import "config"; - -@font-face { - font-family: 'FontAwesome'; - src: url('#{$fa-font-path}/fontawesome-webfont.eot?v=#{$fa-version}'); - src: url('#{$fa-font-path}/fontawesome-webfont.eot?#iefix&v=#{$fa-version}') format('embedded-opentype'), - url('#{$fa-font-path}/fontawesome-webfont.woff?v=#{$fa-version}') format('woff'), - url('#{$fa-font-path}/fontawesome-webfont.ttf?v=#{$fa-version}') format('truetype'), - url('#{$fa-font-path}/fontawesome-webfont.svg?v=#{$fa-version}#fontawesomeregular') format('svg'); - //src: url('#{$fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts - font-weight: normal; - font-style: normal; -} - -body { - font-family: $default-font-family; -} - -.features { - height: 640px; - background-image: url(/images/backgrounds/trail.jpg); - background-repeat: no-repeat; - background-size: cover; - -} - - -a { - text-decoration: none; - color: $link-color; -} - -.header, .footer, .wrapper { - // flex: 1 100%; - .inner { - max-width: 1024px; - padding: 0 30px; - margin: 0 auto; - - } -} - - -.icon:after { - font-family: 'FontAwesome'; - content: ''; - font-style: normal; - font-weight: normal; - line-height: 1; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - - -@import 'header'; -@import 'footer'; -@import 'search'; -@import 'products'; diff --git a/core/protected/extensions/umber/assets/wsmodal.js b/core/protected/extensions/umber/assets/wsmodal.js index b6e85537..3496d4fa 100644 --- a/core/protected/extensions/umber/assets/wsmodal.js +++ b/core/protected/extensions/umber/assets/wsmodal.js @@ -1,6 +1,7 @@ 'use strict'; /* globals $:false, History:false */ /* exported showEditCartModal */ + function sleep(millis, callback) { setTimeout(function() { callback(); }, @@ -62,7 +63,7 @@ function hideModal() { * @param {string} [editCartUrl] The URL to add to the browser history. If no * URL is provided, then no URL is added to the history. */ -function showEditCartModalAndPushState(editCartUrl) { +function showEditCartModal(editCartUrl) { // Remove the body's scrollbar when opening a modal $('body').css('overflow', 'hidden'); @@ -76,30 +77,6 @@ function showEditCartModalAndPushState(editCartUrl) { $('#viewport, .btn-navbar, #menubar, #topbar, #footer').addClass('mobile-hide'); } -/** - * Show the edit cart modal. - * @param {boolean} maintainPushState Set this to true to leave the browser - * history state unmodified. Defaults to false. - * @deprecated This is left in for compatibility with Brooklyn2014 3.2.2 - * themes. Use showEditCartModalAndPushState instead. This was deprecated in - * Web Store 3.2.4 because it uses a hard-coded URL instead of going through - * Yii::app()->createUrl. - */ -function showEditCartModal(maintainPushState) { - // This warning is on purpose: we want to store owners to update their - // theme copies. - /* globals console:false */ - console.warn('showEditCartModal is deprecated. Use showEditCartModalAndPushState instead.'); - var editCartUrl = '/editcart'; - - if (maintainPushState === true) { - showEditCartModalAndPushState(); - } else { - showEditCartModalAndPushState(editCartUrl); - } -} - - function showModal() { // Remove the body's scrollbar when opening a modal $('body').css('overflow', 'hidden'); @@ -164,7 +141,7 @@ $(document).on('click', ".webstore-change-item", function() { hideModal(); var editCartUrl = $(this).data('editcarturl'); setTimeout(function(){ - showEditCartModalAndPushState(editCartUrl); + showEditCartModal(editCartUrl); }, 1125); }); @@ -184,7 +161,7 @@ $(function() { // doPushSate=true, and the second time in this callback when the // push state changes. if(State.data.key === 'editcart'){ - showEditCartModalAndPushState(); + showEditCartModal(); } else { hideModal(); diff --git a/core/protected/extensions/wscron/wscron.php b/core/protected/extensions/wscron/wscron.php index a1c7dc90..85497649 100644 --- a/core/protected/extensions/wscron/wscron.php +++ b/core/protected/extensions/wscron/wscron.php @@ -1,42 +1,47 @@ sendQueueEmails(); + // Attemp to send pending emails + $this->_sendQueueEmails(); } /** * Try sending e-mails in the queue. * + * @return void * @throws CDbException */ - public function sendQueueEmails() + private function _sendQueueEmails() { $objMails = EmailQueue::model()->findAll("`sent_attempts` < 20 and `sent_attempts` > 0 and `to` IS NOT NULL LIMIT 10"); foreach ($objMails as $objMail) { - $blnResult = _xls_send_email($objMail->id,true); + $blnResult = _xls_send_email($objMail->id, true); if (!$blnResult) { - EmailQueue::model()->updateByPk($objMail->id,array('sent_attempts'=>($objMail->sent_attempts)+1)); + EmailQueue::model()->updateByPk($objMail->id, array('sent_attempts' => ($objMail->sent_attempts) + 1)); } else { @@ -44,4 +49,4 @@ public function sendQueueEmails() } } } -} \ No newline at end of file +} diff --git a/core/protected/extensions/wslangflags/assets/flags/cze.gif b/core/protected/extensions/wslangflags/assets/flags/cs.gif similarity index 100% rename from core/protected/extensions/wslangflags/assets/flags/cze.gif rename to core/protected/extensions/wslangflags/assets/flags/cs.gif diff --git a/core/protected/extensions/wslangflags/assets/flags/jp.gif b/core/protected/extensions/wslangflags/assets/flags/ja.gif similarity index 100% rename from core/protected/extensions/wslangflags/assets/flags/jp.gif rename to core/protected/extensions/wslangflags/assets/flags/ja.gif diff --git a/core/protected/extensions/wslangflags/assets/flags/swe.gif b/core/protected/extensions/wslangflags/assets/flags/sv.gif similarity index 100% rename from core/protected/extensions/wslangflags/assets/flags/swe.gif rename to core/protected/extensions/wslangflags/assets/flags/sv.gif diff --git a/core/protected/extensions/wspayment/WsPayment.php b/core/protected/extensions/wspayment/WsPayment.php index d3a23830..e5984a56 100644 --- a/core/protected/extensions/wspayment/WsPayment.php +++ b/core/protected/extensions/wspayment/WsPayment.php @@ -64,7 +64,7 @@ public function init() * The name of the payment module that will be displayed in Web Admin payments * @return string */ - public function admin_name() + public function adminName() { if ($this->active) @@ -142,4 +142,4 @@ public function getLogLevel() } -} \ No newline at end of file +} diff --git a/core/protected/extensions/wsshipping/WsShipping.php b/core/protected/extensions/wsshipping/WsShipping.php index 453a5a15..9c40c4eb 100644 --- a/core/protected/extensions/wsshipping/WsShipping.php +++ b/core/protected/extensions/wsshipping/WsShipping.php @@ -54,7 +54,7 @@ public function init() * The name of the payment module that will be displayed in Web Admin payments * @return string */ - public function admin_name() + public function adminName() { if ($this->active) @@ -251,4 +251,4 @@ public function getLogLevel() return CLogger::LEVEL_INFO; } -} \ No newline at end of file +} diff --git a/core/protected/extensions/wsshipping/usps/usps.php b/core/protected/extensions/wsshipping/usps/usps.php index ee4d78a3..ac800696 100644 --- a/core/protected/extensions/wsshipping/usps/usps.php +++ b/core/protected/extensions/wsshipping/usps/usps.php @@ -28,10 +28,10 @@ class usps extends WsShipping //'First-Class Mail Postcards', 'Priority Mail{0}', //'Priority Mail Express{0} Hold For Pickup', - 'Priority Mail Express{0}', + 'Priority Mail Express{0}', 'Standard Post', 'Media Mail', - 'Library Mail'=>'Library Mail', + 'Library Mail' => 'Library Mail', 'Priority Mail Express{0} Flat Rate Envelope', 'First-Class Mail Large Postcards', 'Priority Mail{0} Flat Rate Envelope', @@ -50,13 +50,13 @@ class usps extends WsShipping //'Priority Mail{0} Medium Flat Rate Box Hold For Pickup', //'Priority Mail{0} Small Flat Rate Box Hold For Pickup', //'Priority Mail{0} Flat Rate Envelope Hold For Pickup', - 'Priority Mail{0} Gift Card Flat Rate Envelope', + 'Priority Mail{0} Gift Card Flat Rate Envelope', //'Priority Mail{0} Gift Card Flat Rate Envelope Hold For Pickup', 'Priority Mail{0} Window Flat Rate Envelope', //'Priority Mail{0} Window Flat Rate Envelope Hold For Pickup', - 'Priority Mail{0} Small Flat Rate Envelope', + 'Priority Mail{0} Small Flat Rate Envelope', //'Priority Mail{0} Small Flat Rate Envelope Hold For Pickup', - 'Priority Mail{0} Legal Flat Rate Envelope', + 'Priority Mail{0} Legal Flat Rate Envelope', //'Priority Mail{0} Legal Flat Rate Envelope Hold For Pickup', //'Priority Mail{0} Padded Flat Rate Envelope Hold For Pickup', 'Priority Mail{0} Regional Rate Box A', @@ -110,121 +110,59 @@ class usps extends WsShipping public function run() { - if(!isset($this->config['offerservices'])) return false; - - $weight = $this->objCart->Weight; - if(_xls_get_conf('WEIGHT_UNIT' , 'lb') != 'lb') - $weight = $weight * 2.2; // one KG is 2.2 pounds - - //USPS wants a full country name - $countryObj = Country::LoadByCode($this->CheckoutForm->shippingCountry); - if($countryObj) - $country = $countryObj->country; - else - $country = "US"; - - if (empty($country)) $country = "US"; - - if(empty($this->config['username']) || empty($this->config['originpostcode'])) - return false; - - $this->init_vars( - $this->config['username'], - $this->config['originpostcode'], - $this->CheckoutForm->shippingPostal, - $country, - $this->config['markup']); - $this->addItem(intval($weight) , round(($weight - intval($weight)) *16 , 0) , $this->objCart->total); - - $rates = $this->getRate(); - - if(($rates === FALSE) || (count($rates) == 0 )) { - Yii::log("USPS: Could not get rates. " . print_r($this , true), 'error', 'application.'.__CLASS__.".".__FUNCTION__); + if (!isset($this->config['offerservices'])) + { return false; } - return $this->convertRetToDisplay($rates); - } - - - - - /** - * total - * - * Based on passed address information, calculates the total shipping cost - * - * @param $fields &array - * @param Cart $cart - * @param $country optional - * @param $zipcode optional - * @param $state optional - * @param $city optional - * @param $address2 optional - * @param $address1 optional - * @param $company optional - * @param $lname optional - * @param $fname optional - * - * @return array - */ - public function total($fields, $cart, $country = '', $zipcode = '', $state = '', - $city = '', $address2 = '', $address1 = '', $company = '', $lname = '', $fname = '') { - -// $config = $this->config; -// -// $weight = $cart->Weight; + $weight = $this->objCart->Weight; - if(_xls_get_conf('WEIGHT_UNIT' , 'lb') != 'lb') - $weight = $this->objCart->Weight * 2.2; // one KG is 2.2 pounds + if(_xls_get_conf('WEIGHT_UNIT', 'lb') != 'lb') + { + // one KG is 2.2 pounds + $weight = $weight * 2.2; + } //USPS wants a full country name - $countryObj = Country::LoadByCode($this->CheckoutForm->shippingCountry); - if($countryObj) - $country = $countryObj->country; + $objCountry = Country::Load($this->CheckoutForm->shippingCountry); + if($objCountry instanceof Country) + { + $country = $objCountry->country; + } else + { $country = "US"; + } - if (empty($country)) $country = "US"; - - if(empty($this->config['username']) || empty($this->config['originpostcode'])) + if (empty($this->config['username']) || empty($this->config['originpostcode'])) + { return false; + } $this->init_vars( $this->config['username'], $this->config['originpostcode'], $this->CheckoutForm->shippingPostal, $country, - $this->config['markup']); - $this->addItem(intval($weight) , round(($weight - intval($weight)) *16 , 0) , $this->objCart->total); + $this->config['markup'] + ); + $this->addItem(intval($weight), round(($weight - intval($weight)) * 16, 0), $this->objCart->total); $rates = $this->getRate(); - if(($rates === FALSE) || (count($rates) == 0 )) { - Yii::log("USPS: Could not get rates. " . print_r($this , true), 'error', 'application.'.__CLASS__.".".__FUNCTION__); + if (($rates === FALSE) || (count($rates) == 0 )) + { + Yii::log("USPS: Could not get rates. " . print_r($this, true), 'error', 'application.'.__CLASS__.".".__FUNCTION__); return false; } return $this->convertRetToDisplay($rates); - -// asort($rates); -// $arrServices = array(); -// foreach($rates as $desc=>$returnval) { -// $arrReturn['price']=floatval($returnval); -// $arrReturn['level']=$desc; -// $arrReturn['label'] = $desc; -// -// $arrServices[] = $arrReturn; -// -// } -// -// -// return $arrServices; } + /** * init_vars - * called by total(), sets initial values for calculation + * called by run(), sets initial values for calculation * * @param $usps_account string * @param $usps_zip_origin string @@ -233,7 +171,8 @@ public function total($fields, $cart, $country = '', $zipcode = '', $state = '', * @param $usps_markup string * @return none, populates local scope $this->config */ - function init_vars($usps_account, $usps_zip_origin, $destination, $country, $usps_markup) { + function init_vars($usps_account, $usps_zip_origin, $destination, $country, $usps_markup) + { $config = $this->config; $this->uspsID = $usps_account; @@ -248,36 +187,6 @@ function init_vars($usps_account, $usps_zip_origin, $destination, $country, $usp $this->methods = $this->config['offerservices']; } - /** - * init_admin_vars - * called by total(), sets initial values for calculation - * - * @param $usps_account string - * @param $usps_zip_origin string - * @param $destination string - * @param $country string - * @param $usps_markup string - * @return none, populates local scope $this->config - */ - function init_admin_vars($usps_account, $usps_zip_origin, $destination, $country) { - $this->uspsID = $usps_account; - $this->zipOrigination = $usps_zip_origin; - $this->zipDestination = $destination; - $this->country = $country; - - if ($country == "US") { - $this->pounds = 0; - $this->ounces = 10; - $this->value = 5; - } else { - $this->pounds = 1; - $this->ounces = 0; - $this->value = 20; - } - - $this->markup = 0; - } - /** * addItem * @@ -289,8 +198,8 @@ function init_admin_vars($usps_account, $usps_zip_origin, $destination, $country * @return array */ public function addItem($p, $o, $v) { - $p = (''==$p) ? 0 : $p; - $o = (''==$o) ? 0 : $o; + $p = ('' == $p) ? 0 : $p; + $o = ('' == $o) ? 0 : $o; $this->pounds += $p; $this->ounces += $o; $this->value += $v; @@ -329,28 +238,41 @@ public function cleanMethodName($strName) { * param bool - true will return all values (used by Admin panel) * @return array */ - public function getRate($showall=false) { + public function getRate($showall = false) + { if (($this->ounces + $this->pounds) == 0) - $this->pounds=1; + { + $this->pounds = 1; + } + $config = $this->getConfigValues(get_class($this)); - $request = ($this->isDomestic()) ? $this->buildDomesticRateRequest() : $this->buildInternationalRateRequest() ; + $request = ($this->isDomestic()) ? $this->buildDomesticRateRequest() : $this->buildInternationalRateRequest(); $this->response = $this->sendUSPSRateRequest($request); - if(_xls_get_conf('DEBUG_SHIPPING' , false)) { - _xls_log(get_class($this) . " sending ".print_r($request,true),true); - _xls_log(get_class($this) . " receiving ".$this->response,true); - } + Yii::log( + sprintf("%s sending %s ", __CLASS__, print_r($request, true)), + $this->loglevel, + 'application.'.__CLASS__.'.'.__FUNCTION__ + ); + + Yii::log( + sprintf("%s receiving %s ", __CLASS__, print_r($this->response, true)), + $this->loglevel, + 'application.'.__CLASS__.'.'.__FUNCTION__ + ); // Parse xml for response values $oXML = new SimpleXMLElement($this->response); - if(!$oXML->Package) { + if(!$oXML->Package) + { //What we have is ... failure to communicate Yii::log('Could not get shipping for USPS: '.$oXML->Description, 'error', 'application.'.__CLASS__.".".__FUNCTION__); return false; } - if($oXML->Package->Error) { + if($oXML->Package->Error) + { //What we have is ... failure to communicate Yii::log('Could not get shipping for USPS: '.$oXML->Package->Error->Description, 'error', 'application.'.__CLASS__.".".__FUNCTION__); return false; @@ -358,15 +280,18 @@ public function getRate($showall=false) { $retval = array(); - if($this->isDomestic()) { - foreach($oXML->Package->Postage as $key=>$val) { + if($this->isDomestic()) + { + foreach($oXML->Package->Postage as $key => $val) + { $strKey = $val->MailService; $strRate = $val->Rate; $strKey = $this->cleanMethodName($strKey); $retval[$strKey] = floatval($strRate); } } else { - foreach($oXML->Package->Service as $key=>$val) { + foreach($oXML->Package->Service as $key => $val) + { $strKey = $val->SvcDescription; $strRate = $val->Postage; $strKey = $this->cleanMethodName($strKey); @@ -375,22 +300,30 @@ public function getRate($showall=false) { } return $retval; - - } /** - * isDomestic + * Is shipping address within or outside the US * - * Is shipping address in our outside the US * @return bool */ - private function isDomestic() { + private function isDomestic() + { $c = strtoupper($this->country); - if($c == '' or $c == 'US' or $c == 'USA' or $c == 'AMERICA' or $c == 'US OF A'or $c == 'UNITED STATES') - return true; - return false; + switch ($c) + { + case '': + case 'US': + case 'USA': + case 'AMERICA': + case 'US OF A': + case 'UNITED STATES': + return true; + + default: + return false; + } } /** @@ -399,21 +332,21 @@ private function isDomestic() { * Build XML request for US shipping * @return string */ - private function buildDomesticRateRequest() { - $r ='API=RateV4&XML='; - $r.= ''; - $r.=''; - $r.='ALL'; - $r.=''.substr($this->zipOrigination,0,5).''; - $r.=''.substr($this->zipDestination,0,5).''; - $r.=''.$this->pounds.''; - $r.=''.$this->ounces.''; - $r.=''; - $r.='Regular'; - $r.='true'; - $r.=''; - $r.=''; - + private function buildDomesticRateRequest() + { + $r = 'API=RateV4&XML='; + $r .= ''; + $r .= ''; + $r .= 'ALL'; + $r .= ''.substr($this->zipOrigination, 0, 5).''; + $r .= ''.substr($this->zipDestination, 0, 5).''; + $r .= ''.$this->pounds.''; + $r .= ''.$this->ounces.''; + $r .= ''; + $r .= 'Regular'; + $r .= 'true'; + $r .= ''; + $r .= ''; return $r; } @@ -424,23 +357,24 @@ private function buildDomesticRateRequest() { * Build XML request for US shipping * @return string */ - private function buildInternationalRateRequest() { - $r ='API=IntlRateV2&XML='; - $r.= ''; - $r.=''; - $r.=''.$this->pounds.''; - $r.=''.$this->ounces.''; - $r.='Package'; - $r.=''.$this->value.''; - $r.=''.$this->country.''; - $r.='RECTANGULAR'; - $r.='Regular'; - $r.=''; - $r.=''; - $r.=''; - $r.=''; - $r.=''; - $r.=''; + private function buildInternationalRateRequest() + { + $r = 'API=IntlRateV2&XML='; + $r .= ''; + $r .= ''; + $r .= ''.$this->pounds.''; + $r .= ''.$this->ounces.''; + $r .= 'Package'; + $r .= ''.$this->value.''; + $r .= ''.$this->country.''; + $r .= 'RECTANGULAR'; + $r .= 'Regular'; + $r .= ''; + $r .= ''; + $r .= ''; + $r .= ''; + $r .= ''; + $r .= ''; return $r; } @@ -451,7 +385,8 @@ private function buildInternationalRateRequest() { * cURL string to actually send request * @return string */ - private function sendUSPSRateRequest($req) { + private function sendUSPSRateRequest($req) + { $url = 'http://Production.ShippingAPIs.com/ShippingAPI.dll'; $c = curl_init($url); curl_setopt($c, CURLOPT_POST, true); @@ -463,44 +398,53 @@ private function sendUSPSRateRequest($req) { } - public static function getServiceTypes($class_name,$process_days=true) + public static function getServiceTypes($class_name, $process_days = true) { - if($process_days) + if ($process_days) { $arr = array(); - foreach(self::$service_types as $value) + foreach (self::$service_types as $value) { - if(stripos($value,"{0}") !== false) + if (stripos($value, "{0}") !== false) { - for($x=1; $x<=5; $x++) - $arr[] = Yii::t('usps',$value,array('{0}'=>$x."-Day")); - } else $arr[] = $value; + for ($x = 1; $x <= 5; $x++) + { + $arr[] = Yii::t('usps', $value, array('{0}' => $x."-Day")); + } + } else { + $arr[] = $value; + } } - return array_combine($arr,$arr); + return array_combine($arr, $arr); } else - return array_combine(self::$service_types,self::$service_types); + { + return array_combine(self::$service_types, self::$service_types); + } } public static function expandRestrictions($arrRestrictions) { - $arr = array(); - foreach($arrRestrictions as $key=>$value) + foreach ($arrRestrictions as $key => $value) { - if(stripos($value,"{0}") !== false) + if (stripos($value, "{0}") !== false) { - for($x=1; $x<=5; $x++) - $arr[] = Yii::t('usps',$value,array('{0}'=>" ".$x."-Day")); - } else $arr[] = $value; + for($x = 1; $x <= 5; $x++) + { + $arr[] = Yii::t('usps', $value, array('{0}' => " " . $x . "-Day")); + } + } else { + $arr[] = $value; + } } return $arr; } -} +} \ No newline at end of file diff --git a/core/protected/extensions/wstheme/WsTheme.php b/core/protected/extensions/wstheme/WsTheme.php index e639c774..1bf82d1e 100644 --- a/core/protected/extensions/wstheme/WsTheme.php +++ b/core/protected/extensions/wstheme/WsTheme.php @@ -1,16 +1,15 @@ theme->name; } @@ -133,4 +132,4 @@ public static function getThemeNameOrParentName() return Yii::app()->theme->name; } -} \ No newline at end of file +} diff --git a/core/protected/helpers/ImagesType.php b/core/protected/helpers/ImagesType.php index 13675d9d..728b9e07 100644 --- a/core/protected/helpers/ImagesType.php +++ b/core/protected/helpers/ImagesType.php @@ -82,8 +82,7 @@ public static function ToString($intImageTypeId) { public static function GetSize($intImageTypeId) { - list($intDefWidth, $intDefHeight) = - ImagesType::$SizeArray[$intImageTypeId]; + list($intDefWidth, $intDefHeight) = ImagesType::$SizeArray[$intImageTypeId]; $strCfg = ImagesType::GetConfigKey($intImageTypeId); @@ -96,7 +95,6 @@ public static function GetSize($intImageTypeId) { //If our theme doesn't have the config there, see if we have a 3.0 style config.xml if(empty($intWidth) || empty($intHeight)) { - $fnOptions = YiiBase::getPathOfAlias('webroot')."/themes/".Yii::app()->theme->name."/config.xml"; if (file_exists($fnOptions)) @@ -105,20 +103,22 @@ public static function GetSize($intImageTypeId) { // Parse xml for response values $oXML = new SimpleXMLElement($strXml); - Yii::log("Found config.xml values ".print_r($oXML,true), 'info', 'application.'.__CLASS__.".".__FUNCTION__); if(isset($oXML->defaults->configuration)) { foreach ($oXML->defaults->configuration as $item) { - if((string)$item->key_name==$strCfgWidth) + if((string)$item->key_name == $strCfgWidth) + { $intWidth = (string)$item->key_value; + } - if((string)$item->key_name==$strCfgHeight) + if((string)$item->key_name == $strCfgHeight) + { $intHeight = (string)$item->key_value; + } } } } - } //if all else STILL fails, go old school and get them from the config (And even more so, use defaults) diff --git a/core/protected/migrations/m150304_201446_WS_3110_remove_schema_config_key.php b/core/protected/migrations/m150304_201446_WS_3110_remove_schema_config_key.php new file mode 100644 index 00000000..7c454245 --- /dev/null +++ b/core/protected/migrations/m150304_201446_WS_3110_remove_schema_config_key.php @@ -0,0 +1,35 @@ +delete( + 'xlsws_configuration', + 'key_name = :key', + array('key' => 'DATABASE_SCHEMA_VERSION') + ); + } + + public function down() + { + $now = date('Y-m-d H:i:s'); + + $this->insert( + 'xlsws_configuration', + array( + 'title' => 'Database Schema Version', + 'key_name' => 'DATABASE_SCHEMA_VERSION', + 'key_value' => '447', + 'helper_text' => 'Used for tracking schema changes (pre 3.1.6)', + 'sort_order' => 0, + 'modified' => $now, + 'created' => $now, + 'param' => 301, + 'required' => 0 + ) + ); + + echo "DATABASE_SCHEMA_VERSION config key replaced"; + } +} \ No newline at end of file diff --git a/core/protected/migrations/m150312_160451_WS_3851_delete_abandoned_carts.php b/core/protected/migrations/m150312_160451_WS_3851_delete_abandoned_carts.php new file mode 100644 index 00000000..32c1e517 --- /dev/null +++ b/core/protected/migrations/m150312_160451_WS_3851_delete_abandoned_carts.php @@ -0,0 +1,43 @@ +execute( + 'delete c from + xlsws_cart c left join xlsws_cart_item ci + on c.id = ci.cart_id + where + ci.id is null and + c.id_str is null and + c.customer_id is null and + c.shipaddress_id is null and + c.billaddress_id is null and + c.shipping_id is null and + c.payment_id is null and + c.document_id is null and + c.po is null and + c.cart_type = 1 and + c.status is null and + c.currency is null and + c.printed_notes is null and + c.subtotal is null and + c.total is null and + c.item_count = 0 and + c.downloaded = 0 and + c.lightspeed_user is null and + c.origin is null and + c.gift_registry is null and + c.send_to is null and + c.submitted is null and + c.datetime_cre < now() - interval 1 day' + ); + } + + public function down() + { + echo "m150312_160451_WS_3851_delete_abandoned_carts does not support migration down.\n"; + return false; + } +} diff --git a/core/protected/migrations/m150312_160529_WS_3851_add_index_xlsws_carts_id_str.php b/core/protected/migrations/m150312_160529_WS_3851_add_index_xlsws_carts_id_str.php new file mode 100644 index 00000000..158a1559 --- /dev/null +++ b/core/protected/migrations/m150312_160529_WS_3851_add_index_xlsws_carts_id_str.php @@ -0,0 +1,14 @@ +createIndex('id_str', 'xlsws_cart', 'id_str', FALSE); + } + + public function down() + { + $this->dropIndex('id_str', 'xlsws_cart'); + } +} \ No newline at end of file diff --git a/core/protected/migrations/m150317_151011_log_cleanup.php b/core/protected/migrations/m150317_151011_log_cleanup.php new file mode 100644 index 00000000..65cfdb97 --- /dev/null +++ b/core/protected/migrations/m150317_151011_log_cleanup.php @@ -0,0 +1,21 @@ +execute("DELETE FROM `xlsws_log` WHERE `created` IS NULL"); + } + + public function down() + { + // While you can't technically roll this transaction back, since it + // doesn't change the schema, it makes sense to allow the system to roll + // back through this change to attempt to rollback the next one as well. + return true; + } +} diff --git a/core/protected/models/Cart.php b/core/protected/models/Cart.php index c488a266..69b94c56 100644 --- a/core/protected/models/Cart.php +++ b/core/protected/models/Cart.php @@ -77,17 +77,34 @@ public function searchAdmin() } - /** Create a new cart object and prepopulate some values + /** + * Create and return a cart object with some prepopulated values. + * We pass in and set the customerId to facilitate setting the tax code + * + * @param Customer $objCustomer * @return Cart */ - public static function InitializeCart() { + public static function initialize(Customer $objCustomer = null) + { $objCart = new Cart(); $objCart->cart_type = CartType::cart; + if ($objCustomer instanceof Customer) + { + $objCart->customer_id = $objCustomer->id; + } + $objCart->datetime_cre = new CDbExpression('NOW()');; $objCart->datetime_due = new CDbExpression('now() + INTERVAL '._xls_get_conf('CART_LIFE', 7).' DAY'); $objCart->ResetTaxIncFlag(); $objCart->setTaxCodeByDefaultShippingAddress(); + + return $objCart; + } + + public static function initializeAndSave() + { + $objCart = self::initialize(); if(!$objCart->save()) { Yii::log("Error initializing cart ".print_r($objCart->getErrors(), true), 'error', 'application.'.__CLASS__.".".__FUNCTION__); @@ -122,15 +139,17 @@ public function getDataProvider() * Initialize if needed and return the current Cart * This is used by unit tests to get a cart to work with for testing * Normal use will use the Cart component - * @return + * @return Cart */ - public static function GetCart() { - if(is_null(Yii::app()->user->getState('cartid'))) + public static function GetCart() + { + if (is_null(Yii::app()->user->getState('cartid'))) { - $objCart = Cart::InitializeCart(); - Yii::app()->user->setState('cartid', $objCart->id); + $objCart = Cart::initialize(); return $objCart; - } else { + } + else + { $objCart = Cart::model()->findByPk(Yii::app()->user->getState('cartid')); if ($objCart === null) @@ -138,8 +157,7 @@ public static function GetCart() { //something has happened to the database object Yii::log("Could not find cart ".Yii::app()->user->getState('cartid').", creating new one.", 'error', 'application.'.__CLASS__.".".__FUNCTION__); Yii::app()->user->setState('cartid', null); - $objCart = Cart::InitializeCart(); - Yii::app()->user->setState('cartid', $objCart->id); + $objCart = Cart::initialize(); } return $objCart; @@ -198,7 +216,7 @@ public static function CloneCart($objCart = null){ public function setTaxCodeByDefaultShippingAddress() { - if(is_null($this->customer_id)) + if (is_null($this->customer_id)) { return; } @@ -660,11 +678,13 @@ protected function updateTaxInclusive() { { foreach ($this->cartItems as $objItem) { + $objTaxCode = TaxCode::GetDefault(); + // For quote to cart, we have to remove prices manually if ($objItem->cart_type == CartType::quote && $objItem->tax_in) { $taxes = $objItem->product->CalculateTax( - TaxCode::GetDefault(), + $objTaxCode->id, $objItem->sell ); @@ -717,7 +737,7 @@ protected function updateTaxInclusive() { /** * Update tax values on the cart and cart items for tax exclusive stores. */ - protected function updateTaxExclusive() { + public function updateTaxExclusive() { if (_xls_get_conf('TAX_INCLUSIVE_PRICING', '0') == '1') { return; @@ -809,10 +829,9 @@ protected function updateTaxShipping() { } } - // ToDO: WS-3525 Refactor Tax::CalculatePricesWithTax to return an associative array - $nprice_taxes = Tax::CalculatePricesWithTax($this->shipping->shipping_sell, $this->tax_code_id, $intTaxStatus); + $nprice_taxes = Tax::calculatePricesWithTax($this->shipping->shipping_sell, $this->tax_code_id, $intTaxStatus); - $taxes = $nprice_taxes[1]; + $taxes = $nprice_taxes['arrTaxValues']; if ($this->tax_code_id == $intNoTax) { @@ -821,8 +840,7 @@ protected function updateTaxShipping() { else { - // ToDO: WS-3525 Refactor Tax::CalculatePricesWithTax to return an associative array - $this->shipping->shipping_sell_taxed = $nprice_taxes[0]; + $this->shipping->shipping_sell_taxed = $nprice_taxes['fltSellTotalWithTax']; if (Yii::app()->params['TAX_INCLUSIVE_PRICING'] != '1') { @@ -939,6 +957,23 @@ public function AddProduct($objProduct, } } + // If our Cart isn't saved to the db at this point, save it + if (is_null($this->id)) + { + if (!$this->save()) + { + throw new Exception( + sprintf( + "Unable to save cart before adding this first product: %s\n%s", + $objProduct->code, + print_r($this->getErrors(), true) + ) + ); + } + + Yii::app()->user->setState('cartid', $this->id); + } + if (!$objItem) { $objItem = new CartItem(); @@ -1168,24 +1203,44 @@ public static function LoadCartByLink($strLinkId, $clone = true){ * @param QQClause[] $objOptionalClauses additional optional QQClause objects for this query * @return Cart[] */ - public static function LoadLastCartInProgress($intCustomerId, $intBelowCart = 0) { - // Call Cart::QueryArray to perform the LoadArrayByCustomerId query - try { + public static function LoadLastCartInProgress($intCustomerId, $intBelowCart = 0) + { + // if $intBelowCart is null it means the active cart hasn't been saved to the db yet. + // This most likely means it is empty i.e. no products have been added. + // However, in order for the db query to work as intended, we need to set it to an integer. + if (is_null($intBelowCart)) + { + $intBelowCart = 0; + } - $arrCarts=Cart::model()->findAll(array( - 'condition'=>'customer_id=:id AND cart_type=:type AND item_count > 0 '. - ($intBelowCart>0 ? 'AND id<:currentcart' : 'AND id>:currentcart'), - 'params'=>array(':id'=>$intCustomerId, ':type'=>CartType::cart, ':currentcart'=>$intBelowCart), - 'order'=>'id DESC', - 'limit'=>1, - )); + $strConditionCurrentCart = 'id > :currentcart'; + if ($intBelowCart > 0) + { + $strConditionCurrentCart = 'id < :currentcart'; + } + + $criteria = new CDbCriteria(); + $criteria->condition = + 'customer_id = :id AND '. + 'cart_type = :type AND '. + 'item_count > 0 AND '. + $strConditionCurrentCart; + $criteria->order = 'id DESC'; + $criteria->limit = 1; + $criteria->params = array( + 'id' => $intCustomerId, + 'type' => CartType::cart, + 'currentcart' => $intBelowCart + ); - if(count($arrCarts)>0) { + $arrCarts = Cart::model()->findAll($criteria); - return $arrCarts[0]; - } - else return null; - } catch (Exception $objExc) { + if (count($arrCarts) > 0) + { + return $arrCarts[0]; + } + else + { return null; } } @@ -1356,20 +1411,19 @@ public function getHasPromoCode() } /** - * Called by session management to periodically sweep away old carts, based on config cart life + * Erases all carts and cart items that are older than CART_LIFE days and + * have no customer_id assocaited with them. + * + * Called by legacySoapController when doing a document_flush(), + * document_flush() is called by onsite when the user initiates a + * "Reset Carts and Documents" from the Tools->eCommerce->Documents tab + * + * @return int The number of carts + items deleted by the + * query */ - public static function GarbageCollect() { - //Delete any carts older than our timeout that don't have a customer ID attached (since those can always be restored) - $objCarts = Cart::model()->findAll("cart_type = :type AND customer_id IS NULL AND modified<:date", - array(':type'=>CartType::cart, - ':date'=>date("Y-m-d H:i:s",strtotime("-"._xls_get_conf('CART_LIFE',30)."days")) - )); - foreach ($objCarts as $objCart) - { - foreach ($objCart->cartItems as $item) - $item->delete(); - $objCart->delete(); - } + public static function garbageCollect() + { + return ShoppingCart::eraseExpired(); } diff --git a/core/protected/models/Customer.php b/core/protected/models/Customer.php index 743d6788..383f1966 100644 --- a/core/protected/models/Customer.php +++ b/core/protected/models/Customer.php @@ -27,7 +27,6 @@ class Customer extends BaseCustomer const ADMIN_USER = 2; const EXTERNAL_SHELL_ACCOUNT = -1; //for third party integration - public $email_repeat; public $password_repeat; public $token; //Security token for resetting password @@ -36,7 +35,7 @@ class Customer extends BaseCustomer * Returns the static model of the specified AR class. * @return Customer the static model class */ - public static function model($className=__CLASS__) + public static function model($className = __CLASS__) { return parent::model($className); } @@ -55,41 +54,39 @@ public function rules() // will receive user inputs. return array( array('created, modified', 'required'), - array('newsletter_subscribe', 'numerical', 'integerOnly'=>true), - array('allow_login', 'safe', 'on'=>'update'), //Note this update is Admin Panel, we use a different scenario for front-end update - array('first_name, last_name', 'length', 'max'=>64), - array('company, email, password', 'length', 'max'=>255), - array('currency', 'length', 'max'=>3), - array('preferred_language, mainphonetype', 'length', 'max'=>8), - array('mainphone', 'length','min'=>7, 'max'=>32), + array('newsletter_subscribe', 'numerical', 'integerOnly' => true), + array('allow_login', 'safe', 'on' => 'update'), //Note this update is Admin Panel, we use a different scenario for front-end update + array('first_name,last_name', 'length', 'max' => 64), + array('company,email,password', 'length', 'max' => 255), + array('currency', 'length', 'max' => 3), + array('preferred_language,mainphonetype', 'length', 'max' => 8), + array('mainphone', 'length', 'min' => 7, 'max' => 32), array('last_login', 'safe'), - - array('email', 'required','on'=>'create,createfb,myaccountupdate'), - array('first_name,last_name', 'required','on'=>'create,createfb,myaccountupdate,update,updatepassword'), - array('password,password_repeat', 'required','on'=>'create,updatepassword'), - array('mainphone', 'required','on'=>'create,myaccountupdate,update,updatepassword'), + array('email', 'required', 'on' => 'create,createfb,myaccountupdate'), + array('first_name,last_name', 'required','on' => 'create,createfb,myaccountupdate,update,updatepassword'), + array('password,password_repeat', 'required','on' => 'create,updatepassword'), + array('mainphone', 'required','on' => 'create,myaccountupdate,update,updatepassword'), // email has to be a valid email address array('email', 'email'), array('email,email_repeat', 'safe'), - array('email', 'validateEmailUnique','on'=>'create,createfb'), - array('email_repeat', 'validateEmailRepeat','on'=>'create,createfb'), - + array('email', 'validateEmailUnique','on' => 'create,createfb'), + array('email_repeat', 'validateEmailRepeat','on' => 'create,createfb'), - array('email', 'length', 'max'=>50), - array('email', 'compare', 'on'=>'create'), + array('email', 'length', 'max' => 50), + array('email', 'compare', 'on' => 'create'), array('email_repeat', 'safe'), - array('password', 'length', 'max'=>255), - array('password_repeat', 'length', 'max'=>255), - array('password', 'compare', 'on'=>'create,formSubmitWithAccount,updatepassword,resetpassword'), + array('password', 'length', 'max' => 255), + array('password_repeat', 'length', 'max' => 255), + array('password', 'compare', 'on' => 'create,formSubmitWithAccount,updatepassword,resetpassword'), array('password_repeat', 'safe'), - array('password,password_repeat', 'PasswordLengthValidator', 'on'=>'create,formSubmitWithAccount,updatepassword,resetpassword'), + array('password,password_repeat', 'PasswordLengthValidator', 'on' => 'create,formSubmitWithAccount,updatepassword,resetpassword'), - array('token', 'length', 'max'=>Customer::RESET_PASSWORD_TOKEN_LENGTH), - array('token', 'required', 'on'=>'resetpassword'), - array('token', 'validateToken', 'on'=>'resetpassword'), + array('token', 'length', 'max' => Customer::RESET_PASSWORD_TOKEN_LENGTH), + array('token', 'required', 'on' => 'resetpassword'), + array('token', 'validateToken', 'on' => 'resetpassword'), ); } @@ -103,11 +100,11 @@ public function attributeLabels() return array_merge( parent::attributeLabels(), array( - 'active'=>'This is an active address', - 'email_repeat'=>'Email Address (confirm)', - 'password_repeat'=>'Password (confirm)', - 'newsletter_subscribe'=> 'Allow us to send you emails about our products', - 'mainphone'=>'Phone Number') + 'active' => 'This is an active address', + 'email_repeat' => 'Email Address (confirm)', + 'password_repeat' => 'Password (confirm)', + 'newsletter_subscribe' => 'Allow us to send you emails about our products', + 'mainphone' => 'Phone Number') ); } @@ -123,36 +120,56 @@ public function behaviors() ); } + + /** + * Confirms whether or not the passed email address + * belongs to a registered user. + * + * @param $strEmail + * @return bool + */ + public static function isEmailRegistered($strEmail) + { + + $obj = self::model()->findByAttributes( + array( + 'email' => $strEmail, + 'record_type' => Customer::REGISTERED + ) + ); + + if (is_null($obj)) + { + return false; + } + + return true; + } + /** * @param $attribute * @param $params */ public function validateEmailUnique($attribute, $params) { - if (Yii::app()->user->isGuest && $this->email != '') + if ($this->email == '') { - $objCustomer = Customer::LoadByEmail($this->email); - - if ($objCustomer instanceof Customer) - { - $this->addError('email', - Yii::t('checkout', 'Email address already exists in system. Please log in.') - ); - } + return; } - elseif ($this->email != '') - { - $objCustomer = Customer::GetCurrent(); - $obj = Customer::model()->findAll('email = :email AND id <> :id',array(':email'=>$this->email,':id'=>$objCustomer->id)); - if (count($obj)>0) - { - $this->addError('email', - Yii::t('checkout','This email address already exists in our system for another account.') - ); - } + if (Yii::app()->user->isGuest === false) + { + return; + } + if (self::isEmailRegistered($this->email) === true) + { + $this->addError( + 'email', + Yii::t('checkout', 'Email address already exists in system. Please log in.') + ); } + } /** @@ -164,8 +181,9 @@ public function validateEmailRepeat($attribute, $params) if (Yii::app()->user->isGuest && $this->email != $this->email_repeat) { - $this->addError('email_repeat', - Yii::t('checkout','Email address does not match') + $this->addError( + 'email_repeat', + Yii::t('checkout', 'Email address does not match') ); } } @@ -185,15 +203,21 @@ public function validateToken($attribute, $params) { $url = CHtml::link( Yii::t('customer', 'password reset'), - Yii::app()->createUrl("site/login")); + Yii::app()->createUrl("site/login") + ); - $this->addError($attribute, Yii::t('yii', - 'Security {attribute} is invalid. Please try clicking again' . - ' on the link in the email, or request another {loginurl}.', - array( - '{attribute}'=>$this->getAttributeLabel($attribute), - '{loginurl}'=>$url - ))); + $this->addError( + $attribute, + Yii::t( + 'yii', + 'Security {attribute} is invalid. Please try clicking again' . + ' on the link in the email, or request another {loginurl}.', + array( + '{attribute}' => $this->getAttributeLabel($attribute), + '{loginurl}' => $url + ) + ) + ); } else { @@ -217,37 +241,53 @@ public static function CreateFromCheckoutForm($checkoutForm) $obj->newsletter_subscribe = $checkoutForm->receiveNewsletter; $obj->record_type = Customer::NORMAL_USER; $obj->currency = _xls_get_conf('CURRENCY_DEFAULT'); - $obj->pricing_level=1; + $obj->pricing_level = 1; $obj->allow_login = Customer::NORMAL_USER; $obj->scenario = Customer::SCENARIO_INSERT; if (!$obj->save()) - Yii::log("Error creating user ".print_r($obj->getErrors(),true), 'error', 'application.'.__CLASS__.".".__FUNCTION__); + { + Yii::log("Error creating user " . print_r($obj->getErrors(), true), 'error', 'application.'.__CLASS__.".".__FUNCTION__); + } else - Yii::log("Created user from checkout ".$obj->first_name." ".$obj->last_name." ".$obj->id, - 'info', 'application.'.__CLASS__.".".__FUNCTION__); + { + Yii::log( + sprintf( + "Created user from checkout %s %s id# %d ", + $obj->first_name, + $obj->last_name, + $obj->id + ), + 'info', + 'application.'.__CLASS__.".".__FUNCTION__ + ); + } + return $obj; } - public static function LoadByEmail($strEmail) { - - $objCustomer = Customer::model()->findByAttributes(array('email'=>$strEmail)); + public static function LoadByEmail($strEmail) + { + $objCustomer = Customer::model()->findByAttributes(array('email' => $strEmail)); if ($objCustomer instanceof Customer) + { return $objCustomer; - else return false; + } + return false; } public static function ClearRecord($id) { - $objCustomer = Customer::model()->findByPk($id); $objCustomer->default_billing_id = null; $objCustomer->default_shipping_id = null; $objCustomer->save(); foreach ($objCustomer->customerAddresses as $objAddress) + { $objAddress->delete(); - $objCustomer->delete(); + } + $objCustomer->delete(); } /** @@ -281,9 +321,11 @@ public function authenticate($plain_text) public static function GetCurrent() { if (Yii::app()->user->isGuest) + { return null; - else - return Customer::model()->findByPk(Yii::app()->user->id); + } + + return Customer::model()->findByPk(Yii::app()->user->id); } /** @@ -293,11 +335,12 @@ public static function GetCurrent() */ public function GenerateTempPassword() { - $this->token = Yii::app()->getSecurityManager()-> - generateRandomString(Customer::RESET_PASSWORD_TOKEN_LENGTH); + $this->token = Yii::app()->getSecurityManager()->generateRandomString(Customer::RESET_PASSWORD_TOKEN_LENGTH); if (!$this->token) + { return false; + } $this->temp_password = CPasswordHelper::hashPassword($this->token); return $this->save(false); @@ -309,25 +352,21 @@ public function GenerateTempPassword() */ public function searchAdmin() { - - $criteria=new CDbCriteria; - $criteria->compare('first_name',$this->email,true,'OR'); - $criteria->compare('last_name',$this->email,true,'OR'); - $criteria->compare('email',$this->email,true,'OR'); - $criteria->compare("CONCAT(first_name, ' ', last_name)",$this->email,true,'OR'); + $criteria = new CDbCriteria; + $criteria->compare('first_name', $this->email, true, 'OR'); + $criteria->compare('last_name', $this->email, true, 'OR'); + $criteria->compare('email', $this->email, true, 'OR'); + $criteria->compare("CONCAT(first_name, ' ', last_name)", $this->email, true, 'OR'); $criteria->addCondition("record_type>=0"); - return new CActiveDataProvider($this, array( - 'criteria'=>$criteria, - 'sort'=>array( - 'defaultOrder'=>'last_name ASC', - ), - 'pagination' => array( - 'pageSize' => 80, - ), - )); - - + return new CActiveDataProvider( + $this, + array( + 'criteria' => $criteria, + 'sort' => array('defaultOrder' => 'last_name ASC'), + 'pagination' => array('pageSize' => 80), + ) + ); } public function getFullname() @@ -394,23 +433,31 @@ public function defaultShippingIsNoTax() protected function beforeValidate() { if ($this->isNewRecord) + { $this->created = new CDbExpression('NOW()'); + } + //When resetting a password, we are using the modified //timestamp to determine if a reset token is still valid, //so don't update the timestamp in that scenario. if ($this->scenario != self::SCENARIO_RESETPASSWORD) + { $this->modified = new CDbExpression('NOW()'); + } if (empty($this->preferred_language)) - $this->preferred_language = Yii::app()->language; + { + $this->preferred_language = Yii::app()->language; + } if (empty($this->currency)) - $this->currency = _xls_get_conf('CURRENCY_DEFAULT','USD'); + { + $this->currency = _xls_get_conf('CURRENCY_DEFAULT', 'USD'); + } $this->email = strtolower($this->email); $this->email_repeat = strtolower($this->email_repeat); - return parent::beforeValidate(); } @@ -424,8 +471,7 @@ public function beforeSave() Customer::SCENARIO_UPDATEPASSWORD, Customer::SCENARIO_RESETPASSWORD ) - ) - && + ) && $this->record_type == Customer::REGISTERED && $this->password ) @@ -433,22 +479,28 @@ public function beforeSave() $hashCostParam = _xls_get_conf('PASSWORD_HASH_COST_PARAM'); if ($hashCostParam) + { $this->password = CPasswordHelper::hashPassword($this->password, $hashCostParam); + } else + { $this->password = CPasswordHelper::hashPassword($this->password); + } } // If token is set it means a temp_password has just been created, // in all other situations erase the temp_password on save if (!$this->token) + { $this->temp_password = null; + } return parent::beforeSave(); } protected function afterConstruct() { - $this->newsletter_subscribe = _xls_get_conf('DISABLE_ALLOW_NEWSLETTER',1) == 1 ? 0 : 1; + $this->newsletter_subscribe = _xls_get_conf('DISABLE_ALLOW_NEWSLETTER', 1) == 1 ? 0 : 1; $this->preferred_language = _xls_get_conf('LANG_CODE', 'en'); $this->currency = _xls_get_conf('CURRENCY_DEFAULT', 'USD'); } diff --git a/core/protected/models/Images.php b/core/protected/models/Images.php index 4a296cca..11b8ebf7 100644 --- a/core/protected/models/Images.php +++ b/core/protected/models/Images.php @@ -503,19 +503,21 @@ public static function CalculateNewSize($intWidth, $intHeight, $intNewWidth, $in */ public function DeleteImage() { if ($this->image_path && file_exists(Images::GetImagePath($this->image_path))) + { @unlink($this->GetPath()); + } - - $objEvent = new CEventPhoto('Images','onDeletePhoto',null,null,null); + $objEvent = new CEventPhoto('Images', 'onDeletePhoto', null, null, null); if(isset($this->ImagesCloud) && isset($this->ImagesCloud[0])) + { $objEvent->cloudinary_public_id = $this->ImagesCloud[0]->cloudinary_public_id; + } $objEvent->s3_path = $this->image_path; - _xls_raise_events('CEventPhoto',$objEvent); + _xls_raise_events('CEventPhoto', $objEvent); } - public static function LoadByRowidSize($id, $intSize) { if ($intSize == ImagesType::normal) return Images::model()->findByPk($id); @@ -571,15 +573,47 @@ public static function LoadByWidthHeightParent($intWidth, $intHeight, $intParent */ public function beforeDelete() { + // Null all FK references from Product to this Image. + Product::model()->updateAll( + array('image_id' => null), + 'image_id = :image_id', + array(':image_id' => $this->id) + ); + + // Delete images where this image is the parent. + if ($this->IsPrimary() === true) + { + $arrChildImages = Images::model()->findAllByAttributes( + array('parent' => $this->id) + ); + + foreach ($arrChildImages as $objImage) + { + if ($objImage->id === $this->id) + { + // For primary images, they are actually their own parent. + // Without this check, we'd have an infinite loop. + continue; + } - //In case this delete is pointed to by a product, get rid of that first - Product::model()->updateAll(array('image_id'=>null),'image_id ='.$this->id); - if ($this->IsPrimary()) - foreach (Images::model()->findAllByAttributes(array('parent' => $this->id)) as $objImage) - if (!$objImage->IsPrimary()) - $objImage->delete(); + $objImage->delete(); + } + } + // Delete all ImagesCloud rows that reference this Image to satisfy + // foreign key constraints. + $arrImagesCloud = ImagesCloud::model()->findAllByAttributes( + array('image_id' => $this->id) + ); + + foreach ($arrImagesCloud as $objImagesCloud) + { + $objImagesCloud->delete(); + } + + // Delete the image from the file system. $this->DeleteImage(); + return parent::beforeDelete(); } diff --git a/core/protected/models/Log.php b/core/protected/models/Log.php index 145e8bdc..ec22671d 100644 --- a/core/protected/models/Log.php +++ b/core/protected/models/Log.php @@ -13,38 +13,38 @@ class Log extends BaseLog * Returns the static model of the specified AR class. * @return Log the static model class */ - public static function model($className=__CLASS__) + public static function model($className = __CLASS__) { return parent::model($className); } - public static function GarbageCollect() { - - $intLogRotateDays = _xls_get_conf('LOG_ROTATE_DAYS',0); - if ($intLogRotateDays>0) { - $LastDate = date('YmdHis', strtotime("-".$intLogRotateDays." days")); + public static function garbageCollect() + { + $intLogRotateDays = _xls_get_conf('LOG_ROTATE_DAYS', 0); + if ($intLogRotateDays > 0) + { + $lastDate = date('YmdHis', strtotime("-".$intLogRotateDays." days")); - $sql="DELETE from xlsws_log where DATE_FORMAT(`created`, '%Y%m%d%H%i%s')<'".$LastDate."'"; + $sql = "DELETE from xlsws_log where DATE_FORMAT(`created`, '%Y%m%d%H%i%s')<'".$lastDate."'"; Yii::app()->db->createCommand($sql)->execute(); } - } public function searchAll() { - $criteria=new CDbCriteria; - $criteria->compare('message',$this->message,true,'OR'); + $criteria = new CDbCriteria; + $criteria->compare('message', $this->message, true, 'OR'); return new CActiveDataProvider($this, array( - 'criteria'=>$criteria, - 'sort'=>array( - 'defaultOrder'=>'id DESC', + 'criteria' => $criteria, + 'sort' => array( + 'defaultOrder' => 'id DESC', ), 'pagination' => array( 'pageSize' => 10, ), )); } -} \ No newline at end of file +} diff --git a/core/protected/models/Product.php b/core/protected/models/Product.php index 70f0822b..bf7d77ef 100644 --- a/core/protected/models/Product.php +++ b/core/protected/models/Product.php @@ -1101,12 +1101,16 @@ public static function RecalculateInventory() { * @param float [$fltPrice] :: Price to calculate on * @return array([1] => .... [5]=>)) all the tax components */ - public function CalculateTax($taxCode, $fltPrice = false) { + public function CalculateTax($intTaxCode, $fltPrice = false) + { if ($fltPrice === false) + { $fltPrice = $this->getPriceValue(); + } - list($fltTaxedPrice, $arrTaxes) = - Tax::CalculatePricesWithTax($fltPrice, $taxCode, $this->tax_status_id); + $arr = Tax::calculatePricesWithTax($fltPrice, $intTaxCode, $this->tax_status_id); + $fltTaxedPrice = $arr['fltSellTotalWithTax']; + $arrTaxes = $arr['arrTaxValues']; return $arrTaxes; } @@ -1270,21 +1274,23 @@ public static function LoadByRequestUrl($strName) { return Product::model()->findByAttributes(array('request_url'=>$strName)); } - public function DeleteImages() { - if (is_null($this->id)) { + /** + * Delete all the images associated with this product. + * @return void + */ + public function deleteImages() { + if (is_null($this->id)) + { return; } - $intImageID = $this->image_id; //save it in a variable - $this->image_id = null; - $this->save(); + $arrImage = Images::model()->findAllByAttributes( + array('product_id' => $this->id) + ); - if ($intImageID) { - $objImage = Images::model()->findByPk($intImageID); - if ($objImage) { - @unlink($objImage->image_path); - $objImage->delete(); - } + foreach ($arrImage as $objImage) + { + $objImage->delete(); } } diff --git a/core/protected/models/ProductQtyPricing.php b/core/protected/models/ProductQtyPricing.php index 76db804b..34cb754a 100644 --- a/core/protected/models/ProductQtyPricing.php +++ b/core/protected/models/ProductQtyPricing.php @@ -23,19 +23,22 @@ public function __toString() { return sprintf('ProductQtyPricing Object %s', $this->product_id." ".$this->pricing_level." ".$this->qty); } - public function GetPrice($intTaxCode, $intTaxStatus, - $taxExclusive = false) { - + public function GetPrice($objTaxCode, $intTaxStatus, $taxExclusive = false) + { if ($taxExclusive) + { return $this->price; - else if (_xls_get_conf('TAX_INCLUSIVE_PRICING', '') == '1') { - $arrPrice = Tax::CalculatePricesWithTax( - $this->price, $intTaxCode, $intTaxStatus); - $intPrice = round($arrPrice[0], 2); - return $intPrice; + } + elseif (_xls_get_conf('TAX_INCLUSIVE_PRICING', '') == '1') + { + $arrPrice = Tax::calculatePricesWithTax($this->price, $objTaxCode->id, $intTaxStatus); + + return $arrPrice['fltSellTotalWithTax']; } else + { return $this->price; + } } public function __get($strName) { diff --git a/core/protected/models/Tax.php b/core/protected/models/Tax.php index 8aa03924..c6eb2551 100644 --- a/core/protected/models/Tax.php +++ b/core/protected/models/Tax.php @@ -29,80 +29,119 @@ public function __toString() { /** - * Calculate a price of a product against a provided Tax Code. This will return the total price as well - * as a 5-item array of tax1_rate through tax5_rate + * Calculate taxes given a pre-tax price, the lsid of the TaxCode and the lsid of the TaxStatus. + * The returned array looks like this: + * Array( + * [fltSellTotalWithTax] => + * [arrTaxValues] => Array( + * [1] => + * [2] => + * [3] => + * [4] => + * [5] => + * ) + * [arrTaxRates] => Array( + * [1] => + * [2] => + * [3] => + * [4] => + * [5] => + * ) + * ) + * + * fltSellTotalWithTax is the sum of the pre-tax value and all members of arrTaxValues + * arrTaxValues is an array of values for each tax calculated according to its corresponding rate and the pre-tax value + * arrTaxRate is an array of tax rates which are defined by the TaxCode + * * @param $fltSellTotal * @param $intTaxCodeId * @param $intTaxStatusId * @return array */ - public static function CalculatePricesWithTax($fltSellTotal , $intTaxCodeId , $intTaxStatusId) { - + public static function calculatePricesWithTax($fltSellTotal, $intTaxCodeId, $intTaxStatusId) + { static $objTaxes; // Cached for better performance $fltSellTotalTaxed = $fltSellTotal; - $arrTaxAmount = array(1=>0 , 2=>0 , 3=>0 , 4=> 0 , 5=>0); - $arrTaxRates = array(1=>0 , 2=>0 , 3=>0 , 4=> 0 , 5=>0); + $arrTaxAmount = array(1 => 0, 2 => 0, 3 => 0, 4 => 0, 5 => 0); + $arrTaxRates = array(1 => 0, 2 => 0, 3 => 0, 4 => 0, 5 => 0); + $objTaxCode = TaxCode::model()->findByAttributes(array('lsid' => $intTaxCodeId)); - if($intTaxCodeId instanceof TaxCode ) - $objTaxCode = $intTaxCodeId; - else - $objTaxCode = TaxCode::model()->findByAttributes(array('lsid'=>$intTaxCodeId)); - - if(!$objTaxCode) { - if(!is_null($intTaxCodeId)) //Ignore null at this stage + if (is_null($objTaxCode)) + { + if (!is_null($intTaxCodeId)) //Ignore null at this stage + { Yii::log("Unknown tax code passed: $intTaxCodeId", 'error', 'application.'.__CLASS__.".".__FUNCTION__); + } - return array($fltSellTotalTaxed , $arrTaxAmount, $arrTaxRates); + return array( + 'fltSellTotalWithTax' => $fltSellTotalTaxed, + 'arrTaxValues' => $arrTaxAmount, + 'arrTaxRates' => $arrTaxRates + ); } - if($intTaxStatusId instanceof TaxStatus) - $objTaxStatus = $intTaxStatusId; - elseif($intTaxStatusId >= 0) - $objTaxStatus = TaxStatus::model()->findByAttributes(array('lsid'=>$intTaxStatusId)); - else - $objTaxStatus = false; + $objTaxStatus = TaxStatus::model()->findByAttributes(array('lsid' => $intTaxStatusId)); //For LS Cloud integration, see if we can find the default Tax Status - if($objTaxStatus === false && Yii::app()->params['LIGHTSPEED_CLOUD']>0) + if (is_null($objTaxStatus) && Yii::app()->params['LIGHTSPEED_CLOUD'] > 0) + { $objTaxStatus = TaxStatus::getCloudDefault(); + } - if(!$objTaxes) + if (is_null($objTaxes)) + { $objTaxes = Tax::model()->findAll(); + } $taxtypes = 5; // Number of taxes in LS - // for each exempt, reset the code to 0 - if($objTaxStatus) { - if($objTaxStatus->tax1_status) $objTaxCode->tax1_rate = 0; - if($objTaxStatus->tax2_status) $objTaxCode->tax2_rate = 0; - if($objTaxStatus->tax3_status) $objTaxCode->tax3_rate = 0; - if($objTaxStatus->tax4_status) $objTaxCode->tax4_rate = 0; - if($objTaxStatus->tax5_status) $objTaxCode->tax5_rate = 0; + // for each exempt, reset the corresponding rate to 0 + if ($objTaxStatus instanceof TaxStatus) + { + if ($objTaxStatus->tax1_status == 1) $objTaxCode->tax1_rate = 0; + if ($objTaxStatus->tax2_status == 1) $objTaxCode->tax2_rate = 0; + if ($objTaxStatus->tax3_status == 1) $objTaxCode->tax3_rate = 0; + if ($objTaxStatus->tax4_status == 1) $objTaxCode->tax4_rate = 0; + if ($objTaxStatus->tax5_status == 1) $objTaxCode->tax5_rate = 0; } $i = 0; - foreach($objTaxes as $objTax) { - $strRate = "tax" . ($i+1) . "_rate"; + foreach ($objTaxes as $objTax) + { + $strRate = "tax" . ($i + 1) . "_rate"; - if($objTax->compounded) - $fltTaxAmount = $fltSellTotalTaxed * ($objTaxCode->$strRate/100); + if ($objTax->compounded) + { + $fltTaxAmount = $fltSellTotalTaxed * ($objTaxCode->$strRate / 100); + } else - $fltTaxAmount = $fltSellTotal * ($objTaxCode->$strRate/100); + { + $fltTaxAmount = $fltSellTotal * ($objTaxCode->$strRate / 100); + } - if(($objTax->max_tax > 0) && ($fltTaxAmount >= $objTax->max_tax)) + if (($objTax->max_tax > 0) && ($fltTaxAmount >= $objTax->max_tax)) + { $fltTaxAmount = $objTax->max_tax; + } - $arrTaxAmount[$i+1] = $fltTaxAmount; - $arrTaxRates[$i+1] = $objTaxCode->$strRate; + $arrTaxAmount[$i + 1] = $fltTaxAmount; + $arrTaxRates[$i + 1] = $objTaxCode->$strRate; $fltSellTotalTaxed = $fltSellTotalTaxed + $fltTaxAmount; $i++; - if($i >= $taxtypes) $i = $taxtypes; + if ($i >= $taxtypes) + { + $i = $taxtypes; + } } - return array(round($fltSellTotalTaxed,2,PHP_ROUND_HALF_UP) , $arrTaxAmount, $arrTaxRates); + return array( + 'fltSellTotalWithTax' => round($fltSellTotalTaxed, 2, PHP_ROUND_HALF_UP), + 'arrTaxValues' => $arrTaxAmount, + 'arrTaxRates' => $arrTaxRates + ); } /** diff --git a/core/protected/models/TaxCode.php b/core/protected/models/TaxCode.php index 9a31c205..f8647da1 100644 --- a/core/protected/models/TaxCode.php +++ b/core/protected/models/TaxCode.php @@ -66,10 +66,7 @@ public static function getDefaultCode() { * @return $objTax the tax object */ public static function GetNoTaxCode() { - $objTax = TaxCode::model()->tax_total()->notax()->find(); - if ($objTax) - return $objTax; - return; + return TaxCode::model()->tax_total()->notax()->find(); } /** diff --git a/core/protected/models/Wishlist.php b/core/protected/models/Wishlist.php index 0ba7b646..f69912f8 100644 --- a/core/protected/models/Wishlist.php +++ b/core/protected/models/Wishlist.php @@ -22,7 +22,7 @@ class Wishlist extends BaseWishlist * Returns the static model of the specified AR class. * @return Wishlist the static model class */ - public static function model($className=__CLASS__) + public static function model($className = __CLASS__) { return parent::model($className); } @@ -68,10 +68,10 @@ public function rules() // will receive user inputs. return array( array('registry_name,visibility,ship_option,after_purchase', 'required'), - array('visibility', 'numerical', 'integerOnly'=>true), - array('registry_name, ship_option, gift_code', 'length', 'max'=>100), - array('registry_name,registry_description,event_date','filter','filter'=>array($obj=new CHtmlPurifier(),'purify')), - array('customer_id', 'length', 'max'=>20), + array('visibility', 'numerical', 'integerOnly' => true), + array('registry_name, ship_option, gift_code', 'length', 'max' => 100), + array('registry_name,registry_description,event_date','filter','filter' => array($obj = new CHtmlPurifier(), 'purify')), + array('customer_id', 'length', 'max' => 20), array('registry_description,event_date,deleteMe', 'safe'), ); } @@ -85,16 +85,16 @@ public function search() // Warning: Please modify the following code to remove attributes that // should not be searched. - $criteria=new CDbCriteria; + $criteria = new CDbCriteria; - $criteria->compare('id',$this->id,true); - $criteria->compare('registry_name',$this->registry_name,false); - $criteria->compare('event_date',$this->event_date,false); - $criteria->compare('customer_id',$this->customer_id,false); - $criteria->compare('gift_code',$this->gift_code,false); + $criteria->compare('id', $this->id, true); + $criteria->compare('registry_name', $this->registry_name, false); + $criteria->compare('event_date', $this->event_date, false); + $criteria->compare('customer_id', $this->customer_id, false); + $criteria->compare('gift_code', $this->gift_code, false); return new CActiveDataProvider($this, array( - 'criteria'=>$criteria, + 'criteria' => $criteria, )); } @@ -102,30 +102,30 @@ public function getDataItems() { $objItems = new WishlistItem(); $objItems->registry_id = $this->id; - return $objItems->editSearch(); - - - } public static function LoadUserLists() { if (Yii::app()->user->isGuest) + { return array(); + } - return Wishlist::model()->findAllByAttributes(array('customer_id'=>Yii::app()->user->id)); - - - + return Wishlist::model()->findAllByAttributes(array('customer_id' => Yii::app()->user->id)); } public static function LoadFirstCode() { $objLists = Wishlist::LoadUserLists(); - if (count($objLists)==0) return null; - else return $objLists[0]->gift_code; + if (count($objLists) == 0) + { + return null; + } + + return $objLists[0]->gift_code; } + /** * Determine whether the current user should be able to see this wish list * @return bool @@ -133,8 +133,11 @@ public static function LoadFirstCode() protected function getVisible() { if ($this->visibility == Wishlist::PRIVATELIST && $this->customer_id != Yii::app()->user->id) + { return false; - else return true; + } + + return true; } /** @@ -144,8 +147,11 @@ protected function getVisible() protected function getSharable() { if ($this->visibility == Wishlist::PRIVATELIST) + { return false; - else return true; + } + + return true; } /** @@ -155,8 +161,11 @@ protected function getSharable() protected function getIsMine() { if ($this->customer_id == Yii::app()->user->id) + { return true; - else return false; + } + + return false; } /** @@ -166,9 +175,9 @@ public function getVisibilities() { return array( - Wishlist::PUBLICLIST=> Yii::t('wishlist','Public, searchable by my email address'), - Wishlist::PERSONALLIST=> Yii::t('wishlist','Personal, shared only by a special URL'), - Wishlist::PRIVATELIST=> Yii::t('wishlist','Private, only viewable with my login'), + Wishlist::PUBLICLIST => Yii::t('wishlist', 'Public, searchable by my email address'), + Wishlist::PERSONALLIST => Yii::t('wishlist', 'Personal, shared only by a special URL'), + Wishlist::PRIVATELIST => Yii::t('wishlist', 'Private, only viewable with my login'), ); } @@ -179,15 +188,14 @@ public function getShippingOptions() { $arrReturn = array( - '0'=> Yii::t('wishlist','None') + '0' => Yii::t('wishlist', 'None') ); $objAddresses = CustomerAddress::getActiveAddresses(); foreach ($objAddresses as $objAddress) { - $str = - $objAddress->fullname.", ". + $str = $objAddress->fullname.", ". $objAddress->address1.($objAddress->address2 != '' ? " " : "").$objAddress->address2.", ". $objAddress->city; @@ -198,9 +206,9 @@ public function getShippingOptions() $arrReturn[$objAddress->id] = $str; } - return $arrReturn; } + /** * @return array */ @@ -208,8 +216,8 @@ public function getAfterPurchase() { return array( - Wishlist::LEAVEINLIST=> Yii::t('wishlist','Leave the item in the Wish List, marked as Purchased'), - Wishlist::DELETEFROMLIST=> Yii::t('wishlist','Delete the item automatically from Wish List'), + Wishlist::LEAVEINLIST => Yii::t('wishlist', 'Leave the item in the Wish List, marked as Purchased'), + Wishlist::DELETEFROMLIST => Yii::t('wishlist', 'Delete the item automatically from Wish List'), ); } @@ -218,18 +226,22 @@ public function getAfterPurchase() /** * Because visitor gift purchases are on a time limit to complete, remove any pending incomplete purchases */ - public static function GarbageCollect() { + public static function garbageCollect() { - $intResetHours = _xls_get_conf('RESET_GIFT_REGISTRY_PURCHASE_STATUS',6); - if ($intResetHours<1) $intResetHours=1; //cannot set to 0 - $cutoffDate = date('YmdHis', strtotime("-".$intResetHours." hours")); + $intResetHours = _xls_get_conf('RESET_GIFT_REGISTRY_PURCHASE_STATUS', 6); + if ($intResetHours < 1) + { + // Cannot set to 0. + $intResetHours = 1; + } + $cutoffDate = date('YmdHis', strtotime("-".$intResetHours." hours")); - $arrProducts=Yii::app()->db->createCommand( + $arrProducts = Yii::app()->db->createCommand( 'SELECT * FROM '.Cart::model()->tableName().' WHERE cart_type='.CartType::cart.' ORDER BY id DESC' )->query(); - while(($arrItem=$arrProducts->read())!==false) + while(($arrItem = $arrProducts->read()) !== false) { $objCart = Cart::model()->findByPk($arrItem['id']); //Go through outstanding carts and see if we have any expiring gift items @@ -247,11 +259,13 @@ public static function GarbageCollect() { { $objMessage = new CartMessages(); $objMessage->cart_id = $objCart->id; - $objMessage->message = - Yii::t('cart','You attempted to purchase the product {product} as a gift from the wish list for {wishname}. However, because wish list gift purchases must be completed within {hours} hour(s), the item has been removed from your cart. If it is still available on the wish list, it can be re-added.', - array('{wishname}'=>$item->wishlistItem->registry->customer->fullname, - '{product}'=>$item->product->Title, - '{hours}'=>$intResetHours)); + $objMessage->message = Yii::t( + 'cart', + 'You attempted to purchase the product {product} as a gift from the wish list for {wishname}. However, because wish list gift purchases must be completed within {hours} hour(s), the item has been removed from your cart. If it is still available on the wish list, it can be re-added.', + array('{wishname}' => $item->wishlistItem->registry->customer->fullname, + '{product}' => $item->product->Title, + '{hours}' => $intResetHours) + ); $objMessage->save(); $item->wishlist_item = null; @@ -265,39 +279,33 @@ public static function GarbageCollect() { $objCart->updateTotal(); $objCart->save(); } - - - } - } } - - } - } + /** * Since Validate tests to make sure certain fields have values, populate requirements here such as the modified timestamp * @return boolean from parent */ protected function beforeValidate() { if ($this->isNewRecord) + { $this->created = new CDbExpression('NOW()'); - $this->modified = new CDbExpression('NOW()'); - + } + $this->modified = new CDbExpression('NOW()'); return parent::beforeValidate(); } protected function beforeSave() { - - if($this->event_date=='' || $this->event_date=='0000-00-00') + if($this->event_date == '' || $this->event_date == '0000-00-00') + { $this->event_date = null; - + } return parent::beforeSave(); - } public function __get($strName) { @@ -320,6 +328,4 @@ public function __get($strName) { } } } - - } diff --git a/core/protected/models/forms/LoginForm.php b/core/protected/models/forms/LoginForm.php index cfe5e5c9..f7e91d3a 100644 --- a/core/protected/models/forms/LoginForm.php +++ b/core/protected/models/forms/LoginForm.php @@ -12,12 +12,10 @@ class LoginForm extends CFormModel public $rememberMe = true; public $sharedLogin = false; - /** * Used in the new checkout to set the validation scenario * @var bool */ - public $guest = false; private $_identity; @@ -50,8 +48,8 @@ public function rules() public function attributeLabels() { return array( - 'email' => Yii::t('CheckoutForm','Email Address'), - 'password' => Yii::t('CheckoutForm','Password'), + 'email' => Yii::t('CheckoutForm', 'Email Address'), + 'password' => Yii::t('CheckoutForm', 'Password'), 'rememberMe' => 'Remember me next time', ); } @@ -62,40 +60,37 @@ public function attributeLabels() */ public function authenticate($attribute, $params) { - if(!$this->hasErrors()) + if (!$this->hasErrors()) { - $this->_identity=new UserIdentity($this->email,$this->password); - if(!$this->_identity->authenticate()) + $this->_identity = new UserIdentity($this->email, $this->password); + if (!$this->_identity->authenticate()) { switch ($this->_identity->errorCode) { case UserIdentity::ERROR_NOT_APPROVED: - $this->addError('password',Yii::t('global','Your account has not yet been approved.')); + $this->addError('password', Yii::t('global', 'Your account has not yet been approved.')); Yii::log("Denied: Unapproved user ".$this->email." attempted login", 'error', 'application.'.__CLASS__.".".__FUNCTION__); break; case UserIdentity::ERROR_PASSWORD_FACEBOOK: - $this->addError('password',Yii::t('global','Use Facebook Login.')); + $this->addError('password', Yii::t('global', 'Use Facebook Login.')); break; case UserIdentity::ERROR_PASSWORD_INVALID: - $this->addError('password',Yii::t('global','Incorrect password.')); + $this->addError('password', Yii::t('global', 'Incorrect password.')); Yii::log("Login denied: Incorrect password for ".$this->email." attempted login", 'error', 'application.'.__CLASS__.".".__FUNCTION__); break; case UserIdentity::ERROR_USERNAME_INVALID: - $this->addError('password',Yii::t('global','Unknown email address.')); + $this->addError('password', Yii::t('global', 'Unknown email address.')); Yii::log("Login denied: Unknown email address ".$this->email." attempted login", 'error', 'application.'.__CLASS__.".".__FUNCTION__); break; default: - $this->addError('password',Yii::t('global','Incorrect username or password.')); + $this->addError('password', Yii::t('global', 'Incorrect username or password.')); Yii::log("Login denied: Incorrect username or password for ".$this->email." attempted login", 'error', 'application.'.__CLASS__.".".__FUNCTION__); } - - } - } } @@ -105,27 +100,26 @@ public function authenticate($attribute, $params) */ public function login() { - if($this->_identity===null) + if ($this->_identity === null) { - $this->_identity=new UserIdentity($this->email,$this->password); + $this->_identity = new UserIdentity($this->email, $this->password); $this->_identity->authenticate(); } - if($this->_identity->errorCode===UserIdentity::ERROR_NONE) + if ($this->_identity->errorCode === UserIdentity::ERROR_NONE) { Yii::log("Login authentication passed ", 'info', 'application.'.__CLASS__.".".__FUNCTION__); - $duration=$this->rememberMe ? 3600*24*30 : 0 ; // true = 30 days, false=until browser close - Yii::app()->user->login($this->_identity,$duration); + $duration = $this->rememberMe ? 3600 * 24 * 30 : 0; // true = 30 days, false=until browser close + Yii::app()->user->login($this->_identity, $duration); //afterLogin() in WebUser class will restore prior cart if necessary return true; } else + { return false; - - - + } } /** @@ -134,63 +128,62 @@ public function login() */ public function loginadmin() { - if($this->_identity===null) + if($this->_identity === null) { - $this->_identity=new UserIdentity($this->email,$this->password); + $this->_identity = new UserIdentity($this->email, $this->password); $this->_identity->authenticate(); } - if($this->_identity->errorCode===UserIdentity::ERROR_NONE && $this->_identity->isAdmin) + + if($this->_identity->errorCode === UserIdentity::ERROR_NONE && $this->_identity->isAdmin) { - $duration=$this->rememberMe ? 3600*24*30 : 0 ; // true = 30 days, false=until browser close - Yii::app()->user->login($this->_identity,$duration); + $duration = $this->rememberMe ? 3600 * 24 * 30 : 0; // true = 30 days, false=until browser close + Yii::app()->user->login($this->_identity, $duration); return true; } else + { return false; - - - + } } /** * Logs in the user using the given username and password in the model. * @return boolean whether login is successful */ - public function loginLightspeed($username,$password) + public function loginLightspeed($username, $password) { - if($this->_identity===null) + if ($this->_identity === null) { - $this->_identity=new LSIdentity($username,$password); + $this->_identity = new LSIdentity($username, $password); $this->_identity->authenticate(); } - if($this->_identity->errorCode===UserIdentity::ERROR_NONE) - { - Yii::app()->user->login($this->_identity,1800); - + if ($this->_identity->errorCode === UserIdentity::ERROR_NONE) + { + Yii::app()->user->login($this->_identity, 1800); return true; } else + { return false; - - - + } } - /** - * Since Validate tests to make sure certain fields have values, populate requirements here such as the modified timestamp - * @return boolean from parent - */ - - protected function beforeValidate() { - - $this->email = strtolower($this->email); + /** + * Since Validate tests to make sure certain fields have values, populate requirements here such as the modified timestamp + * @return boolean from parent + */ + protected function beforeValidate() + { + $this->email = strtolower($this->email); - if ($this->getScenario() === '') - $this->setScenario('Existing'); + if ($this->getScenario() === '') + { + $this->setScenario('Existing'); + } - return parent::beforeValidate(); - } + return parent::beforeValidate(); + } } diff --git a/core/protected/modules/admin/controllers/SystemController.php b/core/protected/modules/admin/controllers/SystemController.php index d4efe354..28f4ea45 100644 --- a/core/protected/modules/admin/controllers/SystemController.php +++ b/core/protected/modules/admin/controllers/SystemController.php @@ -193,38 +193,27 @@ public function actionPurge() } + /** + * Erase carts that are over 30 days old, and don't have a customer_id + * associated with them, then optimize the tables related to the shopping + * cart experience. + */ public function actionErasecarts() { - - $sql = " - FROM xlsws_cart P, xlsws_cart_item C - WHERE - P.customer_id IS NULL AND - P.id = C.cart_id AND - P.cart_type IN (" . CartType::cart . "," . CartType::giftregistry . "," . CartType::awaitpayment . ") AND - P.modified < '".date("Y-m-d", strtotime("-".intval(_xls_get_conf('CART_LIFE' , 30))." DAYS"))."' AND - id_str IS NULL"; - - - $intIdStr = Yii::app()->db->createCommand("select count(*) ".$sql)->queryScalar(); - _dbx("set foreign_key_checks=0;"); - _dbx("DELETE P, C ".$sql); - - - _dbx("OPTIMIZE table xlsws_cart"); - _dbx("OPTIMIZE table xlsws_cart_item"); - _dbx("OPTIMIZE table xlsws_customer"); - _dbx("OPTIMIZE table xlsws_wish_list"); - _dbx("OPTIMIZE table xlsws_wish_list_items"); - _dbx("OPTIMIZE table xlsws_product"); - _dbx("OPTIMIZE table xlsws_product_related"); - _dbx("OPTIMIZE table xlsws_category"); - _dbx("OPTIMIZE table xlsws_product_category_assn"); - _dbx("set foreign_key_checks=1;"); - Yii::app()->user->setFlash('success',Yii::t('admin','{qty} old carts removed {time}.',array('{qty}'=>$intIdStr, '{time}'=>date("d F, Y h:i:sa")))); - + $numErased = ShoppingCart::eraseExpired(); + ShoppingCart::optimizeTables(); + Yii::app()->user->setFlash( + 'success', + Yii::t( + 'admin', + '{qty} old carts and cart items removed. {time}', + array( + '{qty}' => $numErased, + '{time}' => date("d F, Y h:i:sa") + ) + ) + ); $this->render("erasecarts"); - } public function sendEmailTest() @@ -249,4 +238,4 @@ public function sendEmailTest() } -} \ No newline at end of file +} diff --git a/core/protected/modules/admin/controllers/ThemeController.php b/core/protected/modules/admin/controllers/ThemeController.php index 83c37061..bfe86a97 100644 --- a/core/protected/modules/admin/controllers/ThemeController.php +++ b/core/protected/modules/admin/controllers/ThemeController.php @@ -106,11 +106,11 @@ public function actionManage() } - if (isset($_POST['yt1']) && $_POST['yt1']=="btnCopy") + if ((isset($_POST['yt1']) && $_POST['yt1'] == "btnCopy") || + (isset($_POST['task']) && $_POST['task'] === "btnCopy")) { $arrThemes = $this->changeTheme($_POST); $arrThemes = $this->copyThemeForCustomization($_POST); - } if (isset($_POST['yt0']) && $_POST['yt0']=="btnSet") diff --git a/core/protected/modules/admin/controllers/UpgradeController.php b/core/protected/modules/admin/controllers/UpgradeController.php index 6bda57b7..a234b8ef 100644 --- a/core/protected/modules/admin/controllers/UpgradeController.php +++ b/core/protected/modules/admin/controllers/UpgradeController.php @@ -378,8 +378,6 @@ public function actionDatabaseUpgrade($online=50, $total=100, $tag='') } - if(is_numeric($oXML->schema)) - _xls_set_conf('DATABASE_SCHEMA_VERSION',$oXML->schema); $oXML = $this->isDatabaseCurrent(true); @@ -417,12 +415,15 @@ protected function isDatabaseCurrent($blnCheckOnly=false) $storeurl = str_replace("https://","",$storeurl); $data['wdb'] = array( - 'schema' => _xls_get_conf('DATABASE_SCHEMA_VERSION'), + // Despite the DATABASE_SCHEMA_VERSION config key no longer existing, we must + // include the schema index key in the array since Updater is expecting it. + 'schema' => _xls_get_conf('DATABASE_SCHEMA_VERSION', 447), 'version' => XLSWS_VERSIONBUILD, 'customer' => $storeurl, - 'type' => (_xls_get_conf('LIGHTSPEED_HOSTING')==1 ? "hosted" : "self") + 'type' => (_xls_get_conf('LIGHTSPEED_HOSTING') == 1 ? "hosted" : "self") ); - if(Yii::app()->params['LIGHTSPEED_MT']=='1') + + if (Yii::app()->params['LIGHTSPEED_MT'] == '1') { //Since we could have two urls on multitenant, just grab the original one $data['customer']=Yii::app()->params['LIGHTSPEED_HOSTING_LIGHTSPEED_URL']; @@ -431,6 +432,7 @@ protected function isDatabaseCurrent($blnCheckOnly=false) $data['type']="mt-cloud"; } + $json = json_encode($data); $ch = curl_init($url); @@ -454,7 +456,9 @@ protected function isDatabaseCurrent($blnCheckOnly=false) $mixSchema = $oXML->wsdb->schema; if ($mixSchema != 'current') + { return $oXML->wsdb; + } $oXML->wsdb->changetype = "yii"; $oXML->wsdb->schema = Yii::t('admin','Updating Database'); //Just because this is displayed during an update @@ -469,11 +473,13 @@ protected function isDatabaseCurrent($blnCheckOnly=false) * New db update routine, this will become the only item in this function later * That's why we're just adding instead of calling another function */ - if(!$blnCheckOnly) + if (!$blnCheckOnly) { $strMigrationResults = _runMigrationTool(1); if (stripos($strMigrationResults, "No new migration found") > 0 ) + { $oXML->wsdb->schema = 'current'; + } } diff --git a/core/protected/modules/admin/views/system/info.php b/core/protected/modules/admin/views/system/info.php index d20ddb2d..da02a3d3 100644 --- a/core/protected/modules/admin/views/system/info.php +++ b/core/protected/modules/admin/views/system/info.php @@ -20,15 +20,6 @@
 
-
-
- -
-
- params['DATABASE_SCHEMA_VERSION']; ?> -
-
 
-
diff --git a/core/protected/modules/admin/views/theme/manage.php b/core/protected/modules/admin/views/theme/manage.php index b42af050..178cea21 100644 --- a/core/protected/modules/admin/views/theme/manage.php +++ b/core/protected/modules/admin/views/theme/manage.php @@ -70,12 +70,27 @@ 0): ?>

+ Warning: This functionality is intended for web developers only. " . + "Copying a theme for customization may require occasional updates to the custom theme files " . + "as Web Store updates are released. If you are not comfortable with updating CSS or PHP files " . + "as required, we highly recommend that you do not copy a theme."; + ?> + widget('bootstrap.widgets.TbButton', array( - 'buttonType'=>'submit', - 'label'=>'Copy selected theme for customization', - 'type'=>'inverse', - 'size'=>'mini', - 'htmlOptions'=>array('id'=>'btnCopy','value'=>'btnCopy'), + 'label' => 'Copy selected theme for customization', + 'type' => 'inverse', + 'size' => 'mini', + 'htmlOptions' => array( + 'id' => 'btnCopy', + 'value' => 'btnCopy', + 'onclick' => 'js:bootbox.confirm("'. $copyThemeWarningMsg . '", "Cancel", "Continue", function(confirmed) { + if(confirmed) + { + $("#task").val("btnCopy"); + $("#manage").submit(); + } + })'), )); ?> widget('bootstrap.widgets.TbButton', array( 'buttonType'=>'submit', @@ -109,4 +124,4 @@
-
\ No newline at end of file +
diff --git a/core/protected/views-cities3/myaccount/address.php b/core/protected/views-cities3/myaccount/address.php index aaf94b82..6d06d407 100644 --- a/core/protected/views-cities3/myaccount/address.php +++ b/core/protected/views-cities3/myaccount/address.php @@ -9,11 +9,10 @@ /* Create a new wish list form. We use the Checkout ID to reuse our CSS formatting */ ?>
beginWidget( + $form = $this->beginWidget( 'CActiveForm', array( - 'id'=>'wishlistdisplay', - 'enableClientValidation'=>true, - 'focus'=>array($model,'registry_name'), + 'id' => 'wishlistdisplay', + 'enableClientValidation' => true ) ); if ($model->id > 0) { diff --git a/core/protected/views-cities3/myaccount/edit.php b/core/protected/views-cities3/myaccount/edit.php index 655a140f..435f97f4 100644 --- a/core/protected/views-cities3/myaccount/edit.php +++ b/core/protected/views-cities3/myaccount/edit.php @@ -19,11 +19,11 @@
- beginWidget('CActiveForm', array( - 'id'=>'myaccount', - 'enableClientValidation'=>true, - 'focus'=>array($model,'first_name'), - )); + beginWidget('CActiveForm', array( + 'id' => 'myaccount', + 'enableClientValidation' => true + )); ?>
diff --git a/core/protected/views-cities3/myaccount/password.php b/core/protected/views-cities3/myaccount/password.php index efa5be96..95984350 100644 --- a/core/protected/views-cities3/myaccount/password.php +++ b/core/protected/views-cities3/myaccount/password.php @@ -2,11 +2,11 @@
- beginWidget('CActiveForm', array( - 'id'=>'myaccount', - 'enableClientValidation'=>true, - 'focus'=>array($model,'password') - )); + beginWidget('CActiveForm', array( + 'id' => 'myaccount', + 'enableClientValidation' => true + )); ?>
diff --git a/core/protected/views-cities3/search/index.php b/core/protected/views-cities3/search/index.php index bf61a519..b5a4411e 100644 --- a/core/protected/views-cities3/search/index.php +++ b/core/protected/views-cities3/search/index.php @@ -1,41 +1,41 @@

- beginWidget('CActiveForm', array( - 'id'=>'advancedsearch', - 'enableClientValidation'=>true, - 'focus'=>array($model,'q'), - )); + beginWidget('CActiveForm', array( + 'id' => 'advancedsearch', + 'enableClientValidation' => true + )); ?>
-
-
- label($model,'q'); ?> - textField($model,'q'); ?> - error($model,'q'); ?> -
-
+
+
+ label($model,'q'); ?> + textField($model,'q'); ?> + error($model,'q'); ?> +
+
-
-
- label($model,'startprice'); ?> - textField($model,'startprice'); ?> - error($model,'startprice'); ?> -
-
- label($model,'endprice'); ?> - textField($model,'endprice'); ?> - error($model,'endprice'); ?> -
-
+
+
+ label($model,'startprice'); ?> + textField($model,'startprice'); ?> + error($model,'startprice'); ?> +
+
+ label($model,'endprice'); ?> + textField($model,'endprice'); ?> + error($model,'endprice'); ?> +
+
-
-
- label($model,'cat'); ?> - dropDownList($model,'cat',Category::getTopLevelSearch(),array('prompt'=>Yii::t('global','All Categories'))); ?> - error($model,'cat'); ?> -
-
+
+
+ label($model,'cat'); ?> + dropDownList($model,'cat',Category::getTopLevelSearch(),array('prompt'=>Yii::t('global','All Categories'))); ?> + error($model,'cat'); ?> +
+
'btnSubmit')); ?> diff --git a/core/protected/views-cities3/site/login.php b/core/protected/views-cities3/site/login.php index 0f858d0e..b5652e90 100644 --- a/core/protected/views-cities3/site/login.php +++ b/core/protected/views-cities3/site/login.php @@ -16,11 +16,12 @@ )); ?>