From 55b3e4dcd172298f8e6e63271ff97b12d9d98ca4 Mon Sep 17 00:00:00 2001
From: Chihiro Adachi <8196725+chihiro-adachi@users.noreply.github.com>
Date: Fri, 1 Jul 2022 12:18:30 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=E3=83=87=E3=82=B6=E3=82=A4=E3=83=B3?=
 =?UTF-8?q?=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Resource/template/admin/index.twig            |  7 +++---
 .../template/admin/order_edit_coupon.twig     |  2 +-
 Resource/template/admin/regist.twig           | 22 ++++++++-----------
 Resource/template/admin/search_category.twig  |  2 +-
 Resource/template/admin/search_product.twig   |  2 +-
 5 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/Resource/template/admin/index.twig b/Resource/template/admin/index.twig
index b37b1080..dd16224f 100644
--- a/Resource/template/admin/index.twig
+++ b/Resource/template/admin/index.twig
@@ -85,7 +85,7 @@
                                         </a>
                                     </td>
                                     <td>
-                                        <a class="" data-toggle="modal" data-target="#confirmModal-{{ Coupon.id }}" data-tooltip="tooltip" data-placement="top" title="{{ 'common.label.delete'|trans }}">
+                                        <a class="" data-bs-toggle="modal" data-bs-target="#confirmModal-{{ Coupon.id }}" data-bs-tooltip="tooltip" data-bs-placement="top" title="{{ 'common.delete'|trans }}">
                                             <i class="fa fa-close fa-lg text-secondary"></i>
                                         </a>
 
@@ -97,8 +97,7 @@
                                                     <div class="modal-header">
                                                         <h5 class="modal-title font-weight-bold">
                                                             {{ 'plugin_coupon.admin.index.delete.confirm'|trans }}</h5>
-                                                        <button class="close" type="button" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span>
-                                                        </button>
+                                                        <button class="btn-close" type="button" data-bs-dismiss="modal" aria-label="Close"></button>
                                                     </div>
                                                     <div class="modal-body text-left">
                                                         <p class="text-left">
@@ -106,7 +105,7 @@
                                                     </div>
                                                     <div class="modal-footer">
                                                         <button class="btn btn-ec-sub" type="button"
-                                                                data-dismiss="modal">{{ 'common.cancel'|trans }}
+                                                                data-bs-dismiss="modal">{{ 'common.cancel'|trans }}
                                                         </button>
                                                         <a href="{{ url('plugin_coupon_delete', {'id' : Coupon.id}) }}" class="btn btn-ec-delete" data-confirm="false" {{ csrf_token_for_anchor() }} data-method="delete">
                                                             {{ 'common.delete'|trans }}
diff --git a/Resource/template/admin/order_edit_coupon.twig b/Resource/template/admin/order_edit_coupon.twig
index edb46d34..d7c2e358 100644
--- a/Resource/template/admin/order_edit_coupon.twig
+++ b/Resource/template/admin/order_edit_coupon.twig
@@ -21,7 +21,7 @@
                     <span class="card-title">{{ 'plugin_coupon.admin.order_edit.header'|trans }}</span>
                 </div>
             </div>
-            <div class="col-4 text-right"><a data-toggle="collapse" href="#couponArea" aria-expanded="false" aria-controls="couponArea"><i class="fa fa-angle-up fa-lg"></i></a></div>
+            <div class="col-4 text-end"><a data-bs-toggle="collapse" href="#couponArea" aria-expanded="false" aria-controls="couponArea"><i class="fa fa-angle-up fa-lg"></i></a></div>
         </div>
     </div>
     <div class="collapse show ec-cardCollapse" id="couponArea">
diff --git a/Resource/template/admin/regist.twig b/Resource/template/admin/regist.twig
index 5101f3f8..24e90e2b 100644
--- a/Resource/template/admin/regist.twig
+++ b/Resource/template/admin/regist.twig
@@ -377,8 +377,8 @@
                                         <span class="card-title">{{ 'plugin_coupon.admin.regist.header.product'|trans }}</span>
                                     </div>
                                 </div>
-                                <div class="col-4 text-right">
-                                    <a data-toggle="collapse" href="#productArea" aria-expanded="false" aria-controls="productArea">
+                                <div class="col-4 text-end">
+                                    <a data-bs-toggle="collapse" href="#productArea" aria-expanded="false" aria-controls="productArea">
                                         <i class="fa fa-angle-up fa-lg"></i>
                                     </a>
                                 </div>
@@ -388,7 +388,7 @@
                         <div class="collapse show ec-cardCollapse" id="productArea">
                             <div class="card-body">
                                 <div class="text-center">
-                                    <a id="showSearchProductModal" class="btn btn-ec-regular mr-2 add" data-toggle="modal" data-target="#searchProductModal">商品の追加</a>
+                                    <a id="showSearchProductModal" class="btn btn-ec-regular mr-2 add" data-bs-toggle="modal" data-bs-target="#searchProductModal">商品の追加</a>
                                 </div>
                                 <div class="tableish" id="coupon_detail_list" data-prototype="{{ include('Coupon42/Resource/template/admin/regist_product_list_prototype.twig') }}">
                                     {% set i = 0 %}
@@ -434,8 +434,8 @@
                                         <span class="card-title">{{ 'plugin_coupon.admin.regist.header.category'|trans }}</span>
                                     </div>
                                 </div>
-                                <div class="col-4 text-right">
-                                    <a data-toggle="collapse" href="#categoryArea" aria-expanded="false" aria-controls="category_area">
+                                <div class="col-4 text-end">
+                                    <a data-bs-toggle="collapse" href="#categoryArea" aria-expanded="false" aria-controls="category_area">
                                         <i class="fa fa-angle-up fa-lg"></i>
                                     </a>
                                 </div>
@@ -445,7 +445,7 @@
                         <div class="collapse show ec-cardCollapse" style="display: block;" id="categoryArea">
                             <div class="card-body">
                                 <div class="text-center">
-                                    <a id="showSearchCategoryModal" class="btn btn-ec-regular mr-2 add" data-toggle="modal" data-target="#searchCategoryModal">カテゴリの追加</a>
+                                    <a id="showSearchCategoryModal" class="btn btn-ec-regular mr-2 add" data-bs-toggle="modal" data-bs-target="#searchCategoryModal">カテゴリの追加</a>
                                 </div>
                                 <div class="tableish"
                                      id="coupon_detail_list2"
@@ -501,7 +501,7 @@
                         <div class="col-6">
                             <div class="row align-items-center justify-content-end">
                                 <div class="col-auto">
-                                    <button type="submit" class="btn btn-primary btn-block btn-lg">{{ 'common.registration'|trans }}</button>
+                                    <button type="submit" class="btn btn-ec-conversion">{{ 'common.registration'|trans }}</button>
                                 </div>
                             </div>
                         </div>
@@ -522,9 +522,7 @@
             <div class="modal-content">
                 <div class="modal-header">
                     <h4 class="modal-title" id="searchProductModalLabel">{{ 'plugin_coupon.admin.regist.modal.product'|trans }}</h4>
-                    <button class="close" type="button" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true">×</span>
-                    </button>
+                    <button class="btn-close" type="button" data-bs-dismiss="modal" aria-label="Close"></button>
                 </div>
                 <div class="modal-body">
                     <div class="form-group">
@@ -552,9 +550,7 @@
             <div class="modal-content">
                 <div class="modal-header">
                     <h4 class="modal-title" id="searchCategoryModalLabel">{{ 'plugin_coupon.admin.regist.modal.category'|trans }}</h4>
-                    <button class="close" type="button" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true">×</span>
-                    </button>
+                    <button class="btn-close" type="button" data-bs-dismiss="modal" aria-label="Close"></button>
                 </div>
                 <div class="modal-body">
                     <div class="form-group">
diff --git a/Resource/template/admin/search_category.twig b/Resource/template/admin/search_category.twig
index 7f93d19c..fba33089 100644
--- a/Resource/template/admin/search_category.twig
+++ b/Resource/template/admin/search_category.twig
@@ -49,7 +49,7 @@
                     </td>
                     <td>
                     </td>
-                    <td class="text-right">
+                    <td class="text-end">
                         <button onclick="fnAddCategoryDetail($(this).parent().parent(), {{ id }},  '{{ name|escape('js') }}')" type="button" class="btn btn-default btn-sm">
                             {{ 'common.ok'|trans }}
                         </button>
diff --git a/Resource/template/admin/search_product.twig b/Resource/template/admin/search_product.twig
index 4560d3f5..36788ea1 100644
--- a/Resource/template/admin/search_product.twig
+++ b/Resource/template/admin/search_product.twig
@@ -87,7 +87,7 @@
                             {% endif %}
                         </span>
                     </td>
-                    <td class="text-right">
+                    <td class="text-end">
                         <button onclick="fnAddProductDetail($(this).parent().parent(), {{ Product.id }},  '{{ Product.name|escape('js') }}')" type="button" class="btn btn-default btn-sm">
                             {{ 'common.ok'|trans }}
                         </button>

From 440558797be23933d104e99a036b7e28cd7f88ce Mon Sep 17 00:00:00 2001
From: Chihiro Adachi <8196725+chihiro-adachi@users.noreply.github.com>
Date: Fri, 1 Jul 2022 12:19:38 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?=
 =?UTF-8?q?=E3=83=B3=E3=81=AE=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 7cdc367f..87b40ba0 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "ec-cube/coupon42",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "Coupon Plugin for EC-CUBE42",
   "type": "eccube-plugin",
   "extra": {