From 0758ee59f469f0751f642b56e60f81e634223b32 Mon Sep 17 00:00:00 2001 From: pineray Date: Thu, 18 Aug 2022 16:43:34 +0900 Subject: [PATCH 1/2] =?UTF-8?q?Bootstrap5=20=E3=81=B8=E3=81=AE=E7=A7=BB?= =?UTF-8?q?=E8=A1=8C=E6=BC=8F=E3=82=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Command/PluginGenerateCommand.php | 2 +- .../template/admin/Content/block.twig | 6 +- .../template/admin/Content/block_edit.twig | 12 +-- .../Resource/template/admin/Content/css.twig | 4 +- .../Resource/template/admin/Content/file.twig | 2 +- .../Resource/template/admin/Content/js.twig | 4 +- .../template/admin/Content/layout.twig | 14 +-- .../template/admin/Content/layout_block.twig | 2 +- .../template/admin/Content/layout_list.twig | 4 +- .../template/admin/Content/news_edit.twig | 4 +- .../Resource/template/admin/Content/page.twig | 4 +- .../template/admin/Content/page_edit.twig | 18 ++-- .../admin/Customer/delivery_edit.twig | 8 +- .../template/admin/Customer/edit.twig | 24 ++--- .../template/admin/Customer/index.twig | 16 ++-- .../admin/Order/confirmationModal_js.twig | 2 +- .../template/admin/Order/csv_shipping.twig | 8 +- .../Resource/template/admin/Order/edit.twig | 94 +++++++++---------- .../Resource/template/admin/Order/index.twig | 24 ++--- .../Resource/template/admin/Order/mail.twig | 8 +- .../template/admin/Order/mail_confirm.twig | 2 +- .../template/admin/Order/search_customer.twig | 4 +- .../template/admin/Order/shipping.twig | 34 +++---- .../template/admin/Product/category.twig | 14 +-- .../admin/Product/class_category.twig | 16 ++-- .../template/admin/Product/class_name.twig | 14 +-- .../template/admin/Product/csv_category.twig | 8 +- .../template/admin/Product/csv_product.twig | 12 +-- .../template/admin/Product/index.twig | 18 ++-- .../template/admin/Product/product.twig | 60 ++++++------ .../template/admin/Product/product_class.twig | 6 +- .../admin/Product/product_class_popup.twig | 6 +- .../Resource/template/admin/Product/tag.twig | 10 +- .../template/admin/Setting/Shop/calendar.twig | 12 +-- .../template/admin/Setting/Shop/csv.twig | 4 +- .../template/admin/Setting/Shop/delivery.twig | 10 +- .../admin/Setting/Shop/delivery_edit.twig | 8 +- .../Setting/Shop/delivery_time_prototype.twig | 12 +-- .../template/admin/Setting/Shop/mail.twig | 6 +- .../admin/Setting/Shop/order_status.twig | 8 +- .../template/admin/Setting/Shop/payment.twig | 10 +- .../admin/Setting/Shop/payment_edit.twig | 4 +- .../admin/Setting/Shop/shop_master.twig | 48 +++++----- .../template/admin/Setting/Shop/tax_rule.twig | 22 ++--- .../template/admin/Setting/System/log.twig | 2 +- .../admin/Setting/System/login_history.twig | 8 +- .../admin/Setting/System/masterdata.twig | 2 +- .../template/admin/Setting/System/member.twig | 4 +- .../admin/Setting/System/member_edit.twig | 20 ++-- .../admin/Setting/System/security.twig | 10 +- .../template/admin/Setting/System/system.twig | 6 +- .../Setting/System/two_factor_auth_edit.twig | 4 +- .../Resource/template/admin/Store/plugin.twig | 6 +- .../template/admin/Store/plugin_confirm.twig | 2 +- .../admin/Store/plugin_confirm_uninstall.twig | 2 +- .../template/admin/Store/plugin_search.twig | 2 +- .../admin/Store/plugin_search_panel.twig | 8 +- .../template/admin/Store/plugin_table.twig | 2 +- .../admin/Store/plugin_table_official.twig | 2 +- .../template/admin/Store/template_add.twig | 6 +- src/Eccube/Resource/template/admin/alert.twig | 20 ++-- src/Eccube/Resource/template/admin/error.twig | 2 +- src/Eccube/Resource/template/admin/index.twig | 22 ++--- 63 files changed, 365 insertions(+), 373 deletions(-) diff --git a/src/Eccube/Command/PluginGenerateCommand.php b/src/Eccube/Command/PluginGenerateCommand.php index 8bf720cec55..0d6e9ecdd23 100644 --- a/src/Eccube/Command/PluginGenerateCommand.php +++ b/src/Eccube/Command/PluginGenerateCommand.php @@ -568,7 +568,7 @@ public function configureOptions(OptionsResolver \$resolver)
名前必須
+ class="badge bg-primary ml-1">必須
{{ form_widget(form.name) }} {{ form_errors(form.name) }} diff --git a/src/Eccube/Resource/template/admin/Content/block.twig b/src/Eccube/Resource/template/admin/Content/block.twig index e71fd07bd32..d2304ec9974 100644 --- a/src/Eccube/Resource/template/admin/Content/block.twig +++ b/src/Eccube/Resource/template/admin/Content/block.twig @@ -79,14 +79,14 @@ file that was distributed with this source code.
{% if Block.deletable %}
-
+
@@ -99,7 +99,7 @@ file that was distributed with this source code.
{{ 'admin.common.delete_modal__title'|trans }}
diff --git a/src/Eccube/Resource/template/admin/Content/block_edit.twig b/src/Eccube/Resource/template/admin/Content/block_edit.twig index 57706a09a30..b59e1b07a30 100644 --- a/src/Eccube/Resource/template/admin/Content/block_edit.twig +++ b/src/Eccube/Resource/template/admin/Content/block_edit.twig @@ -77,9 +77,9 @@ file that was distributed with this source code.
- {{ 'admin.content.block_name'|trans }} + {{ 'admin.content.block_name'|trans }}
- {{ 'admin.common.required'|trans }} + {{ 'admin.common.required'|trans }}
{{ form_widget(form.name) }} @@ -89,9 +89,9 @@ file that was distributed with this source code.
- {{ 'admin.content.block_file_name'|trans }} + {{ 'admin.content.block_file_name'|trans }}
- {{ 'admin.common.required'|trans }} + {{ 'admin.common.required'|trans }}
{% if deletable %} @@ -108,9 +108,9 @@ file that was distributed with this source code.
- {{ 'admin.content.block_source_code'|trans }} + {{ 'admin.content.block_source_code'|trans }}
- {{ 'admin.common.required'|trans }} + {{ 'admin.common.required'|trans }}
diff --git a/src/Eccube/Resource/template/admin/Content/css.twig b/src/Eccube/Resource/template/admin/Content/css.twig index d6eddee8329..575d1290738 100644 --- a/src/Eccube/Resource/template/admin/Content/css.twig +++ b/src/Eccube/Resource/template/admin/Content/css.twig @@ -92,9 +92,9 @@
- {{ 'admin.content.page_source_code'|trans }} + {{ 'admin.content.page_source_code'|trans }}
- {{ 'admin.common.required'|trans }} + {{ 'admin.common.required'|trans }}
diff --git a/src/Eccube/Resource/template/admin/Content/file.twig b/src/Eccube/Resource/template/admin/Content/file.twig index af14d6e6dd5..07dc94080e9 100644 --- a/src/Eccube/Resource/template/admin/Content/file.twig +++ b/src/Eccube/Resource/template/admin/Content/file.twig @@ -112,7 +112,7 @@ file that was distributed with this source code.
{{ 'admin.content.file.add_file__card_title'|trans }}
-
{{ 'admin.content.file.add_file'|trans }}
+
{{ 'admin.content.file.add_file'|trans }}
{{ form_widget(form.file) }}{# TODO input type="file" の装飾 #} diff --git a/src/Eccube/Resource/template/admin/Content/js.twig b/src/Eccube/Resource/template/admin/Content/js.twig index 75de9b64e27..9fd2a0d772b 100644 --- a/src/Eccube/Resource/template/admin/Content/js.twig +++ b/src/Eccube/Resource/template/admin/Content/js.twig @@ -89,9 +89,9 @@
- {{ 'admin.content.page_source_code'|trans }} + {{ 'admin.content.page_source_code'|trans }}
- {{ 'admin.common.required'|trans }} + {{ 'admin.common.required'|trans }}
diff --git a/src/Eccube/Resource/template/admin/Content/layout.twig b/src/Eccube/Resource/template/admin/Content/layout.twig index 763d2950679..a0804dcc2b1 100644 --- a/src/Eccube/Resource/template/admin/Content/layout.twig +++ b/src/Eccube/Resource/template/admin/Content/layout.twig @@ -197,7 +197,7 @@ file that was distributed with this source code.
-
{{ 'admin.content.layout_name'|trans }}{{ 'admin.common.required'|trans }}
+
{{ 'admin.content.layout_name'|trans }}{{ 'admin.common.required'|trans }}
{{ form_widget(form.name) }} {{ form_errors(form.name) }} @@ -239,7 +239,7 @@ file that was distributed with this source code.
-
{{ 'admin.content.layout_edit__card_title'|trans }}
+
{{ 'admin.content.layout_edit__card_title'|trans }}
@@ -442,7 +442,7 @@ file that was distributed with this source code. class="block sort{% if loop.first %} first{% endif %} border border-ec-gray bg-ec-lightGray p-2 mb-2">
- +
diff --git a/src/Eccube/Resource/template/admin/Content/layout_block.twig b/src/Eccube/Resource/template/admin/Content/layout_block.twig index 302ed316638..9af04d30fd8 100644 --- a/src/Eccube/Resource/template/admin/Content/layout_block.twig +++ b/src/Eccube/Resource/template/admin/Content/layout_block.twig @@ -11,7 +11,7 @@ file that was distributed with this source code.
- + + {{ Layout.name }}
{% if Layout.isDefault() == false %} -
diff --git a/src/Eccube/Resource/template/admin/Content/page_edit.twig b/src/Eccube/Resource/template/admin/Content/page_edit.twig index e3e1cf837be..168db444dd8 100644 --- a/src/Eccube/Resource/template/admin/Content/page_edit.twig +++ b/src/Eccube/Resource/template/admin/Content/page_edit.twig @@ -85,7 +85,7 @@ file that was distributed with this source code.
{{ 'admin.content.page_name'|trans }} - {{ 'admin.common.required'|trans }} + {{ 'admin.common.required'|trans }}
{{ form_widget(form.name) }} @@ -96,7 +96,7 @@ file that was distributed with this source code.
{{ 'admin.content.page_url'|trans }} - {{ 'admin.common.required'|trans }} + {{ 'admin.common.required'|trans }}
@@ -115,9 +115,9 @@ file that was distributed with this source code.
- {{ 'admin.content.page_file_name'|trans }} + {{ 'admin.content.page_file_name'|trans }}
- {{ 'admin.common.required'|trans }} + {{ 'admin.common.required'|trans }}
@@ -141,9 +141,9 @@ file that was distributed with this source code.
- {{ 'admin.content.page_source_code'|trans }} + {{ 'admin.content.page_source_code'|trans }}
- {{ 'admin.common.required'|trans }} + {{ 'admin.common.required'|trans }}
@@ -179,7 +179,7 @@ file that was distributed with this source code. title="{{ 'tooltip.content.page_layout'|trans }}"> {{ 'admin.content.page_layout__card_title'|trans }} - +
@@ -218,7 +218,7 @@ file that was distributed with this source code.
{{ 'admin.content.page_meta__card_title'|trans }} - +
@@ -267,7 +267,7 @@ file that was distributed with this source code.
{{ 'admin.content.page_meta_metatag'|trans }} - +
diff --git a/src/Eccube/Resource/template/admin/Customer/delivery_edit.twig b/src/Eccube/Resource/template/admin/Customer/delivery_edit.twig index f2ff1268a45..6b997b8d498 100644 --- a/src/Eccube/Resource/template/admin/Customer/delivery_edit.twig +++ b/src/Eccube/Resource/template/admin/Customer/delivery_edit.twig @@ -54,7 +54,7 @@ file that was distributed with this source code.
{{ 'admin.common.name'|trans }} - {{ 'admin.common.required'|trans }} + {{ 'admin.common.required'|trans }}
@@ -73,7 +73,7 @@ file that was distributed with this source code.
{{ 'admin.common.kana'|trans }} - {{ 'admin.common.required'|trans }} + {{ 'admin.common.required'|trans }}
@@ -102,7 +102,7 @@ file that was distributed with this source code.
{{ 'admin.common.address'|trans }} - {{ 'admin.common.required'|trans }} + {{ 'admin.common.required'|trans }}
@@ -148,7 +148,7 @@ file that was distributed with this source code.
{{ 'admin.common.phone_number'|trans }} - {{ 'admin.common.required'|trans }} + {{ 'admin.common.required'|trans }}
{{ form_widget(form.phone_number) }} diff --git a/src/Eccube/Resource/template/admin/Customer/edit.twig b/src/Eccube/Resource/template/admin/Customer/edit.twig index 79744b26da7..90bcc1db476 100644 --- a/src/Eccube/Resource/template/admin/Customer/edit.twig +++ b/src/Eccube/Resource/template/admin/Customer/edit.twig @@ -52,7 +52,7 @@ file that was distributed with this source code.
{{ 'admin.customer.customer_id'|trans }} - +
@@ -63,7 +63,7 @@ file that was distributed with this source code.
{{ 'admin.common.name'|trans }} - {{ 'admin.common.required'|trans }} + {{ 'admin.common.required'|trans }}
@@ -87,7 +87,7 @@ file that was distributed with this source code.
{{ 'admin.common.kana'|trans }} - {{ 'admin.common.required'|trans }} + {{ 'admin.common.required'|trans }}
@@ -119,7 +119,7 @@ file that was distributed with this source code.
{{ 'admin.common.address'|trans }}{{ 'admin.common.required'|trans }} + class="badge bg-primary ms-1">{{ 'admin.common.required'|trans }}
@@ -157,7 +157,7 @@ file that was distributed with this source code.
{{ 'admin.common.mail_address'|trans }} - {{ 'admin.common.required'|trans }} + {{ 'admin.common.required'|trans }}
{{ form_widget(form.email) }} @@ -167,7 +167,7 @@ file that was distributed with this source code.
{{ 'admin.common.phone_number'|trans }} - {{ 'admin.common.required'|trans }} + {{ 'admin.common.required'|trans }}
{{ form_widget(form.phone_number) }} @@ -177,7 +177,7 @@ file that was distributed with this source code.
{{ 'admin.common.password'|trans }} - {{ 'admin.common.required'|trans }} + {{ 'admin.common.required'|trans }}
{{ form_widget(form.plain_password.first, { type : 'password'}) }} @@ -187,7 +187,7 @@ file that was distributed with this source code.
{{ 'admin.common.password_for_confirmation'|trans }} - {{ 'admin.common.required'|trans }} + {{ 'admin.common.required'|trans }}
{{ form_widget(form.plain_password.second, { type : 'password'}) }} @@ -262,7 +262,7 @@ file that was distributed with this source code. title="{{ 'tooltip.customer.customer_address'|trans }}"> {{ 'admin.customer.customer_address'|trans }} - +
@@ -313,7 +313,7 @@ file that was distributed with this source code.
{{ 'admin.common.delete_modal__title'|trans }}
@@ -375,7 +375,7 @@ file that was distributed with this source code. title="{{ 'tooltip.customer.purchase_history'|trans }}"> {{ 'admin.customer.purchase_history'|trans }} - +
@@ -435,7 +435,7 @@ file that was distributed with this source code.
{{ 'admin.common.shop_memo'|trans }} - +
diff --git a/src/Eccube/Resource/template/admin/Customer/index.twig b/src/Eccube/Resource/template/admin/Customer/index.twig index 1e847c4829a..214942f118c 100644 --- a/src/Eccube/Resource/template/admin/Customer/index.twig +++ b/src/Eccube/Resource/template/admin/Customer/index.twig @@ -25,11 +25,11 @@ file that was distributed with this source code.
- + {{ form_widget(searchForm.multi) }} {{ form_errors(searchForm.multi) }}
- +
@@ -224,7 +224,7 @@ file that was distributed with this source code.
{% if pagination %} - {{ 'admin.common.search_result'|trans({'%count%':pagination.totalItemCount}) }} + {{ 'admin.common.search_result'|trans({'%count%':pagination.totalItemCount}) }} {% endif %}
@@ -239,7 +239,7 @@ file that was distributed with this source code.
{#Dropdown page count#} -
+
{% for status in OrderStatuses %} @@ -413,7 +413,7 @@ file that was distributed with this source code. {% endfor %}
-
@@ -433,7 +433,7 @@ file that was distributed with this source code.
@@ -448,7 +448,7 @@ file that was distributed with this source code.
@@ -630,7 +630,7 @@ file that was distributed with this source code.
- + 

                                         

diff --git a/src/Eccube/Resource/template/admin/Order/mail.twig b/src/Eccube/Resource/template/admin/Order/mail.twig
index f3c9ebfe770..da35f984aa1 100644
--- a/src/Eccube/Resource/template/admin/Order/mail.twig
+++ b/src/Eccube/Resource/template/admin/Order/mail.twig
@@ -53,7 +53,7 @@ $(function() {
                 

                     

                         

-                            
{{ 'admin.order.mail_destination_info'|trans }}

+                            
{{ 'admin.order.mail_destination_info'|trans }}

                         

                         

                     

@@ -103,7 +103,7 @@ $(function() {
                         

                             

                                 

-                                    {{ 'admin.order.mail_template'|trans }}
+                                    {{ 'admin.order.mail_template'|trans }}
                                 

                             

                             

@@ -114,9 +114,9 @@ $(function() {
                         

                             

                                 

-                                    {{ 'admin.order.mail_subject'|trans }}
+                                    {{ 'admin.order.mail_subject'|trans }}
                                 

-                                {{ 'admin.common.required'|trans }}
+                                {{ 'admin.common.required'|trans }}
                             

                             

                                 {{ form_widget(form.mail_subject) }}
diff --git a/src/Eccube/Resource/template/admin/Order/mail_confirm.twig b/src/Eccube/Resource/template/admin/Order/mail_confirm.twig
index 2132661313c..6122301c5d5 100644
--- a/src/Eccube/Resource/template/admin/Order/mail_confirm.twig
+++ b/src/Eccube/Resource/template/admin/Order/mail_confirm.twig
@@ -101,7 +101,7 @@ $(function() {
                             

                         

                         

-                            
{{ 'admin.order.mail_subject'|trans }}{{ 'admin.common.required'|trans }}

+                            
{{ 'admin.order.mail_subject'|trans }}{{ 'admin.common.required'|trans }}

                             

                                 {{ form.mail_subject.vars.data }}
                                 {{ form_widget(form.mail_subject, { type : 'hidden' }) }}
diff --git a/src/Eccube/Resource/template/admin/Order/search_customer.twig b/src/Eccube/Resource/template/admin/Order/search_customer.twig
index 6f6a9358ad5..f3705947409 100644
--- a/src/Eccube/Resource/template/admin/Order/search_customer.twig
+++ b/src/Eccube/Resource/template/admin/Order/search_customer.twig
@@ -64,7 +64,7 @@ file that was distributed with this source code.
         {{ 'admin.common.name'|trans }}
         {{ 'admin.common.phone_number'|trans }}
         {{ 'admin.common.mail_address'|trans }}
-         
+         
     
     
     
@@ -75,7 +75,7 @@ file that was distributed with this source code.
             {{ Customer.phone_number }}
             {{ Customer.email }}
             
-                

+                

                     
                 

             
diff --git a/src/Eccube/Resource/template/admin/Order/shipping.twig b/src/Eccube/Resource/template/admin/Order/shipping.twig
index f95460690e2..640f8a69601 100644
--- a/src/Eccube/Resource/template/admin/Order/shipping.twig
+++ b/src/Eccube/Resource/template/admin/Order/shipping.twig
@@ -159,7 +159,7 @@ file that was distributed with this source code.
                     

                         
{{ 'admin.order.add_product_item'|trans }}

                         
                     

                     

@@ -207,7 +207,7 @@ file that was distributed with this source code.
                                 
                             

                             

-                                
+                                
                                 

                                     

                                 

@@ -244,7 +244,7 @@ file that was distributed with this source code.
                                     

                                         {% if form.shippings|length > 1 %}
                                             
-                                            
+                                            
                                                 
                                                 {{ 'admin.order.delete_shipping'|trans }}
                                             
@@ -255,7 +255,7 @@ file that was distributed with this source code.
                                                             

                                                                 
{{ 'admin.order.delete_shipping_error__confirm_title'|trans }}

                                                                 
                                                             

                                                             

@@ -268,7 +268,7 @@ file that was distributed with this source code.
                                                             

                                                                 
{{ 'admin.common.delete_modal__title'|trans }}

                                                                 
                                                             

                                                             

@@ -316,7 +316,7 @@ file that was distributed with this source code.
                                             

                                                 
@@ -336,7 +336,7 @@ file that was distributed with this source code.
                                             

                                                 
@@ -356,7 +356,7 @@ file that was distributed with this source code.
                                             

                                                 
@@ -393,7 +393,7 @@ file that was distributed with this source code.
                                             

                                                 
@@ -431,7 +431,7 @@ file that was distributed with this source code.
                                             

                                                 
                                                 

@@ -443,7 +443,7 @@ file that was distributed with this source code.
                                         

                                             

                                                 
                                                 

@@ -453,7 +453,7 @@ file that was distributed with this source code.
                                             

                                             

                                                 
                                                 

@@ -463,7 +463,7 @@ file that was distributed with this source code.
                                             

                                             

                                                 
                                                 

@@ -489,7 +489,7 @@ file that was distributed with this source code.
                                             

                                             

                                                 
                                                 

@@ -498,7 +498,7 @@ file that was distributed with this source code.
                                             

                                             

                                                 
                                                 

@@ -615,7 +615,7 @@ file that was distributed with this source code.
                                                     
                                                         

                                                             

-                                                                

                                                                     
                                                                         
@@ -628,7 +628,7 @@ file that was distributed with this source code.
                                                                             

                                                                                 
{{ 'admin.common.delete_modal__title'|trans }}

                                                                                 
                                                                             

                                                                             

diff --git a/src/Eccube/Resource/template/admin/Product/category.twig b/src/Eccube/Resource/template/admin/Product/category.twig
index 5a013830f94..d976c0e23ab 100644
--- a/src/Eccube/Resource/template/admin/Product/category.twig
+++ b/src/Eccube/Resource/template/admin/Product/category.twig
@@ -160,11 +160,11 @@ file that was distributed with this source code.
                 

                     

                         
-                            
+                            
                             {{ 'admin.common.csv_download'|trans }}
                         
                         
-                            
+                            
                             {{ 'admin.setting.shop.csv_setting'|trans }}
                         
                     

@@ -234,23 +234,23 @@ file that was distributed with this source code.
                                                         {{ Category.name }}
                                                     

                                                     

-                                                        
                                                             
                                                         
-                                                        
                                                             
                                                         
-                                                        
                                                             
                                                         
-                                                        

                                                             
                                             
                                         

                                         

diff --git a/src/Eccube/Resource/template/admin/Product/class_category.twig b/src/Eccube/Resource/template/admin/Product/class_category.twig
index 6c7a37bfc21..e632f1c844a 100644
--- a/src/Eccube/Resource/template/admin/Product/class_category.twig
+++ b/src/Eccube/Resource/template/admin/Product/class_category.twig
@@ -157,7 +157,7 @@ file that was distributed with this source code.
                                 
  • 
                                     
    
                                         
    {{ 'admin.product.class_category_name__short'|trans }}
    
-                                        
    
+                                        
    
                                             {{ form_widget(form._token) }}
                                             {{ form_widget(form.name) }}
                                             {{ form_errors(form.name) }}
@@ -186,21 +186,21 @@ file that was distributed with this source code.
                                             
    {{ ClassCategory.id }}
    
                                             
    {{ ClassCategory.name }} ［{{ 'admin.product.class_category__backend_name'|trans }}{{ 'admin.common.separator__colon'|trans }}{{ ClassCategory.backend_name }}］
    
                                             
    
-                                                
+                                                
                                                     
                                                 
-                                                
+                                                
                                                     
                                                 
-                                                
+                                                
                                                     
                                                 
-                                                
                                                     
                                                 
-                                                
    
+                                                
    
                                                     
@@ -211,7 +211,7 @@ file that was distributed with this source code.
                                         
    
                                         
                                             {{ form_widget(forms[ClassCategory.id]._token) }}
-                                            
    
+                                            
    
                                                 {{ form_widget(forms[ClassCategory.id].name, {'attr': {'data-origin-value': forms[ClassCategory.id].name.vars.value}}) }}
                                                 {{ form_errors(forms[ClassCategory.id].name) }}
                                             
    
@@ -241,7 +241,7 @@ file that was distributed with this source code.
                                                 {{ 'admin.common.delete_modal__title'|trans }}
                                             
                                             
                                         
    
                                         
    
diff --git a/src/Eccube/Resource/template/admin/Product/class_name.twig b/src/Eccube/Resource/template/admin/Product/class_name.twig
index d1f389a87a6..65081497213 100644
--- a/src/Eccube/Resource/template/admin/Product/class_name.twig
+++ b/src/Eccube/Resource/template/admin/Product/class_name.twig
@@ -146,14 +146,14 @@ file that was distributed with this source code.
                                 
  • 
                                     
                                         
    {{ 'admin.product.class_name'|trans }}
    
-                                        
    
+                                        
    
                                             {{ form_widget(form._token) }}
                                             {{ form_widget(form.name) }}
                                             {{ form_errors(form.name) }}
                                         
    
                                         
    
                                             {{ 'admin.product.class_name__backend_name'|trans }}
-                                            
+                                            
                                         
    
                                         
    
                                             {{ form_widget(form.backend_name) }}
@@ -180,16 +180,16 @@ file that was distributed with this source code.
                                                 {{ ClassName.name }}［{{ 'admin.product.class_name__backend_name'|trans }}{{ 'admin.common.separator__colon'|trans }}{{ ClassName.backend_name }}］ ({{ ClassName.ClassCategories|length }})
                                             
    
                                             
    
-                                                
+                                                
                                                     
                                                 
-                                                
+                                                
                                                     
                                                 
-                                                
+                                                
                                                     
                                                 
-                                                
    
                                                     {% set classCategories = ClassName.ClassCategories|length %}
                                                     
                                             
                                         
    
                                         
    
diff --git a/src/Eccube/Resource/template/admin/Product/csv_category.twig b/src/Eccube/Resource/template/admin/Product/csv_category.twig
index f3c7945cbcd..dcef412b5f2 100644
--- a/src/Eccube/Resource/template/admin/Product/csv_category.twig
+++ b/src/Eccube/Resource/template/admin/Product/csv_category.twig
@@ -66,7 +66,7 @@ file that was distributed with this source code.
             
    
                 
    
                     
    
-                        
    {{ 'admin.common.csv_upload'|trans }}
    
+                        
    {{ 'admin.common.csv_upload'|trans }}
    
                     
    
                     
    
                         
    
@@ -75,7 +75,7 @@ file that was distributed with this source code.
                                 
                                     {{ form_widget(form._token) }}
                                     
    
-                                        {{ 'admin.common.file_select'|trans }}
+                                        {{ 'admin.common.file_select'|trans }}
                                         {{ 'admin.common.file_select_empty'|trans }}
                                         {{ form_widget(form.import_file, {'attr': {'accept': 'text/csv,text/tsv', 'class': 'd-none'}}) }}
                                         {{ form_errors(form.import_file) }}
@@ -94,7 +94,7 @@ file that was distributed with this source code.
                     
    
                         
    
                             
    
-                                
    {{ 'admin.common.csv_format'|trans }}
    
+                                
    {{ 'admin.common.csv_format'|trans }}
    
                             
    
                             
    
                                 {{ 'admin.common.csv_skeleton_download'|trans }}
@@ -108,7 +108,7 @@ file that was distributed with this source code.
                                 
                                     {{ header }}
                                         {% if key.required %}
-                                            {{ 'admin.common.required'|trans }}
+                                            {{ 'admin.common.required'|trans }}
                                         {% endif %}
                                     
                                     
diff --git a/src/Eccube/Resource/template/admin/Product/csv_product.twig b/src/Eccube/Resource/template/admin/Product/csv_product.twig
index a84227622f8..5947df59217 100644
--- a/src/Eccube/Resource/template/admin/Product/csv_product.twig
+++ b/src/Eccube/Resource/template/admin/Product/csv_product.twig
@@ -37,7 +37,7 @@ file that was distributed with this source code.
                 };
 
                 var addSuccess = function(message) {
-                    $('
  • SUCCESS 
    • ')
+                    $('
  • SUCCESS 
    • ')
                         .append($('').text(message))
                         .prependTo('#bulkMessages');
                     $('#bulkMessages li:nth-child(n+2)').hide()
@@ -196,7 +196,7 @@ file that was distributed with this source code.
             
    
                 
    
                     
    
-                        
    {{ 'admin.common.csv_upload'|trans }}
    
+                        
    {{ 'admin.common.csv_upload'|trans }}
    
                     
    
                     
    
                         
    
@@ -205,7 +205,7 @@ file that was distributed with this source code.
                                 
                                     {{ form_widget(form._token) }}
                                     
    
-                                        {{ 'admin.common.file_select'|trans }}
+                                        {{ 'admin.common.file_select'|trans }}
                                         {{ 'admin.common.file_select_empty'|trans }}
                                         {{ form_widget(form.import_file, {'attr': {'accept': 'text/csv,text/tsv', 'class': 'd-none'}}) }}
                                         {{ form_errors(form.import_file) }}
@@ -223,7 +223,7 @@ file that was distributed with this source code.
                     
    
                         
    
                             
    
-                                
    {{ 'admin.common.csv_format'|trans }}
    
+                                
    {{ 'admin.common.csv_format'|trans }}
    
                             
    
                             
    
                                 {{ 'admin.common.csv_skeleton_download'|trans }}
@@ -237,7 +237,7 @@ file that was distributed with this source code.
                                 
                                     {{ header }}
                                         {% if key.required %}
-                                            {{ 'admin.common.required'|trans }}
+                                            {{ 'admin.common.required'|trans }}
                                         {% endif %}
                                     
                                     
@@ -269,7 +269,7 @@ file that was distributed with this source code.
                     
    
                     
      
                     
                 
      
                 
      
diff --git a/src/Eccube/Resource/template/admin/Product/index.twig b/src/Eccube/Resource/template/admin/Product/index.twig
index 7ce81b36787..4a9f950fc00 100644
--- a/src/Eccube/Resource/template/admin/Product/index.twig
+++ b/src/Eccube/Resource/template/admin/Product/index.twig
@@ -151,13 +151,13 @@ file that was distributed with this source code.
 
                     
      
                         
      
-                            
+                            
                             {{ form_widget(searchForm.id) }}
                             {{ form_errors(searchForm.id) }}
                         
      
                               
                     
      
@@ -253,7 +253,7 @@ file that was distributed with this source code.
             
      
                 
                 {% if pagination %}
-                    {{ 'admin.common.search_result'|trans({"%count%":pagination.totalItemCount})|raw }}
+                    {{ 'admin.common.search_result'|trans({"%count%":pagination.totalItemCount})|raw }}
                 {% endif %}
             
      
             
      
@@ -271,8 +271,8 @@ file that was distributed with this source code.
                         
      
                             
      
                                 
      
-                                    
-                                    
      
+                                    
+                                    
      
                                         
@@ -280,14 +280,14 @@ file that was distributed with this source code.
                                             {{ 'admin.product.display_status__hide'|trans }}
                                         
                                     
      
-                                    
                                     
                                 
      
                             
      
                             
      
-                                
      
+                                
      
                                     
      
                                         
                                     {% for pageMax in pageMaxis %}
                                         
      
                         
      
                             
      
diff --git a/src/Eccube/Resource/template/admin/Setting/System/member.twig b/src/Eccube/Resource/template/admin/Setting/System/member.twig
index f2fdb017adf..e35af69da3f 100644
--- a/src/Eccube/Resource/template/admin/Setting/System/member.twig
+++ b/src/Eccube/Resource/template/admin/Setting/System/member.twig
@@ -137,13 +137,13 @@ file that was distributed with this source code.
                                                 
      
                                                 
      
                                                     {% if Member.id == app.user.id %}
-                                                        
                                                             
                                                         
                                                     {% else %}
-                                                        
      
                                                             
                                     
      
                                         {{ 'admin.setting.system.member.name'|trans }}
-                                        {{ 'admin.common.required'|trans }}
+                                        {{ 'admin.common.required'|trans }}
                                     
      
                                     
      
                                         
      
@@ -54,7 +54,7 @@ file that was distributed with this source code.
                                 
      
                                     
      
                                         {{ 'admin.setting.system.member.department'|trans }}
-                                        {{ 'admin.common.required'|trans }}
+                                        {{ 'admin.common.required'|trans }}
                                     
      
                                     
      
                                         
      
@@ -68,7 +68,7 @@ file that was distributed with this source code.
                                 
      
                                     
      
                                         {{ 'admin.setting.system.member.login_id'|trans }}
-                                        {{ 'admin.common.required'|trans }}
+                                        {{ 'admin.common.required'|trans }}
                                     
      
                                     
      
                                         
      
@@ -82,7 +82,7 @@ file that was distributed with this source code.
                                 
      
                                     
      
                                         {{ 'admin.setting.system.member.password'|trans }}
-                                        {{ 'admin.common.required'|trans }}
+                                        {{ 'admin.common.required'|trans }}
                                     
      
                                     
      
                                         
      
@@ -96,7 +96,7 @@ file that was distributed with this source code.
                                 
      
                                     
      
                                         {{ 'admin.setting.system.member.password_confirm'|trans }}
-                                        {{ 'admin.common.required'|trans }}
+                                        {{ 'admin.common.required'|trans }}
                                     
      
                                     
      
                                         
      
@@ -111,9 +111,9 @@ file that was distributed with this source code.
                                     
      
                                         
      
                                             {{ 'admin.common.authority'|trans }}
-                                            
+                                            
                                         
      
-                                        {{ 'admin.common.required'|trans }}
+                                        {{ 'admin.common.required'|trans }}
                                     
      
                                     
      
                                         
      
@@ -128,9 +128,9 @@ file that was distributed with this source code.
                                     
      
                                         
      
                                             {{ 'admin.setting.system.member.work'|trans }}
-                                            
+                                            
                                         
      
-                                        {{ 'admin.common.required'|trans }}
+                                        {{ 'admin.common.required'|trans }}
                                     
      
                                     
      
                                         {{ form_widget(form.Work, {'attr': {'class': 'form-check-inline'}}) }}
@@ -141,7 +141,7 @@ file that was distributed with this source code.
                                     
      
                                         
      
                                             {{ 'admin.setting.system.member.two_factor_auth_enabled'|trans }}
-                                            
+                                            
                                         
      
                                     
      
                                     
      
diff --git a/src/Eccube/Resource/template/admin/Setting/System/security.twig b/src/Eccube/Resource/template/admin/Setting/System/security.twig
index a7189e999f9..31c8f4a85c1 100644
--- a/src/Eccube/Resource/template/admin/Setting/System/security.twig
+++ b/src/Eccube/Resource/template/admin/Setting/System/security.twig
@@ -52,7 +52,7 @@ file that was distributed with this source code.
                                 
      
                                     
      
                                         
      
-                                            {{ 'admin.setting.system.security.admin_url'|trans }}
+                                            {{ 'admin.setting.system.security.admin_url'|trans }}
                                         
      
                                     
      
                                     
      
@@ -64,7 +64,7 @@ file that was distributed with this source code.
                                 
      
                                     
      
                                         
      
-                                            {{ 'admin.setting.system.security.ip_limit'|trans }}
+                                            {{ 'admin.setting.system.security.ip_limit'|trans }}
                                         
      
                                     
      
                                     
      
@@ -77,7 +77,7 @@ file that was distributed with this source code.
                                 
      
                                     
      
                                         
      
-                                            {{ 'admin.setting.system.security.ip_limit_deny'|trans }}
+                                            {{ 'admin.setting.system.security.ip_limit_deny'|trans }}
                                         
      
                                     
      
                                     
      
@@ -90,7 +90,7 @@ file that was distributed with this source code.
                                 
      
                                     
      
                                         
      
-                                            {{ 'admin.setting.system.security.force_ssl'|trans }}
+                                            {{ 'admin.setting.system.security.force_ssl'|trans }}
                                         
      
                                     
      
                                     
      
@@ -108,7 +108,7 @@ file that was distributed with this source code.
                                 
      
                                     
      
                                         
      
-                                            {{ 'admin.setting.system.security.trusted_hosts'|trans }}
+                                            {{ 'admin.setting.system.security.trusted_hosts'|trans }}
                                         
      
                                     
      
                                     
      
diff --git a/src/Eccube/Resource/template/admin/Setting/System/system.twig b/src/Eccube/Resource/template/admin/Setting/System/system.twig
index a0c59167246..fc219215af6 100644
--- a/src/Eccube/Resource/template/admin/Setting/System/system.twig
+++ b/src/Eccube/Resource/template/admin/Setting/System/system.twig
@@ -26,7 +26,7 @@ file that was distributed with this source code.
                             
      
                                 
      
                                     {{ 'admin.setting.system.system_info'|trans }}
-                                    
+                                    
                                 
      
                             
      
                             
      
@@ -65,7 +65,7 @@ file that was distributed with this source code.
                             
      
                                 
      
                                     {{ 'admin.setting.system.system.php_info'|trans }}
-                                    
+                                    
                                 
      
                             
      
                         
      
@@ -80,4 +80,4 @@ file that was distributed with this source code.
         
      
     
      
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/src/Eccube/Resource/template/admin/Setting/System/two_factor_auth_edit.twig b/src/Eccube/Resource/template/admin/Setting/System/two_factor_auth_edit.twig
index cd4c24c7c03..9f47ef33f70 100644
--- a/src/Eccube/Resource/template/admin/Setting/System/two_factor_auth_edit.twig
+++ b/src/Eccube/Resource/template/admin/Setting/System/two_factor_auth_edit.twig
@@ -77,8 +77,8 @@ $(function () {
                                     
      
                                         
      
                                             {{ form.device_token.vars.label|trans }}
-                                            
-                                            {{ 'admin.common.required'|trans }}
+                                            
+                                            {{ 'admin.common.required'|trans }}
                                         
      
                                     
      
                                     
      
diff --git a/src/Eccube/Resource/template/admin/Store/plugin.twig b/src/Eccube/Resource/template/admin/Store/plugin.twig
index 5d170edb109..e05de5c3303 100644
--- a/src/Eccube/Resource/template/admin/Store/plugin.twig
+++ b/src/Eccube/Resource/template/admin/Store/plugin.twig
@@ -41,7 +41,7 @@ file that was distributed with this source code.
                 
      
                     
      
                         {{ 'admin.store.plugin.811'|trans }}
+                           class="btn btn-ec-regular me-2 float-end">{{ 'admin.store.plugin.811'|trans }}
                         
      {{ 'admin.store.plugin.812'|trans }}
      
                     
      
                     {{ include('@admin/Store/plugin_table_official.twig', {'Plugins': officialPlugins}) }}
@@ -51,7 +51,7 @@ file that was distributed with this source code.
                 
      
                     
      
                         {{ 'admin.store.plugin.813'|trans }}
+                           class="btn btn-ec-regular me-2 float-end">{{ 'admin.store.plugin.813'|trans }}
                         
      {{ 'admin.store.plugin.814'|trans }}
      
                     
      
                     {{ include('@admin/Store/plugin_table.twig', {'Plugins': unofficialPlugins}) }}
@@ -59,4 +59,4 @@ file that was distributed with this source code.
             
      
         
      
     
      
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/src/Eccube/Resource/template/admin/Store/plugin_confirm.twig b/src/Eccube/Resource/template/admin/Store/plugin_confirm.twig
index 7bbe0a6cffa..1cd64259df1 100644
--- a/src/Eccube/Resource/template/admin/Store/plugin_confirm.twig
+++ b/src/Eccube/Resource/template/admin/Store/plugin_confirm.twig
@@ -245,7 +245,7 @@ $(function() {
                     
      
                     
diff --git a/src/Eccube/Resource/template/admin/Store/plugin_confirm_uninstall.twig b/src/Eccube/Resource/template/admin/Store/plugin_confirm_uninstall.twig
index 42d0ccb9e24..10a28e9ef02 100644
--- a/src/Eccube/Resource/template/admin/Store/plugin_confirm_uninstall.twig
+++ b/src/Eccube/Resource/template/admin/Store/plugin_confirm_uninstall.twig
@@ -34,7 +34,7 @@ file that was distributed with this source code.
                     
      
                     
      
                         
      
-                            
      
+                            
      
                                 
                             
      
diff --git a/src/Eccube/Resource/template/admin/Store/plugin_search.twig b/src/Eccube/Resource/template/admin/Store/plugin_search.twig
index f39870126fd..f64938e5f06 100644
--- a/src/Eccube/Resource/template/admin/Store/plugin_search.twig
+++ b/src/Eccube/Resource/template/admin/Store/plugin_search.twig
@@ -75,7 +75,7 @@ file that was distributed with this source code.
                     
      
                     
      
                         
      
-                            
      
+                            
      
                                 {{ form_widget(searchForm.sort, {attr: {onchange: 'document.forms.search.submit();'}}) }}
                             
      
                             
      
diff --git a/src/Eccube/Resource/template/admin/Store/plugin_search_panel.twig b/src/Eccube/Resource/template/admin/Store/plugin_search_panel.twig
index 351e393d2d0..5578214818e 100644
--- a/src/Eccube/Resource/template/admin/Store/plugin_search_panel.twig
+++ b/src/Eccube/Resource/template/admin/Store/plugin_search_panel.twig
@@ -9,7 +9,7 @@ For the full copyright and license information, please view the LICENSE
 file that was distributed with this source code.
 #}
 
-
      
+
      
     
         {{ item.name }}
     
@@ -28,13 +28,13 @@ file that was distributed with this source code.
         
      
             {% if not item.price %}
             
      
-                
      {{'admin.store.plugin_owners_search.dl'|trans}} {{ item.downloads|number_format }}
      
+                
      {{'admin.store.plugin_owners_search.dl'|trans}} {{ item.downloads|number_format }}
      
             
      
             {% endif %}
         
      
         
      
             
      
-                
      {{ 'admin.store.plugin_owners_search.support'|trans }} {% for version in item.supported_versions %}{{ version }} {%- if loop.last == false%}, {% endif -%}{% endfor %}
      
+                
      {{ 'admin.store.plugin_owners_search.support'|trans }} {% for version in item.supported_versions %}{{ version }} {%- if loop.last == false%}, {% endif -%}{% endfor %}
      
             
      
         
      
     
      
@@ -61,4 +61,4 @@ file that was distributed with this source code.
 
      
 
 
-{{ include('@admin/Store/plugin_detail_modal.twig') }}
\ No newline at end of file
+{{ include('@admin/Store/plugin_detail_modal.twig') }}
diff --git a/src/Eccube/Resource/template/admin/Store/plugin_table.twig b/src/Eccube/Resource/template/admin/Store/plugin_table.twig
index ab4022728b7..ddbd3812599 100644
--- a/src/Eccube/Resource/template/admin/Store/plugin_table.twig
+++ b/src/Eccube/Resource/template/admin/Store/plugin_table.twig
@@ -70,7 +70,7 @@ $(function() {
                             {% endif %}
                         
                         
-                            
      
+                            
      
                                 
      
                                         {% if Plugin.enabled == false %}
                                         
      
diff --git a/src/Eccube/Resource/template/admin/Store/plugin_table_official.twig b/src/Eccube/Resource/template/admin/Store/plugin_table_official.twig
index 6a7b72c497e..76d1a73bc7b 100644
--- a/src/Eccube/Resource/template/admin/Store/plugin_table_official.twig
+++ b/src/Eccube/Resource/template/admin/Store/plugin_table_official.twig
@@ -190,7 +190,7 @@ $(function() {
                 
      
                 
diff --git a/src/Eccube/Resource/template/admin/Store/template_add.twig b/src/Eccube/Resource/template/admin/Store/template_add.twig
index c16440b5af4..f8f84d253b5 100644
--- a/src/Eccube/Resource/template/admin/Store/template_add.twig
+++ b/src/Eccube/Resource/template/admin/Store/template_add.twig
@@ -31,7 +31,7 @@ file that was distributed with this source code.
                                     
      
                                         {{ 'admin.store.template.template_code'|trans }}
-                                        
+                                        
                                     
      
                                 
      
                                 
      
@@ -45,7 +45,7 @@ file that was distributed with this source code.
                                     
      
                                         {{ 'admin.store.template.template_name'|trans }}
-                                        
+                                        
                                     
      
                                 
      
                                 
      
@@ -59,7 +59,7 @@ file that was distributed with this source code.
                                     
      
                                         {{ 'admin.store.template.template_file'|trans }}
-                                        
+                                        
                                     
      
                                     
      {{ 'admin.store.template.file_format'|trans }}
                                 
      
diff --git a/src/Eccube/Resource/template/admin/alert.twig b/src/Eccube/Resource/template/admin/alert.twig
index 6ffe06a8629..cb3c6900137 100644
--- a/src/Eccube/Resource/template/admin/alert.twig
+++ b/src/Eccube/Resource/template/admin/alert.twig
@@ -10,50 +10,50 @@ file that was distributed with this source code.
 #}
 {% for message in app.flashes('eccube.admin.info') %}
     
 {% endfor %}
 
 {% for message in app.flashes('eccube.admin.success') %}
     
 {% endfor %}
 
 {% for message in app.flashes('eccube.admin.danger') %}
     
 {% endfor %}
 
 {% for message in app.flashes('eccube.admin.error') %}
     
 {% endfor %}
 
 {% for message in app.flashes('eccube.admin.warning') %}
     
 {% endfor %}
diff --git a/src/Eccube/Resource/template/admin/error.twig b/src/Eccube/Resource/template/admin/error.twig
index b4152ad656a..e5bf38377b8 100644
--- a/src/Eccube/Resource/template/admin/error.twig
+++ b/src/Eccube/Resource/template/admin/error.twig
@@ -32,7 +32,7 @@ file that was distributed with this source code.
                 
      
 
                     
      
-                        
      {{ error_title }}
      
+                        
      {{ error_title }}
      
                         
      {{ error_message }}
      
                         {{ 'admin.error.go_to_login'|trans }}
                     
      
diff --git a/src/Eccube/Resource/template/admin/index.twig b/src/Eccube/Resource/template/admin/index.twig
index 934dd8350eb..d4981cbecdc 100644
--- a/src/Eccube/Resource/template/admin/index.twig
+++ b/src/Eccube/Resource/template/admin/index.twig
@@ -106,10 +106,10 @@ file that was distributed with this source code.
 {% block main %}
     {% if is_danger_admin_url %}
     
     {% endif %}
@@ -133,7 +133,7 @@ file that was distributed with this source code.
                                                     {{ OrderStatus.name }}
                                                 
      
                                                 
      
-                                                    {{ Orders is not empty and Orders[OrderStatus.id] is defined ? Orders[OrderStatus.id] : 0 }}
+                                                    {{ Orders is not empty and Orders[OrderStatus.id] is defined ? Orders[OrderStatus.id] : 0 }}
                                                 
      
                                             
      
                                         
@@ -151,7 +151,7 @@ file that was distributed with this source code.
                             
      
                             
      
                                 
      
-                                    
      
+                                    
      
                                         
      
                                             {% set amount = salesThisMonth is empty ? 0 : salesThisMonth.order_amount %}
                                             {% set count = salesThisMonth is empty ? 0 : salesThisMonth.order_count %}
@@ -159,7 +159,7 @@ file that was distributed with this source code.
                                         
      
                                         {{ 'admin.home.sales_summary_this_month'|trans }}
                                     
      
-                                    
      
+                                    
      
                                         
      
                                             {% set amount = salesToday is empty ? 0 : salesToday.order_amount %}
                                             {% set count = salesToday is empty ? 0 : salesToday.order_count %}
@@ -179,13 +179,13 @@ file that was distributed with this source code.
                                 
      
                                     
      
                                         
@@ -232,7 +232,7 @@ file that was distributed with this source code.
                                                 {{ 'admin.home.shop_status_out_of_stock'|trans }}
                                             
      
                                             
      
-                                                {{ countNonStockProducts|number_format }}
+                                                {{ countNonStockProducts|number_format }}
                                             
      
                                         
      
                                     
@@ -247,7 +247,7 @@ file that was distributed with this source code.
                                                 {{ 'admin.home.shop_status_products'|trans }}
                                             
      
                                             
      
-                                                {{ countProducts|number_format }}
+                                                {{ countProducts|number_format }}
                                             
      
                                         
      
                                     
@@ -262,7 +262,7 @@ file that was distributed with this source code.
                                                 {{ 'admin.home.shop_status_customers'|trans }}
                                             
      
                                             
      
-                                                {{ countCustomers|number_format }}
+                                                {{ countCustomers|number_format }}
                                             
      
                                         
      
                                     

From dedc05d955464b165a8c77df58f4fb6f46af567c Mon Sep 17 00:00:00 2001
From: pineray 
Date: Mon, 22 Aug 2022 08:57:36 +0900
Subject: [PATCH 2/2] =?UTF-8?q?codeception=20=E3=81=AE=E3=82=A8=E3=83=A9?=
 =?UTF-8?q?=E3=83=BC=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 codeception/_support/Page/Admin/OrderEditPage.php | 6 +++---
 codeception/_support/Page/Admin/TaxManagePage.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/codeception/_support/Page/Admin/OrderEditPage.php b/codeception/_support/Page/Admin/OrderEditPage.php
index 3e685ec81e2..072d0954a87 100644
--- a/codeception/_support/Page/Admin/OrderEditPage.php
+++ b/codeception/_support/Page/Admin/OrderEditPage.php
@@ -153,8 +153,8 @@ public function 注文者パネルを開く()
 
     public function 商品検索($value = '')
     {
-        $this->tester->scrollTo(['css' => '#orderItem > div > div.row.justify-content-between.mb-2 > div.col-6 > a.btn.btn-ec-regular.mr-2.add'], 0, -50);
-        $this->tester->click(['css' => '#orderItem > div > div.row.justify-content-between.mb-2 > div.col-6 > a.btn.btn-ec-regular.mr-2.add']);
+        $this->tester->scrollTo(['css' => '#orderItem > div > div.row.justify-content-between.mb-2 > div.col-6 > a.btn.btn-ec-regular.me-2.add'], 0, -50);
+        $this->tester->click(['css' => '#orderItem > div > div.row.justify-content-between.mb-2 > div.col-6 > a.btn.btn-ec-regular.me-2.add']);
         $this->tester->waitForElementVisible(['id' => 'addProduct']);
         $this->tester->fillField(['id' => 'admin_search_product_id'], $value);
         $this->tester->click('#searchProductModalButton');
@@ -187,7 +187,7 @@ public function 明細の項目名を取得($row)
     public function 明細を削除($row)
     {
         $this->tester->scrollTo(['css' => '#order-product']);
-        $this->tester->click("#table-form-field > tbody > tr:nth-child({$row}) > td.align-middle.text-end.pe-3 > div > div > div.d-inline-block.mr-3 > a");
+        $this->tester->click("#table-form-field > tbody > tr:nth-child({$row}) > td.align-middle.text-end.pe-3 > div > div > div.d-inline-block.me-3 > a");
         $this->tester->waitForElementVisible("#table-form-field > tbody > tr:nth-child({$row}) > td.align-middle.text-end.pe-3 > div > div > div.modal");
 
         return $this;
diff --git a/codeception/_support/Page/Admin/TaxManagePage.php b/codeception/_support/Page/Admin/TaxManagePage.php
index b4a5af16e42..befc2bd856c 100644
--- a/codeception/_support/Page/Admin/TaxManagePage.php
+++ b/codeception/_support/Page/Admin/TaxManagePage.php
@@ -66,7 +66,7 @@ public function 一覧_編集($rowNum)
 
     public function 一覧_削除($rowNum)
     {
-        $this->tester->click("table tbody tr:nth-child(${rowNum}) > td.align-middle.action > div > div > div:nth-child(2) > div.d-inline-block.mr-3 > a");
+        $this->tester->click("table tbody tr:nth-child(${rowNum}) > td.align-middle.action > div > div > div:nth-child(2) > div.d-inline-block.me-3 > a");
 
         // accept modal
         $this->tester->waitForElementVisible("table tbody tr:nth-child(${rowNum}) > td.align-middle.action > div > div > div:nth-child(2) > div.modal");