Maker renew#1

Closed

lammn wants to merge 39 commits intomasterfrom

lammn commented Oct 26, 2016

For review

lqdung-lockon added 15 commits

October 19, 2016 14:25


          [IMPLEMENT] Implement maker renew (main feature).

57dba73


          [FIX] Fix issue: Unable to add Maker when product are classes.

22ed861


          [FIX] Fix issue: Parse html with special character + layout broken.

99b6f1c


          [ADD] Add new hookpoint for version >=3.0.9


          [ADD] Add drag & drop, add/edit modal feature and fix layout.

1a6aa1a


          [ADD] Add check duplicate name + change place to show error as new re…

9783ef8

…quirement.


          [RUN] Run PHPcs fixer.

3146df4


          [CHANGE] Change new hookpoint + add plugin tag.

6d6bdd3


          [REFACTOR] Refactor code.

448f3a0


          [ADD] Add unittest for the maker plugin.

ac1ecfb


          [REFACTOR] Refactor code.

8ecbe06


          [FIX] Fix travis

ba68d7d


          [CHECK] Check travis.

cd5693b


          [FIX] Fix uninstall

48355d5


          [FIX] fix product detail

b502e08

lammn commented

View reviewed changes

Author

lammn left a comment

All review

.travis.yml Outdated

+                # re install plugin
+                - php app/console plugin:develop install --code=${PLUGIN_CODE}
+                # re enable plugin
+                - php app/console plugin:develop enable --code=${PLUGIN_CODE}

                
                    No newline at end of file

Author

lammn Oct 26, 2016

Add new line of end file

Controller/MakerController.php

-                      if (!$TargetMaker) {
-                          throw new NotFoundHttpException();
+                      // Check request
+                      if (!'POST' === $request->getMethod()) {

Author

lammn Oct 26, 2016

don't use 'POST' === $request->getMethod()

lqdung-lockon Oct 27, 2016

don't have form to check submit
=> don't fix.

Entity/Maker.php

		@@ -25,12 +30,12 @@ class Maker extends \Eccube\Entity\AbstractEntity
		private $name;

Author

lammn Oct 26, 2016

add variable comment

lqdung-lockon Oct 27, 2016

Check again because it was there.
=> don't change.

Entity/Maker.php

		@@ -45,16 +50,10 @@ class Maker extends \Eccube\Entity\AbstractEntity
		private $update_date;

Author

lammn Oct 26, 2016

add variable comment

lqdung-lockon Oct 27, 2016

Check again because it was there.
=> don't change.

Entity/ProductMaker.php

-                      return $this->getMethod();
-                  }
                   private $id;

Author

lammn Oct 26, 2016

variable comment

Resource/doctrine/migration/Version201507231300.php

+                  /**
+                   * @param Schema $schema
+                   */
+                  protected function createPlgMakerForOldVersion(Schema $schema)

Author

lammn Oct 26, 2016

Add function comment

Resource/template/admin/maker.twig

+              {% block title %}商品管理{% endblock %}
+              {% block sub_title %}メーカー管理{% endblock %}
+              {% block stylesheet %}

Author

lammn Oct 26, 2016

use css file

lqdung-lockon Oct 27, 2016

don't need.

Resource/template/admin/maker.twig Outdated

+                      </div>
+                  </div>
+              {% endblock %}

                
                    No newline at end of file

Author

lammn Oct 26, 2016

end of line

appveyor.yml Outdated

+                - php app/console plugin:develop enable --code=%PLUGIN_CODE%
+              test_script:
+                - vendor\bin\phpunit.bat app/Plugin/%PLUGIN_CODE%/Tests

                
                    No newline at end of file

Author

lammn Oct 26, 2016

end of line

Tests/Web/ProductDetailTest.php

+                  public function setUp()
+                  {
+                      parent::setUp();
+                      $this->deleteAllRows(array('plg_product_maker', 'plg_maker'));

Author

lammn Oct 26, 2016

use constant for table name

lqdung-lockon Oct 27, 2016

Don't use constant because it do not reuse => don't fix.


          [FIX] Fix travis for version 3.0.9 and 3.0.10

cf2b1be

lqdung-lockon force-pushed the maker-renew branch 2 times, most recently from 940cd60 to 581097b Compare

October 27, 2016 09:08


          [FIX] Fix review.

9fd0fd2

lqdung-lockon force-pushed the maker-renew branch from 581097b to 9fd0fd2 Compare

October 27, 2016 09:58


          [ADD] Add travis check new version.

7d68325

coveralls commented Oct 31, 2016

Changes Unknown when pulling 66f25d2 on maker-renew into * on master*.

4 similar comments

coveralls commented Oct 31, 2016

Changes Unknown when pulling 66f25d2 on maker-renew into * on master*.

coveralls commented Oct 31, 2016

Changes Unknown when pulling 66f25d2 on maker-renew into * on master*.

coveralls commented Oct 31, 2016

Changes Unknown when pulling 66f25d2 on maker-renew into * on master*.

coveralls commented Oct 31, 2016

Changes Unknown when pulling 66f25d2 on maker-renew into * on master*.

coveralls commented Nov 1, 2016 •

edited

Loading

Changes Unknown when pulling 7f3c7df on maker-renew into * on master*.

lqdung-lockon added 2 commits

November 2, 2016 10:43


          [ADD] Add check plugin.

43afabe


          [FIX] Fix insight check.

158f3f4

coveralls commented Dec 2, 2016 •

edited

Loading

Changes Unknown when pulling dbcc30f on maker-renew into ** on master**.

ryo-endo and others added 2 commits

December 2, 2016 07:12


          フロントのデザインを変更(メーカー名にリンクを張るように)

d0ea844


          Merge pull request #2 from ryo-endo/lvn/maker-renew/front_design

e862a0a

フロントのデザインを変更(メーカー名にリンクを張るように)

coveralls commented Dec 2, 2016

Changes Unknown when pulling e862a0a on maker-renew into ** on master**.

2 similar comments

coveralls commented Dec 2, 2016

Changes Unknown when pulling e862a0a on maker-renew into ** on master**.

coveralls commented Dec 2, 2016 •

edited

Loading

Changes Unknown when pulling e862a0a on maker-renew into ** on master**.

lammn added 2 commits

December 2, 2016 15:03


          fix appveyor

e325a39


          Merge branch 'maker-renew' of https://github.com/eccubevn/maker-plugin …

0cf014d

…into maker-renew

coveralls commented Dec 2, 2016

Changes Unknown when pulling 0cf014d on maker-renew into ** on master**.

4 similar comments

coveralls commented Dec 2, 2016

Changes Unknown when pulling 0cf014d on maker-renew into ** on master**.

coveralls commented Dec 2, 2016

Changes Unknown when pulling 0cf014d on maker-renew into ** on master**.

coveralls commented Dec 2, 2016

Changes Unknown when pulling 0cf014d on maker-renew into ** on master**.

coveralls commented Dec 2, 2016

Changes Unknown when pulling 0cf014d on maker-renew into ** on master**.

coveralls commented Dec 2, 2016 •

edited

Loading

Changes Unknown when pulling 0cf014d on maker-renew into ** on master**.

2 similar comments

coveralls commented Dec 2, 2016

Changes Unknown when pulling 0cf014d on maker-renew into ** on master**.

coveralls commented Dec 2, 2016 •

edited

Loading

Changes Unknown when pulling 0cf014d on maker-renew into ** on master**.

kiy0taka requested changes

View reviewed changes

ServiceProvider/MakerServiceProvider.php Outdated

    
                      // 一覧・登録・修正

                      $app->match('/' . $app["config"]["admin_route"] . '/product/maker/{id}', '\\Plugin\\Maker\\Controller\\MakerController::index')

                      $app->match('/'.$app['config']['admin_route'].'/plugin/maker/{id}', '\\Plugin\\Maker\\Controller\\MakerController::index')

kiy0taka Dec 5, 2016

Don't add routing directory via $app. Use $admin->match instead of $app->match for force SSL support.
($appを使って直接ルーティングを追加するのではなく、強制SSLの対応のために$adminを使ってください。)

// 管理画面定義
$admin = $app['controllers_factory'];
// 強制SSL
if ($app['config']['force_ssl'] == Constant::ENABLED) {
    $admin->requireHttps();
}
// 一覧・登録・修正
$admin->match('/plugin/maker/{id}', '\\Plugin\\Maker\\Controller\\MakerController::index')
    ->value('id', null)->assert('id', '\d+|')
    ->bind('admin_plugin_maker_index');

...

$app->mount('/'.trim($app['config']['admin_route'], '/').'/', $admin);

See https://github.com/k-yamamura/ec-cube.github.io/blob/feature-plugin-bestpractices/plugin/controller.md#%E3%82%B3%E3%83%B3%E3%83%88%E3%83%AD%E3%83%BC%E3%83%A9%E3%83%BC%E3%81%AE%E3%83%AB%E3%83%BC%E3%83%86%E3%82%A3%E3%83%B3%E3%82%B0%E5%AE%9A%E7%BE%A9

ServiceProvider/MakerServiceProvider.php Outdated

-                      // 上
-                      $app->match('/' . $app["config"]["admin_route"] . '/product/maker/{id}/up', '\\Plugin\\Maker\\Controller\\MakerController::up')
+                      $app->delete('/'.$app['config']['admin_route'].'/plugin/maker/{id}/delete', '\\Plugin\\Maker\\Controller\\MakerController::delete')

kiy0taka Dec 5, 2016

$admin->delete

ServiceProvider/MakerServiceProvider.php Outdated

-                      $app->match('/' . $app["config"]["admin_route"] . '/product/maker/{id}/down', '\\Plugin\\Maker\\Controller\\MakerController::down')
-                          ->value('id', null)->assert('id', '\d+|')
-                          ->bind('admin_maker_down');
+                      $app->post('/'.$app['config']['admin_route'].'/plugin/maker/rank/move', '\\Plugin\\Maker\\Controller\\MakerController::moveRank')

kiy0taka Dec 5, 2016

$admin->post


          fix review

1836f39

coveralls commented Dec 5, 2016

Changes Unknown when pulling 1836f39 on maker-renew into ** on master**.

3 similar comments

coveralls commented Dec 5, 2016

Changes Unknown when pulling 1836f39 on maker-renew into ** on master**.

coveralls commented Dec 5, 2016

Changes Unknown when pulling 1836f39 on maker-renew into ** on master**.

coveralls commented Dec 5, 2016 •

edited

Loading

Changes Unknown when pulling 1836f39 on maker-renew into ** on master**.

lqdung-lockon added 2 commits

December 5, 2016 14:00


          [FIX] Fix mapping.

58261c6


          [FIX] Fix unique upgrade.

d759e20

lqdung-lockon force-pushed the maker-renew branch from 761e66d to d759e20 Compare

December 5, 2016 07:44

coveralls commented Dec 5, 2016

Changes Unknown when pulling d759e20 on maker-renew into ** on master**.

3 similar comments

coveralls commented Dec 5, 2016

Changes Unknown when pulling d759e20 on maker-renew into ** on master**.

coveralls commented Dec 5, 2016

Changes Unknown when pulling d759e20 on maker-renew into ** on master**.

coveralls commented Dec 5, 2016

Changes Unknown when pulling d759e20 on maker-renew into ** on master**.

lqdung-lockon closed this

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet