Merge pull request #1 from spryker-shop/prepare-suite-b2c

Prepare suite b2c
spryker-shop · Jun 26, 2018 · 2611c79 · 2611c79
2 parents 60906c4 + 1536a2f
commit 2611c79
Show file tree

Hide file tree

Showing 187 changed files with 4,938 additions and 5,188 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -46,6 +46,7 @@ before_install:
   - echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
   - if [[ $DB == 'mysql' ]]; then chmod +x ./config/Shared/ci/travis/mysql/* ; fi
   - if [[ $DB == 'mysql' ]]; then ./config/Shared/ci/travis/mysql/travis_mysql_5.7.sh ; fi
+  - ( awk '1;/@hook travis-ci/{exit}' config/Shared/stores.php ; awk 'NR>1' config/Shared/ci/travis/stores.php ; awk '/@hook travis-ci/,0' config/Shared/stores.php ) > config/Shared/stores_tmp.php ; mv config/Shared/stores_tmp.php config/Shared/stores.php
 
 install:
   - chmod -R a+x config/Shared/ci/travis/

diff --git a/assets/Yves/default/app/components/customer-reorder-widget/index.js b/assets/Yves/default/app/components/customer-reorder-widget/index.js
diff --git a/assets/Yves/default/app/index.js b/assets/Yves/default/app/index.js