From f9b54ac29f19880b8efcc4e37ecdb9118087f010 Mon Sep 17 00:00:00 2001
From: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
Date: Mon, 20 Jun 2022 14:38:58 +0900
Subject: [PATCH] =?UTF-8?q?HTML5=20type=20=E3=82=92=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://symfony.com/doc/5.4/reference/forms/types/date.html#html5
---
 .../template/admin/Customer/index.twig        | 69 -------------------
 .../Resource/template/admin/Order/index.twig  | 39 -----------
 .../template/admin/Order/order_pdf.twig       | 28 +-------
 .../template/admin/Product/index.twig         | 39 -----------
 .../admin/Setting/System/login_history.twig   | 45 ------------
 5 files changed, 1 insertion(+), 219 deletions(-)

diff --git a/src/Eccube/Resource/template/admin/Customer/index.twig b/src/Eccube/Resource/template/admin/Customer/index.twig
index 5f8c23d88b8..34e9f255aa1 100644
--- a/src/Eccube/Resource/template/admin/Customer/index.twig
+++ b/src/Eccube/Resource/template/admin/Customer/index.twig
@@ -17,75 +17,6 @@ file that was distributed with this source code.
 
 {% form_theme searchForm '@admin/Form/bootstrap_4_horizontal_layout.html.twig' %}
 
-{% block stylesheet %}
-    <link rel="stylesheet" href="{{ asset('assets/css/tempusdominus-bootstrap-4.min.css', 'admin') }}">
-    <style type="text/css">
-        .datepicker-days th.dow:first-child,
-        .datepicker-days td:first-child {
-            color: #f00;
-        }
-
-        .datepicker-days th.dow:last-child,
-        .datepicker-days td:last-child {
-            color: #00f;
-        }
-    </style>
-{% endblock stylesheet %}
-
-{% block javascript %}
-    <script src="{{ asset('assets/js/vendor/moment.min.js', 'admin') }}"></script>
-    <script src="{{ asset('assets/js/vendor/moment-with-locales.min.js', 'admin') }}"></script>
-    <script src="{{ asset('assets/js/vendor/tempusdominus-bootstrap-4.min.js', 'admin') }}"></script>
-
-    <script>
-        $(function() {
-
-            // datetimepicker と競合するため HTML5 のカレンダ入力を無効に
-            $('input[type="date"]').attr('type','text');
-
-            // datetimepicker で value が消えてしまうので data-value に保持しておく
-            $('input.datetimepicker-input').each(function() {
-                $(this).data('value', $(this).val());
-            });
-
-            $('input.datetimepicker-input').not('#admin_search_customer_birth_start').not('#admin_search_customer_birth_end').datetimepicker({
-                locale: '{{ eccube_config.locale }}',
-                format: 'YYYY-MM-DD HH:mm:ss',
-                useCurrent: false,
-                buttons: {
-                    showToday: true,
-                    showClose: true
-                },
-            });
-
-            $('#admin_search_customer_birth_start').datetimepicker({
-                locale: '{{ eccube_config.locale }}',
-                format: 'YYYY-MM-DD',
-                useCurrent: false,
-                buttons: {
-                    showToday: true,
-                    showClose: true
-                }
-            });
-
-            $('#admin_search_customer_birth_end').datetimepicker({
-                locale: '{{ eccube_config.locale }}',
-                format: 'YYYY-MM-DD',
-                useCurrent: false,
-                buttons: {
-                    showToday: true,
-                    showClose: true
-                }
-            });
-
-            // datetimepicker で value が消えてしまうので更新
-            $('input.datetimepicker-input').each(function() {
-                $(this).val($(this).data('value'));
-            });
-        });
-    </script>
-{% endblock javascript %}
-
 {% block main %}
     <form name="search_form" id="search_form" method="post" action="">
         {{ form_widget(searchForm._token) }}
diff --git a/src/Eccube/Resource/template/admin/Order/index.twig b/src/Eccube/Resource/template/admin/Order/index.twig
index fa5be4067dc..36df49f8308 100644
--- a/src/Eccube/Resource/template/admin/Order/index.twig
+++ b/src/Eccube/Resource/template/admin/Order/index.twig
@@ -16,48 +16,9 @@ file that was distributed with this source code.
 
 {% form_theme searchForm '@admin/Form/bootstrap_4_layout.html.twig' %}
 
-{% block stylesheet %}
-    <link rel="stylesheet" href="{{ asset('assets/css/tempusdominus-bootstrap-4.min.css', 'admin') }}">
-    <style type="text/css">
-        .datepicker-days th.dow:first-child,
-        .datepicker-days td:first-child {
-            color: #f00;
-        }
-
-        .datepicker-days th.dow:last-child,
-        .datepicker-days td:last-child {
-            color: #00f;
-        }
-    </style>
-{% endblock stylesheet %}
-
 {% block javascript %}
-    <script src="{{ asset('assets/js/vendor/moment.min.js', 'admin') }}"></script>
-    <script src="{{ asset('assets/js/vendor/moment-with-locales.min.js', 'admin') }}"></script>
-    <script src="{{ asset('assets/js/vendor/tempusdominus-bootstrap-4.min.js', 'admin') }}"></script>
-
     <script>
         $(function() {
-            // datetimepicker で value が消えてしまうので data-value に保持しておく
-            $('input.datetimepicker-input').each(function() {
-                $(this).data('value', $(this).val());
-            });
-
-            $('input.datetimepicker-input').datetimepicker({
-                locale: '{{ eccube_config.locale }}',
-                format: 'YYYY-MM-DD HH:mm:ss',
-                useCurrent: false,
-                buttons: {
-                    showToday: true,
-                    showClose: true
-                },
-            });
-
-            // datetimepicker で value が消えてしまうので更新
-            $('input.datetimepicker-input').each(function() {
-                $(this).val($(this).data('value'));
-            });
-
             toggleBtnBulk('input[id^="check_"]', '.btn-bulk-wrapper');
             $('input[id^="check_"]').on('change', function() {
                 $('#toggle_check_all').prop('checked', false);
diff --git a/src/Eccube/Resource/template/admin/Order/order_pdf.twig b/src/Eccube/Resource/template/admin/Order/order_pdf.twig
index aa34890b10b..d46043f3869 100644
--- a/src/Eccube/Resource/template/admin/Order/order_pdf.twig
+++ b/src/Eccube/Resource/template/admin/Order/order_pdf.twig
@@ -18,18 +18,7 @@ file that was distributed with this source code.
 {% form_theme form '@admin/Form/bootstrap_4_horizontal_layout.html.twig' %}
 
 {% block stylesheet %}
-    <link rel="stylesheet" href="{{ asset('assets/css/tempusdominus-bootstrap-4.min.css', 'admin') }}">
     <style type="text/css">
-        .datepicker-days th.dow:first-child,
-        .datepicker-days td:first-child {
-            color: #f00;
-        }
-
-        .datepicker-days th.dow:last-child,
-        .datepicker-days td:last-child {
-            color: #00f;
-        }
-
         .c-container {
             min-width: inherit;
             margin-top: 0;
@@ -48,22 +37,8 @@ file that was distributed with this source code.
 {% endblock stylesheet %}
 
 {% block javascript %}
-    <script src="{{ asset('assets/js/vendor/moment.min.js', 'admin') }}"></script>
-    <script src="{{ asset('assets/js/vendor/moment-with-locales.min.js', 'admin') }}"></script>
-    <script src="{{ asset('assets/js/vendor/tempusdominus-bootstrap-4.min.js', 'admin') }}"></script>
-
     <script type="text/javascript">
         $(function() {
-            $('input[id$=_issue_date]').datetimepicker({
-                locale: '{{ eccube_config.locale }}',
-                format: 'YYYY-MM-DD',
-                useCurrent: true,
-                buttons: {
-                    showToday: true,
-                    showClose: true
-                }
-            });
-
             var close = $('#windowclose');
 
             $('.btn-ec-regular').on('click', function() {
@@ -73,7 +48,6 @@ file that was distributed with this source code.
         });
 
         Ladda.bind('button[type="submit"]', {timeout: 3000});
-
     </script>
 {% endblock %}
 
@@ -91,7 +65,7 @@ file that was distributed with this source code.
                         <div class="card-body">
                             <div class="mb-3">
                                 <label>{{ 'admin.order.delivery_note_create_date'|trans }}</label>
-                                {{ form_widget(form.issue_date, { type: 'text' }) }}
+                                {{ form_widget(form.issue_date) }}
                                 {{ form_errors(form.issue_date) }}
                             </div>
 
diff --git a/src/Eccube/Resource/template/admin/Product/index.twig b/src/Eccube/Resource/template/admin/Product/index.twig
index 459b91e09cf..1e2efca3aff 100644
--- a/src/Eccube/Resource/template/admin/Product/index.twig
+++ b/src/Eccube/Resource/template/admin/Product/index.twig
@@ -17,48 +17,9 @@ file that was distributed with this source code.
 
 {% form_theme searchForm '@admin/Form/bootstrap_4_layout.html.twig' %}
 
-{% block stylesheet %}
-    <link rel="stylesheet" href="{{ asset('assets/css/tempusdominus-bootstrap-4.min.css', 'admin') }}">
-    <style type="text/css">
-        .datepicker-days th.dow:first-child,
-        .datepicker-days td:first-child {
-            color: #f00;
-        }
-
-        .datepicker-days th.dow:last-child,
-        .datepicker-days td:last-child {
-            color: #00f;
-        }
-    </style>
-{% endblock stylesheet %}
-
 {% block javascript %}
-    <script src="{{ asset('assets/js/vendor/moment.min.js', 'admin') }}"></script>
-    <script src="{{ asset('assets/js/vendor/moment-with-locales.min.js', 'admin') }}"></script>
-    <script src="{{ asset('assets/js/vendor/tempusdominus-bootstrap-4.min.js', 'admin') }}"></script>
-
     <script>
         $(function() {
-            // datetimepicker で value が消えてしまうので data-value に保持しておく
-            $('input.datetimepicker-input').each(function() {
-                $(this).data('value', $(this).val());
-            });
-
-            $('input.datetimepicker-input').datetimepicker({
-                locale: '{{ eccube_config.locale }}',
-                format: 'YYYY-MM-DD HH:mm:ss',
-                useCurrent: false,
-                buttons: {
-                    showToday: true,
-                    showClose: true
-                },
-            });
-
-            // datetimepicker で value が消えてしまうので更新
-            $('input.datetimepicker-input').each(function() {
-                $(this).val($(this).data('value'));
-            });
-
             $('#bulkDelete').on('click', function() {
 
                 var modal = $('#bulkDeleteModal');
diff --git a/src/Eccube/Resource/template/admin/Setting/System/login_history.twig b/src/Eccube/Resource/template/admin/Setting/System/login_history.twig
index 5eef2d792ee..5f55bf807ff 100644
--- a/src/Eccube/Resource/template/admin/Setting/System/login_history.twig
+++ b/src/Eccube/Resource/template/admin/Setting/System/login_history.twig
@@ -18,51 +18,6 @@ file that was distributed with this source code.
 
 {% form_theme searchForm '@admin/Form/bootstrap_4_horizontal_layout.html.twig' %}
 
-{% block stylesheet %}
-    <link rel="stylesheet" href="{{ asset('assets/css/tempusdominus-bootstrap-4.min.css', 'admin') }}">
-    <style type="text/css">
-        .datepicker-days th.dow:first-child,
-        .datepicker-days td:first-child {
-            color: #f00;
-        }
-
-        .datepicker-days th.dow:last-child,
-        .datepicker-days td:last-child {
-            color: #00f;
-        }
-    </style>
-{% endblock stylesheet %}
-
-{% block javascript %}
-    <script src="{{ asset('assets/js/vendor/moment.min.js', 'admin') }}"></script>
-    <script src="{{ asset('assets/js/vendor/moment-with-locales.min.js', 'admin') }}"></script>
-    <script src="{{ asset('assets/js/vendor/tempusdominus-bootstrap-4.min.js', 'admin') }}"></script>
-
-    <script>
-    $(function() {
-        // datetimepicker で value が消えてしまうので data-value に保持しておく
-        $('input.datetimepicker-input').each(function() {
-            $(this).data('value', $(this).val());
-        });
-
-        $('input.datetimepicker-input').datetimepicker({
-            locale: '{{ eccube_config.locale }}',
-            format: 'YYYY-MM-DD HH:mm:ss',
-            useCurrent: false,
-            buttons: {
-                showToday: true,
-                showClose: true
-            },
-        });
-
-        // datetimepicker で value が消えてしまうので更新
-        $('input.datetimepicker-input').each(function() {
-            $(this).val($(this).data('value'));
-        });
-    });
-    </script>
-{% endblock javascript %}
-
 {% block main %}
 <form name="search_form" id="search_form" method="post" action="">
     {{ form_widget(searchForm._token) }}