From 19b4a1893d48a4287893318c7afe6a58678ea5ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AE=E3=81=B6?= Date: Fri, 19 Aug 2022 12:15:23 +0900 Subject: [PATCH 1/9] =?UTF-8?q?=E5=8F=97=E6=B3=A8=E7=B7=A8=E9=9B=86?= =?UTF-8?q?=E7=94=BB=E9=9D=A2=E3=81=AB=E3=83=9D=E3=82=A4=E3=83=B3=E3=83=88?= =?UTF-8?q?=E4=BB=98=E4=B8=8E=E7=8E=87=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Form/Type/Admin/OrderItemType.php | 14 +++++++++++++- src/Eccube/Resource/locale/messages.en.yaml | 1 + src/Eccube/Resource/locale/messages.ja.yaml | 1 + src/Eccube/Resource/template/admin/Order/edit.twig | 9 +++++++++ .../PurchaseFlow/Processor/AddPointProcessor.php | 8 +++++++- 5 files changed, 31 insertions(+), 2 deletions(-) diff --git a/src/Eccube/Form/Type/Admin/OrderItemType.php b/src/Eccube/Form/Type/Admin/OrderItemType.php index d3cf5393a03..b8f6f9926e6 100644 --- a/src/Eccube/Form/Type/Admin/OrderItemType.php +++ b/src/Eccube/Form/Type/Admin/OrderItemType.php @@ -153,7 +153,19 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'message' => 'form_error.float_only', ]), ], - ]); + ]) + ->add('point_rate', IntegerType::class, [ + 'required' => false, + 'constraints' => [ + new Assert\NotBlank(), + 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..b6cf48a3057 100644 --- a/src/Eccube/Resource/template/admin/Order/edit.twig +++ b/src/Eccube/Resource/template/admin/Order/edit.twig @@ -731,6 +731,9 @@ file that was distributed with this source code.
{{ 'admin.order.tax_type'|trans }}
+ +
{{ 'admin.order.point_rate'|trans }}
+
{{ 'admin.order.subtotal'|trans }}
@@ -821,6 +824,12 @@ file that was distributed with this source code. {{ OrderItem.tax_type }} + +
+ {{ form_widget(orderItemForm.point_rate) }} + {{ form_errors(orderItemForm.point_rate) }} +
+
diff --git a/src/Eccube/Service/PurchaseFlow/Processor/AddPointProcessor.php b/src/Eccube/Service/PurchaseFlow/Processor/AddPointProcessor.php index 0c0de3daa39..08807b57cc0 100644 --- a/src/Eccube/Service/PurchaseFlow/Processor/AddPointProcessor.php +++ b/src/Eccube/Service/PurchaseFlow/Processor/AddPointProcessor.php @@ -17,6 +17,7 @@ use Eccube\Entity\ItemHolderInterface; use Eccube\Entity\ItemInterface; use Eccube\Entity\Order; +use Eccube\Entity\OrderItem; use Eccube\Repository\BaseInfoRepository; use Eccube\Service\PurchaseFlow\ItemHolderPostValidator; use Eccube\Service\PurchaseFlow\PurchaseContext; @@ -70,7 +71,12 @@ private function calculateAddPoint(ItemHolderInterface $itemHolder) // 明細ごとのポイントを集計 $totalPoint = array_reduce($itemHolder->getItems()->toArray(), function ($carry, ItemInterface $item) use ($basicPointRate) { - $pointRate = $item->isProduct() ? $item->getProductClass()->getPointRate() : null; + $pointRate = $item->isProduct() ? + (($item instanceof OrderItem) ? + $item->getPointRate(): + $item->getProductClass()->getPointRate()) + : null; + if ($pointRate === null) { $pointRate = $basicPointRate; } From f5a7858bf0ee6787b75acd36ac0d00f04cad1c2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AE=E3=81=B6?= Date: Fri, 19 Aug 2022 12:35:30 +0900 Subject: [PATCH 2/9] =?UTF-8?q?NULL=E3=82=92=E8=A8=B1=E5=AE=B9=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Form/Type/Admin/OrderItemType.php | 1 - .../PurchaseFlow/Processor/AddPointProcessor.php | 11 ++++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Eccube/Form/Type/Admin/OrderItemType.php b/src/Eccube/Form/Type/Admin/OrderItemType.php index b8f6f9926e6..0732ba2433c 100644 --- a/src/Eccube/Form/Type/Admin/OrderItemType.php +++ b/src/Eccube/Form/Type/Admin/OrderItemType.php @@ -157,7 +157,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) ->add('point_rate', IntegerType::class, [ 'required' => false, 'constraints' => [ - new Assert\NotBlank(), new Assert\Range(['min' => 0]), new Assert\Regex([ 'pattern' => "/^\d+(\.\d+)?$/u", diff --git a/src/Eccube/Service/PurchaseFlow/Processor/AddPointProcessor.php b/src/Eccube/Service/PurchaseFlow/Processor/AddPointProcessor.php index 08807b57cc0..34aaf3f4e01 100644 --- a/src/Eccube/Service/PurchaseFlow/Processor/AddPointProcessor.php +++ b/src/Eccube/Service/PurchaseFlow/Processor/AddPointProcessor.php @@ -71,11 +71,12 @@ private function calculateAddPoint(ItemHolderInterface $itemHolder) // 明細ごとのポイントを集計 $totalPoint = array_reduce($itemHolder->getItems()->toArray(), function ($carry, ItemInterface $item) use ($basicPointRate) { - $pointRate = $item->isProduct() ? - (($item instanceof OrderItem) ? - $item->getPointRate(): - $item->getProductClass()->getPointRate()) - : null; + + if ($item instanceof OrderItem) { + $pointRate = $item->getPointRate() ? $item->getPointRate() : null; + } else { + $pointRate = $item->isProduct() ? $item->getProductClass()->getPointRate() : null; + } if ($pointRate === null) { $pointRate = $basicPointRate; From 94b2014eb37205aa3edbf98777e23817911aca04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AE=E3=81=B6?= Date: Fri, 19 Aug 2022 15:59:26 +0900 Subject: [PATCH 3/9] =?UTF-8?q?=E5=95=86=E5=93=81=E3=81=AE=E3=83=9D?= =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=83=88=E4=BB=98=E4=B8=8E=E7=8E=87=E3=81=AF?= =?UTF-8?q?=E6=9C=AA=E5=AE=9F=E8=A3=85=E3=81=AA=E3=81=AE=E3=81=A7=E6=B6=88?= =?UTF-8?q?=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/PurchaseFlow/Processor/AddPointProcessor.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/Eccube/Service/PurchaseFlow/Processor/AddPointProcessor.php b/src/Eccube/Service/PurchaseFlow/Processor/AddPointProcessor.php index 34aaf3f4e01..7943ff662b3 100644 --- a/src/Eccube/Service/PurchaseFlow/Processor/AddPointProcessor.php +++ b/src/Eccube/Service/PurchaseFlow/Processor/AddPointProcessor.php @@ -72,11 +72,7 @@ private function calculateAddPoint(ItemHolderInterface $itemHolder) $totalPoint = array_reduce($itemHolder->getItems()->toArray(), function ($carry, ItemInterface $item) use ($basicPointRate) { - if ($item instanceof OrderItem) { - $pointRate = $item->getPointRate() ? $item->getPointRate() : null; - } else { - $pointRate = $item->isProduct() ? $item->getProductClass()->getPointRate() : null; - } + $pointRate = $item->getPointRate() ? $item->getPointRate() : null; if ($pointRate === null) { $pointRate = $basicPointRate; From 7991f58bc4f1969760ef0d5f3e1d0ded2b3cbc26 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Fri, 9 Sep 2022 14:16:56 +0900 Subject: [PATCH 4/9] =?UTF-8?q?=E5=87=BA=E8=8D=B7=E7=94=BB=E9=9D=A2?= =?UTF-8?q?=E3=81=AB=E9=81=B7=E7=A7=BB=E3=81=99=E3=82=8B=E3=81=A8=E3=83=9D?= =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=83=88=E4=BB=98=E4=B8=8E=E7=8E=87=E3=81=8C?= =?UTF-8?q?=E6=B6=88=E3=81=88=E3=81=A6=E3=81=97=E3=81=BE=E3=81=86=E3=81=AE?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Resource/template/admin/Order/shipping.twig | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/Eccube/Resource/template/admin/Order/shipping.twig b/src/Eccube/Resource/template/admin/Order/shipping.twig index f95460690e2..8eb7f447d99 100644 --- a/src/Eccube/Resource/template/admin/Order/shipping.twig +++ b/src/Eccube/Resource/template/admin/Order/shipping.twig @@ -537,6 +537,9 @@ file that was distributed with this source code.
{{ 'admin.order.quantity'|trans }}
+ +
{{ 'admin.order.point_rate'|trans }}
+
{{ 'admin.order.tax_rate'|trans }}
@@ -597,6 +600,12 @@ file that was distributed with this source code. {{ form_errors(orderItemForm.quantity) }}
+ +
+ {{ form_widget(orderItemForm.point_rate) }} + {{ form_errors(orderItemForm.point_rate) }} +
+
{{ OrderItem.tax_rate }}% From 2357a86483e0605b6c5e37dc294dc06c54b6e9ab Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Mon, 12 Sep 2022 16:49:07 +0900 Subject: [PATCH 5/9] =?UTF-8?q?=E3=83=9D=E3=82=A4=E3=83=B3=E3=83=88?= =?UTF-8?q?=E4=BB=98=E4=B8=8E=E7=8E=87=E3=82=92=20hidden=20=E3=81=AB?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 明細ごとにポイント付与率を変更されると、利用ポイントの控除分(200ポイント利用すると、加算ポイント -2 になる仕様)に不整合が発生する可能性が高いため、 hidden で保持するよう修正 --- src/Eccube/Resource/template/admin/Order/edit.twig | 10 +--------- src/Eccube/Resource/template/admin/Order/shipping.twig | 10 +--------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/src/Eccube/Resource/template/admin/Order/edit.twig b/src/Eccube/Resource/template/admin/Order/edit.twig index b6cf48a3057..cc1ec273026 100644 --- a/src/Eccube/Resource/template/admin/Order/edit.twig +++ b/src/Eccube/Resource/template/admin/Order/edit.twig @@ -731,9 +731,6 @@ file that was distributed with this source code.
{{ 'admin.order.tax_type'|trans }}
- -
{{ 'admin.order.point_rate'|trans }}
-
{{ 'admin.order.subtotal'|trans }}
@@ -747,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) }} @@ -824,12 +822,6 @@ file that was distributed with this source code. {{ OrderItem.tax_type }}
- -
- {{ form_widget(orderItemForm.point_rate) }} - {{ form_errors(orderItemForm.point_rate) }} -
-
diff --git a/src/Eccube/Resource/template/admin/Order/shipping.twig b/src/Eccube/Resource/template/admin/Order/shipping.twig index 8eb7f447d99..467106a295a 100644 --- a/src/Eccube/Resource/template/admin/Order/shipping.twig +++ b/src/Eccube/Resource/template/admin/Order/shipping.twig @@ -537,9 +537,6 @@ file that was distributed with this source code.
{{ 'admin.order.quantity'|trans }}
- -
{{ 'admin.order.point_rate'|trans }}
-
{{ 'admin.order.tax_rate'|trans }}
@@ -560,6 +557,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) }} {{ form_widget(orderItemForm.tax_rate, {'type': 'hidden'}) }} @@ -600,12 +598,6 @@ file that was distributed with this source code. {{ form_errors(orderItemForm.quantity) }}
- -
- {{ form_widget(orderItemForm.point_rate) }} - {{ form_errors(orderItemForm.point_rate) }} -
-
{{ OrderItem.tax_rate }}% From 41cca04fe48d51fd6bde1895e0c2cf9f434c4dcf Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Mon, 12 Sep 2022 16:51:06 +0900 Subject: [PATCH 6/9] =?UTF-8?q?=E3=83=9D=E3=82=A4=E3=83=B3=E3=83=88?= =?UTF-8?q?=E6=98=8E=E7=B4=B0=E8=BF=BD=E5=8A=A0=E6=99=82=E3=81=AB=E3=83=9D?= =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=83=88=E4=BB=98=E4=B8=8E=E7=8E=87=E3=82=92?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 商品明細が取得できる場合は, 商品明細に設定されたポイント付与率を設定 - 商品明細が取得できない場合は, 店舗基本情報のポイント付与率を設定 --- src/Eccube/Form/Type/Admin/OrderItemType.php | 2 +- src/Eccube/Service/PointHelper.php | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/Eccube/Form/Type/Admin/OrderItemType.php b/src/Eccube/Form/Type/Admin/OrderItemType.php index 0732ba2433c..4312524f22a 100644 --- a/src/Eccube/Form/Type/Admin/OrderItemType.php +++ b/src/Eccube/Form/Type/Admin/OrderItemType.php @@ -154,7 +154,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ]), ], ]) - ->add('point_rate', IntegerType::class, [ + ->add('point_rate', HiddenType::class, [ 'required' => false, 'constraints' => [ new Assert\Range(['min' => 0]), diff --git a/src/Eccube/Service/PointHelper.php b/src/Eccube/Service/PointHelper.php index 3b006612004..c545e7d743a 100644 --- a/src/Eccube/Service/PointHelper.php +++ b/src/Eccube/Service/PointHelper.php @@ -122,9 +122,20 @@ public function addPointDiscountItem(ItemHolderInterface $itemHolder, $discount) $TaxInclude = $this->entityManager->find(TaxDisplayType::class, TaxDisplayType::INCLUDED); $Taxation = $this->entityManager->find(TaxType::class, TaxType::NON_TAXABLE); + // 商品明細に保持しているポイント付与率を取得して設定する. + // 商品明細が取得できない場合は店舗基本情報のポイント付与率を設定する. + $Baseinfo = $this->baseInfoRepository->get(); + $pointRate = $Baseinfo->getBasicPointRate(); + // 商品別ポイントは未実装なので, 商品明細のポイント付与率はすべて同じ値が設定されているはず + $ProductOrderItem = $itemHolder->getItems()->getProductClasses()->current(); + if ($ProductOrderItem instanceof OrderItem) { + $pointRate = $ProductOrderItem->getPointRate(); + } + $OrderItem = new OrderItem(); $OrderItem->setProductName($DiscountType->getName()) ->setPrice($discount) + ->setPointRate($pointRate) ->setQuantity(1) ->setTax(0) ->setTaxRate(0) From 2e9cfcdade5bd13cd0006aa46fee41f135996600 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Tue, 13 Sep 2022 13:44:07 +0900 Subject: [PATCH 7/9] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=94=BB=E9=9D=A2?= =?UTF-8?q?=E3=81=8B=E3=82=89=E5=8F=97=E6=B3=A8=E5=95=86=E5=93=81=E6=98=8E?= =?UTF-8?q?=E7=B4=B0=E3=82=92=E8=BF=BD=E5=8A=A0=E3=81=97=E3=81=9F=E5=A0=B4?= =?UTF-8?q?=E5=90=88=E3=81=AB=E3=83=9D=E3=82=A4=E3=83=B3=E3=83=88=E4=BB=98?= =?UTF-8?q?=E4=B8=8E=E7=8E=87=E3=81=8C=E8=A8=AD=E5=AE=9A=E3=81=95=E3=82=8C?= =?UTF-8?q?=E3=81=AA=E3=81=84=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resource/template/admin/Order/order_item_prototype.twig | 1 + src/Eccube/Resource/template/admin/Order/search_product.twig | 2 ++ src/Eccube/Service/PointHelper.php | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) 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/search_product.twig b/src/Eccube/Resource/template/admin/Order/search_product.twig index 2872348d3de..503f5f2fa4a 100644 --- a/src/Eccube/Resource/template/admin/Order/search_product.twig +++ b/src/Eccube/Resource/template/admin/Order/search_product.twig @@ -86,6 +86,7 @@ file that was distributed with this source code. } } + var point_rate = '{{ BaseInfo.basic_point_rate }}'; var prototype = $collectionHolder.data('prototype'); index++; var newForm = prototype.replace(/__name__/g, index); @@ -97,6 +98,7 @@ file that was distributed with this source code. $($lastRow).find(formIdPrefix + index + '_quantity').val(quantity); $($lastRow).find(formIdPrefix + index + '_order_item_type').val(type); $($lastRow).find(formIdPrefix + index + '_product_name').val(product_name); + $($lastRow).find(formIdPrefix + index + '_point_rate').val(point_rate); // モーダル閉じる. $('#searchProductModal').modal('hide'); diff --git a/src/Eccube/Service/PointHelper.php b/src/Eccube/Service/PointHelper.php index c545e7d743a..6bc0cb8c988 100644 --- a/src/Eccube/Service/PointHelper.php +++ b/src/Eccube/Service/PointHelper.php @@ -128,7 +128,7 @@ public function addPointDiscountItem(ItemHolderInterface $itemHolder, $discount) $pointRate = $Baseinfo->getBasicPointRate(); // 商品別ポイントは未実装なので, 商品明細のポイント付与率はすべて同じ値が設定されているはず $ProductOrderItem = $itemHolder->getItems()->getProductClasses()->current(); - if ($ProductOrderItem instanceof OrderItem) { + if ($ProductOrderItem instanceof OrderItem && $ProductOrderItem->getPointRate() !== null) { $pointRate = $ProductOrderItem->getPointRate(); } From bb75a2e2017d82c6b291b37c66636a2030ed7f34 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Wed, 14 Sep 2022 14:00:05 +0900 Subject: [PATCH 8/9] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=94=BB=E9=9D=A2?= =?UTF-8?q?=E3=81=8B=E3=82=89=E5=95=86=E5=93=81=E6=98=8E=E7=B4=B0=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E3=81=97=E3=81=9F=E5=A0=B4=E5=90=88,=20?= =?UTF-8?q?=E6=97=A2=E5=AD=98=E6=98=8E=E7=B4=B0=E3=81=8B=E3=82=89=E3=83=9D?= =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=83=88=E4=BB=98=E4=B8=8E=E7=8E=87=E3=82=92?= =?UTF-8?q?=E5=8F=96=E5=BE=97=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resource/template/admin/Order/search_product.twig | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Eccube/Resource/template/admin/Order/search_product.twig b/src/Eccube/Resource/template/admin/Order/search_product.twig index 503f5f2fa4a..76c2e490375 100644 --- a/src/Eccube/Resource/template/admin/Order/search_product.twig +++ b/src/Eccube/Resource/template/admin/Order/search_product.twig @@ -86,7 +86,12 @@ file that was distributed with this source code. } } - var point_rate = '{{ BaseInfo.basic_point_rate }}'; + // 既存の受注明細のポイント付与率を取得する. 取得できない場合は店舗基本情報の付与率を設定する. + var point_rate = $('input[type=hidden][id$=point_rate]').first().val(); + if (point_rate === undefined) { + point_rate = '{{ BaseInfo.basic_point_rate }}'; + } + var prototype = $collectionHolder.data('prototype'); index++; var newForm = prototype.replace(/__name__/g, index); From 033af2f8e6f8d6ef69169db0713f0f3975eb692d Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Wed, 14 Sep 2022 17:08:43 +0900 Subject: [PATCH 9/9] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=94=BB=E9=9D=A2?= =?UTF-8?q?=E3=81=8B=E3=82=89=E5=80=A4=E5=BC=95=E6=98=8E=E7=B4=B0=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E3=81=97=E3=81=9F=E5=A0=B4=E5=90=88,=20?= =?UTF-8?q?=E6=97=A2=E5=AD=98=E6=98=8E=E7=B4=B0=E3=81=8B=E3=82=89=E3=83=9D?= =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=83=88=E4=BB=98=E4=B8=8E=E7=8E=87=E3=82=92?= =?UTF-8?q?=E5=8F=96=E5=BE=97=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resource/template/admin/Order/order_item_type.twig | 7 +++++++ 1 file changed, 7 insertions(+) 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.