diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 224e84eeb55..bb325453ffe 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -162,7 +162,7 @@ tools: external_code_coverage: runs: 1 - timeout: 36000 #The timeout must be in the interval [60,36000]. + timeout: 3600 #php_code_sniffer: # enabled: true diff --git a/.travis.yml b/.travis.yml index f49636eb53b..6388eae3517 100644 --- a/.travis.yml +++ b/.travis.yml @@ -80,8 +80,8 @@ jobs: env: GROUP=admin03 APP_ENV=codeception DATABASE_URL=postgres://postgres:password@localhost/eccube_db DATABASE_SERVER_VERSION=9 MAILER_URL=smtp://localhost:1025 - <<: *e2e_test env: GROUP=front APP_ENV=codeception DATABASE_URL=postgres://postgres:password@localhost/eccube_db DATABASE_SERVER_VERSION=9 MAILER_URL=smtp://localhost:1025 - - &coverage - stage: Code Coverage + - stage: Code Coverage + if: type != pull_request env: DATABASE_URL=sqlite:///%kernel.project_dir%/var/eccube.db DATABASE_SERVER_VERSION=3 COVERAGE=1 before_install: - *php_setup diff --git a/codeception/_support/Page/Admin/ProductEditPage.php b/codeception/_support/Page/Admin/ProductEditPage.php index eab586ab58c..ec37b998d66 100644 --- a/codeception/_support/Page/Admin/ProductEditPage.php +++ b/codeception/_support/Page/Admin/ProductEditPage.php @@ -55,6 +55,12 @@ public function 入力_公開() return $this; } + public function 入力_非公開() + { + $this->tester->selectOption('#admin_product_Status', '非公開'); + return $this; + } + public function クリックして開くタグリスト() { $this->tester->click(['css' => 'div[href="#allTags"] > a']); @@ -89,4 +95,9 @@ public function 登録() return $this; } + public function プレビュー() + { + $this->tester->click(['xpath' => "//*[@id='preview']/div/div/a[text()='プレビュー']"]); + } + } diff --git a/codeception/acceptance/EA03ProductCest.php b/codeception/acceptance/EA03ProductCest.php index 774331fc7da..707ece1c0a8 100644 --- a/codeception/acceptance/EA03ProductCest.php +++ b/codeception/acceptance/EA03ProductCest.php @@ -729,4 +729,39 @@ public function product_一覧からの商品確認(\AcceptanceTester $I) $I->switchToNewWindow(); $I->seeInCurrentUrl('/products/detail/'); } + + public function product_商品編集からの商品確認_公開(\AcceptanceTester $I) + { + $I->wantTo('EA0310-UC05-T02 編集からの商品確認 公開'); + + ProductManagePage::go($I) + ->検索('パーコレーター') + ->検索結果_選択(1); + + ProductEditPage::at($I) + ->入力_公開() + ->登録() + ->プレビュー(); + + $I->switchToNewWindow(); + $I->seeInCurrentUrl('/products/detail/'); + } + + public function product_商品編集からの商品確認_非公開(\AcceptanceTester $I) + { + $I->wantTo('EA0310-UC05-T03 編集からの商品確認 非公開'); + + ProductManagePage::go($I) + ->検索('パーコレーター') + ->検索結果_選択(1); + + ProductEditPage::at($I) + ->入力_非公開() + ->登録() + ->プレビュー(); + + $I->switchToNewWindow(); + $I->seeInCurrentUrl('/products/detail/'); + } + } \ No newline at end of file diff --git a/src/Eccube/Resource/doctrine/import_csv/mtb_customer_order_status.csv b/src/Eccube/Resource/doctrine/import_csv/mtb_customer_order_status.csv index 68e99cfc3e8..7f286d132cb 100644 --- a/src/Eccube/Resource/doctrine/import_csv/mtb_customer_order_status.csv +++ b/src/Eccube/Resource/doctrine/import_csv/mtb_customer_order_status.csv @@ -7,3 +7,5 @@ id,name,sort_no,discriminator_type "4","注文受付","5","customerorderstatus" "5","発送済み","6","customerorderstatus" "8","注文未完了","7","customerorderstatus" +"9","注文受付","8","customerorderstatus" +"10","返品","9","customerorderstatus" diff --git a/src/Eccube/Resource/locale/messages.en.php b/src/Eccube/Resource/locale/messages.en.php index 476a6488083..0bce8f18327 100644 --- a/src/Eccube/Resource/locale/messages.en.php +++ b/src/Eccube/Resource/locale/messages.en.php @@ -1075,6 +1075,7 @@ 'admin.product.product.521' => 'Registration Date', 'admin.product.product.522' => 'Updated on', 'admin.product.product.523' => 'Store Owner\'s Notes', + 'admin.product.product.preview' => 'Preview', 'admin.product.product_class.524' => 'Products', 'admin.product.product_class.525' => 'Add New Product', 'admin.product.product_class.526' => 'The data will be deleted permanently. Are you sure to delete?', diff --git a/src/Eccube/Resource/locale/messages.ja.php b/src/Eccube/Resource/locale/messages.ja.php index 72417419aad..b766e8a2c79 100644 --- a/src/Eccube/Resource/locale/messages.ja.php +++ b/src/Eccube/Resource/locale/messages.ja.php @@ -1638,6 +1638,7 @@ 'admin.product.product.text09' => 'この商品の規格管理', 'admin.product.product.text10' => 'ページを移動します。', 'admin.product.product.text11' => '%name%に移動します。商品情報を保存してから移動しますか？', + 'admin.product.product.preview' => 'プレビュー', 'admin.product.product.save' => '変更を保存', 'admin.product.product.cancel' => '保存せずに移動', 'admin.product.product.category' => 'カテゴリ', diff --git a/src/Eccube/Resource/template/admin/Product/product.twig b/src/Eccube/Resource/template/admin/Product/product.twig index 3d16b035ad5..95ce22468e9 100644 --- a/src/Eccube/Resource/template/admin/Product/product.twig +++ b/src/Eccube/Resource/template/admin/Product/product.twig @@ -728,6 +728,20 @@ file that was distributed with this source code.
+ {% if id is not null %} +
+ +
+ {% endif %}