forked from EC-CUBE/ec-cube
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'eccubejp-local/4.0.3' into 4.0-jp
# Conflicts: # README.md # app/config/eccube/packages/eccube.yaml # html/template/default/assets/css/maps/style.css.map # html/template/default/assets/css/style.css # html/template/default/assets/scss/component/_7.3.cart.scss # html/template/default/assets/scss/project/_11.2.header.scss # src/Eccube/Controller/Admin/Order/ShippingController.php # src/Eccube/Controller/Admin/Product/CsvImportController.php # src/Eccube/Service/OrderPdfService.php
- Loading branch information
Showing
115 changed files
with
3,279 additions
and
737 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| vendor | ||
| .git | ||
| var |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| FROM php:7.3-apache-stretch | ||
|
|
||
| ENV APACHE_DOCUMENT_ROOT /var/www/html | ||
|
|
||
| RUN echo "deb http://cdn.debian.net/debian/ stretch main contrib non-free" > /etc/apt/sources.list.d/mirror.jp.list | ||
| RUN echo "deb http://cdn.debian.net/debian/ stretch-updates main contrib" >> /etc/apt/sources.list.d/mirror.jp.list | ||
|
|
||
| RUN /bin/rm /etc/apt/sources.list | ||
|
|
||
| RUN apt-get update && apt-get install -y \ | ||
| curl apt-utils apt-transport-https debconf-utils gcc build-essential \ | ||
| zlib1g-dev git gnupg2 unzip libfreetype6-dev libjpeg62-turbo-dev \ | ||
| libpng-dev libzip-dev libicu-dev vim git ssl-cert \ | ||
| && docker-php-ext-install -j$(nproc) zip gd mysqli pdo_mysql opcache intl \ | ||
| && rm -rf /var/lib/apt/lists/* | ||
|
|
||
| RUN apt-get update && apt-get install -y libpq-dev \ | ||
| && docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql \ | ||
| && docker-php-ext-install -j$(nproc) pgsql pdo_pgsql \ | ||
| && rm -rf /var/lib/apt/lists/* | ||
|
|
||
| RUN apt-get update && apt-get install -y locales \ | ||
| && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ | ||
| && locale-gen | ||
|
|
||
| RUN pecl install apcu && echo "extension=apcu.so" > /usr/local/etc/php/conf.d/apc.ini | ||
|
|
||
| RUN if [ ! -d ${APACHE_DOCUMENT_ROOT} ]; then mkdir -p ${APACHE_DOCUMENT_ROOT} ; fi | ||
| RUN sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf | ||
| RUN sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf | ||
|
|
||
| RUN a2enmod rewrite | ||
| RUN a2enmod headers | ||
|
|
||
| # Enable SSL | ||
| RUN a2enmod ssl | ||
| RUN ln -s /etc/apache2/sites-available/default-ssl.conf /etc/apache2/sites-enabled/default-ssl.conf | ||
| EXPOSE 443 | ||
|
|
||
| # Use the default production configuration | ||
| RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" | ||
| # Override with custom configuration settings | ||
| COPY dockerbuild/php.ini $PHP_INI_DIR/conf.d/ | ||
|
|
||
| RUN curl -sS https://getcomposer.org/installer | php && mv composer.phar /usr/bin/composer | ||
|
|
||
| COPY composer.json /tmp/composer.json | ||
| COPY composer.lock /tmp/composer.lock | ||
| ENV COMPOSER_ALLOW_SUPERUSER 1 | ||
| RUN composer install --no-scripts --no-autoloader --no-dev -d /tmp | ||
|
|
||
| COPY . ${APACHE_DOCUMENT_ROOT} | ||
|
|
||
| RUN cp -rp /tmp/vendor ${APACHE_DOCUMENT_ROOT}/vendor \ | ||
| && rm -rf /tmp/vendor | ||
|
|
||
| WORKDIR ${APACHE_DOCUMENT_ROOT} | ||
| RUN chown -R www-data:www-data ${APACHE_DOCUMENT_ROOT} | ||
| RUN chown www-data:www-data /var/www | ||
|
|
||
| USER www-data | ||
| RUN composer dumpautoload -o --apcu --no-dev | ||
|
|
||
| RUN if [ ! -f ${APACHE_DOCUMENT_ROOT}/.env ]; then \ | ||
| cp -p .env.dist .env \ | ||
| ; fi | ||
|
|
||
| RUN if [ ! -f ${APACHE_DOCUMENT_ROOT}/var/eccube.db ]; then \ | ||
| composer run-script installer-scripts && composer run-script auto-scripts \ | ||
| ; fi | ||
|
|
||
| USER root | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /* | ||
| * This file is part of EC-CUBE | ||
| * | ||
| * Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved. | ||
| * | ||
| * http://www.ec-cube.co.jp/ | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
|
|
||
| namespace DoctrineMigrations; | ||
|
|
||
| use Doctrine\DBAL\Schema\Schema; | ||
| use Doctrine\Migrations\AbstractMigration; | ||
|
|
||
| /** | ||
| * Auto-generated Migration: Please modify to your needs! | ||
| */ | ||
| final class Version20190821081036 extends AbstractMigration | ||
| { | ||
| const NAME = 'dtb_csv'; | ||
|
|
||
| public function up(Schema $schema) : void | ||
| { | ||
| // this up() migration is auto-generated, please modify it to your needs | ||
| if (!$schema->hasTable(self::NAME)) { | ||
| return; | ||
| } | ||
|
|
||
| $taxRateExists = $this->connection->fetchColumn("SELECT COUNT(*) FROM dtb_csv WHERE csv_type_id = 1 AND entity_name = ? AND field_name = 'TaxRule' AND reference_field_name = 'tax_rate'", ['Eccube\\\\Entity\\\\ProductClass']); | ||
| if ($taxRateExists == 0) { | ||
| $this->addSql("INSERT INTO dtb_csv (csv_type_id, creator_id, entity_name, field_name, reference_field_name, disp_name, sort_no, enabled, create_date, update_date, discriminator_type) VALUES (1, null , ?, 'TaxRule', 'tax_rate', '税率', 31, false, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP,'csv')", ['Eccube\\\\Entity\\\\ProductClass']); | ||
| } | ||
| } | ||
|
|
||
| public function down(Schema $schema) : void | ||
| { | ||
| // this down() migration is auto-generated, please modify it to your needs | ||
|
|
||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.