Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

フリガナ欄のオプション化 #4642

Open
wants to merge 8 commits into
base: 4.3
Choose a base branch
from
Next Next commit
管理画面に「カナ」を必須項目とするか選択できるオプションを追加
  • Loading branch information
eternalharvest committed Aug 11, 2020
commit d677265918412e643c6a567f38d58ea083ea9a9c
28 changes: 28 additions & 0 deletions app/DoctrineMigrations/Version20200810140539.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?php declare(strict_types=1);
kiy0taka marked this conversation as resolved.
Show resolved Hide resolved

namespace DoctrineMigrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;

/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20200810140539 extends AbstractMigration
{
public function up(Schema $schema) : void
{
// this up() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');

$this->addSql('ALTER TABLE dtb_base_info ADD option_require_kana TINYINT(1) DEFAULT \'1\' NOT NULL');
}

public function down(Schema $schema) : void
{
// this down() migration is auto-generated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');

$this->addSql('ALTER TABLE dtb_base_info DROP option_require_kana');
}
}
31 changes: 31 additions & 0 deletions src/Eccube/Entity/BaseInfo.php
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,13 @@ class BaseInfo extends \Eccube\Entity\AbstractEntity
*/
private $option_remember_me = true;

/**
* @var boolean
*
* @ORM\Column(name="option_require_kana", type="boolean", options={"default":true})
*/
private $option_require_kana = true;

/**
* @var string|null
*
Expand Down Expand Up @@ -901,6 +908,20 @@ public function setOptionRememberMe($optionRememberMe)
return $this;
}

/**
* Set optionRequireKana
*
* @param boolean $optionRequireKana
*
* @return BaseInfo
*/
public function setOptionRequireKana($optionRequireKana)
{
$this->option_require_kana = $optionRequireKana;

return $this;
}

/**
* Get optionRememberMe.
*
Expand All @@ -911,6 +932,16 @@ public function isOptionRememberMe()
return $this->option_remember_me;
}

/**
* Get optionRequireKana
*
* @return boolean
*/
public function isOptionRequireKana()
{
return $this->option_require_kana;
}

/**
* Set authenticationKey.
*
Expand Down
2 changes: 2 additions & 0 deletions src/Eccube/Form/Type/Admin/ShopMasterType.php
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
->add('option_mypage_order_status_display', ToggleSwitchType::class)
// 自動ログイン
->add('option_remember_me', ToggleSwitchType::class)
// カナ項目必須
->add('option_require_kana', ToggleSwitchType::class)
// お気に入り商品設定
->add('option_favorite_product', ToggleSwitchType::class)
// 在庫切れ商品を非表示にする
Expand Down
2 changes: 2 additions & 0 deletions src/Eccube/Resource/locale/messages.en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1096,6 +1096,7 @@ admin.setting.shop.shop.option_customer_activate: Temporary Customers
admin.setting.shop.shop.option_mypage_order_status_display: Display order status in My Accounts
admin.setting.shop.shop.option_favorite_product: Favorites
admin.setting.shop.shop.option_remember_me: Auto Sign-in
admin.setting.shop.shop.option_require_kana: Require Kana Field
admin.setting.shop.shop.option_product: Product Settings
admin.setting.shop.shop.nostock_hidden: Hide out-of-stock products
admin.setting.shop.shop.option_tax: Taxes
Expand Down Expand Up @@ -1571,6 +1572,7 @@ tooltip.setting.shop.shop.option_delivery_fee_by_product: If turned on, you can
tooltip.setting.shop.shop.option_customer_activate: This will register a customer as a temporary customer until email verification is completed, after which s/he will be registered as a regular customer.
tooltip.setting.shop.shop.option_favorite_product: This allows users to save their favorite products as Favorites.
tooltip.setting.shop.shop.option_remember_me: Allow customers to automatically sign in for certain period of time.
tooltip.setting.shop.shop.option_require_kana: Request customers to enter Kana names
tooltip.setting.shop.shop.option_product_tax: If turned on, you can set the tax rate per product.
tooltip.setting.shop.shop.option_point_enabled: If turned on, the point system is enabled.
tooltip.setting.shop.shop.option_point_rate: You can change the point return rate by purchase amount.
Expand Down
2 changes: 2 additions & 0 deletions src/Eccube/Resource/locale/messages.ja.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1096,6 +1096,7 @@ admin.setting.shop.shop.option_customer_activate: 仮会員機能
admin.setting.shop.shop.option_mypage_order_status_display: マイページに注文状況を表示
admin.setting.shop.shop.option_favorite_product: お気に入り商品機能
admin.setting.shop.shop.option_remember_me: 自動ログイン機能
admin.setting.shop.shop.option_require_kana: カナを必須項目にする
admin.setting.shop.shop.option_product: 商品設定
admin.setting.shop.shop.nostock_hidden: 在庫切れ商品の非表示
admin.setting.shop.shop.option_tax: 税設定
Expand Down Expand Up @@ -1571,6 +1572,7 @@ tooltip.setting.shop.shop.option_delivery_fee_by_product: ここをオンにす
tooltip.setting.shop.shop.option_customer_activate: 顧客の会員登録直後は仮会員とし、メールアドレスの確認などを経て本会員として登録できる機能です。
tooltip.setting.shop.shop.option_favorite_product: 顧客が任意の商品をお気に入りとして登録できるようにする機能です。
tooltip.setting.shop.shop.option_remember_me: 顧客に一定期間の自動ログインを許可します。
tooltip.setting.shop.shop.option_require_kana: 顧客登録時にカナの入力を必須にします。
tooltip.setting.shop.shop.option_product_tax: オンにすると、商品別に税率を設定することができるようになります。
tooltip.setting.shop.shop.option_point_enabled: オンにすると、ポイント機能を有効化できます。
tooltip.setting.shop.shop.option_point_rate: 購入金額に対するポイント付与率を編集できます。
Expand Down
11 changes: 10 additions & 1 deletion src/Eccube/Resource/template/admin/Setting/Shop/shop_master.twig
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,15 @@ file that was distributed with this source code.
{{ form_errors(form.option_remember_me) }}
</div>
</div>
<div class="row">
<div class="col-3">
<div class="d-inline-block" data-tooltip="true" data-placement="top" title="{{ 'tooltip.setting.shop.shop.option_require_kana'|trans }}"><span>{{ 'admin.setting.shop.shop.option_require_kana'|trans }}</span><i class="fa fa-question-circle fa-lg ml-1"></i></div>
</div>
<div class="col mb-2">
{{ form_widget(form.option_require_kana) }}
{{ form_errors(form.option_require_kana) }}
</div>
</div>
</div>
</div>
<div class="card rounded border-0 mb-4">
Expand Down Expand Up @@ -352,4 +361,4 @@ file that was distributed with this source code.
</div>
</div>
</form>
{% endblock %}
{% endblock %}