diff --git a/src/Eccube/Form/Type/Admin/OrderItemType.php b/src/Eccube/Form/Type/Admin/OrderItemType.php index d3cf5393a03..4312524f22a 100644 --- a/src/Eccube/Form/Type/Admin/OrderItemType.php +++ b/src/Eccube/Form/Type/Admin/OrderItemType.php @@ -153,7 +153,18 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'message' => 'form_error.float_only', ]), ], - ]); + ]) + ->add('point_rate', HiddenType::class, [ + 'required' => false, + 'constraints' => [ + new Assert\Range(['min' => 0]), + new Assert\Regex([ + 'pattern' => "/^\d+(\.\d+)?$/u", + 'message' => 'form_error.float_only', + ]), + ], + ]) + ; $builder ->add($builder->create('order_item_type', HiddenType::class) diff --git a/src/Eccube/Resource/locale/messages.en.yaml b/src/Eccube/Resource/locale/messages.en.yaml index 096e34d39e5..a5fe2a78205 100644 --- a/src/Eccube/Resource/locale/messages.en.yaml +++ b/src/Eccube/Resource/locale/messages.en.yaml @@ -824,6 +824,7 @@ admin.order.amount: Price admin.order.quantity: Qty admin.order.tax_rate: Tax admin.order.tax_type: Tax Type +admin.order.point_rate: Point Rate admin.order.subtotal: Subtotal admin.order.discount: Discount admin.order.delivery_fee: Shipping Charge diff --git a/src/Eccube/Resource/locale/messages.ja.yaml b/src/Eccube/Resource/locale/messages.ja.yaml index 88d96f2e33c..32cb28db798 100644 --- a/src/Eccube/Resource/locale/messages.ja.yaml +++ b/src/Eccube/Resource/locale/messages.ja.yaml @@ -824,6 +824,7 @@ admin.order.amount: 金額 admin.order.quantity: 数量 admin.order.tax_rate: 税率 admin.order.tax_type: 課税区分 +admin.order.point_rate: ポイント付与率 admin.order.subtotal: 小計 admin.order.discount: 値引き admin.order.delivery_fee: 送料 diff --git a/src/Eccube/Resource/template/admin/Order/edit.twig b/src/Eccube/Resource/template/admin/Order/edit.twig index 39b7f9a1340..cc1ec273026 100644 --- a/src/Eccube/Resource/template/admin/Order/edit.twig +++ b/src/Eccube/Resource/template/admin/Order/edit.twig @@ -744,6 +744,7 @@ file that was distributed with this source code. {# hidden values #} {{ form_widget(orderItemForm.ProductClass) }} {{ form_widget(orderItemForm.order_item_type) }} + {{ form_widget(orderItemForm.point_rate) }} {{ form_widget(orderItemForm.tax_type) }} diff --git a/src/Eccube/Resource/template/admin/Order/order_item_prototype.twig b/src/Eccube/Resource/template/admin/Order/order_item_prototype.twig index 9a8553d3dc0..cc5fc2d9a7c 100644 --- a/src/Eccube/Resource/template/admin/Order/order_item_prototype.twig +++ b/src/Eccube/Resource/template/admin/Order/order_item_prototype.twig @@ -17,5 +17,6 @@ file that was distributed with this source code. {{ form_widget(orderItemForm.price) }} {{ form_widget(orderItemForm.quantity) }} {{ form_widget(orderItemForm.tax_type) }} + {{ form_widget(orderItemForm.point_rate) }} diff --git a/src/Eccube/Resource/template/admin/Order/order_item_type.twig b/src/Eccube/Resource/template/admin/Order/order_item_type.twig index 6b1a597ff49..0cde622abfc 100644 --- a/src/Eccube/Resource/template/admin/Order/order_item_type.twig +++ b/src/Eccube/Resource/template/admin/Order/order_item_type.twig @@ -11,6 +11,12 @@ file that was distributed with this source code.