Merge pull request #5415 from NguyenBao10/REDSHOP-5880

REDSHOP-5880 Custom Field type Date Picker have problem when appear on front-end
redCOMPONENT-COM · Jul 16, 2020 · ad43c42 · ad43c42
2 parents 37a78bc + a573feb
commit ad43c42
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 26 deletions.
diff --git a/libraries/redshop/html/redshopcalendar.php b/libraries/redshop/html/redshopcalendar.php
@@ -76,36 +76,44 @@ public static function calendar($value, $name, $id, $format = '', $attribs = nul
         JFactory::getDocument()->addScriptDeclaration(
             '(function($){
 				$(document).ready(function(){
-					$("#' . $id . '_wrapper").datetimepicker({
-						timeZone: "' . $userTz . '",
-						collapse: true,
-						sideBySide: true,
-						showTodayButton: false,
-						format: "' . RedshopHelperDatetime::convertPHPToMomentFormat($format) . '",
-						showClear: ' . (!$inline ? 'true' : 'false') . ',
-						showClose: ' . (!$inline ? 'true' : 'false') . ',
-						inline: ' . (!$inline ? 'false' : 'true') . ',
-						allowInputToggle: true,
-						' . $defaultDate . '
-						icons: {
-							time: "fa fa-time",
-							date: "fa fa-calendar",
-							up: "fa fa-chevron-up",
-							down: "fa fa-chevron-down",
-							previous: "fa fa-chevron-left",
-							next: "fa fa-chevron-right",
-							today: "fa fa-calendar",
-							clear: "fa fa-trash text-danger",
-							close: "fa fa-remove"
-						}
-					});
+                    addDateTimePicker();
 				});
+				
+				$(document).on("AfterGetBillingTemplate", function(){
+                    addDateTimePicker();
+                });
+				
+				function addDateTimePicker(){
+                    $("#' . $id . '_wrapper").datetimepicker({
+                        timeZone: "' . $userTz . '",
+                        collapse: true,
+                        sideBySide: true,
+                        showTodayButton: false,
+                        format: "' . RedshopHelperDatetime::convertPHPToMomentFormat($format) . '",
+                        showClear: ' . (!$inline ? 'true' : 'false') . ',
+                        showClose: ' . (!$inline ? 'true' : 'false') . ',
+                        inline: ' . (!$inline ? 'false' : 'true') . ',
+                        allowInputToggle: true,
+                        ' . $defaultDate . '
+                        icons: {
+                            time: "fa fa-time",
+                            date: "fa fa-calendar",
+                            up: "fa fa-chevron-up",
+                            down: "fa fa-chevron-down",
+                            previous: "fa fa-chevron-left",
+                            next: "fa fa-chevron-right",
+                            today: "fa fa-calendar",
+                            clear: "fa fa-trash text-danger",
+                            close: "fa fa-remove"
+                        }
+                    });
+                }
 			})(jQuery);'
         );
 
         if (!$inline) {
             // Hide button using inline styles for readonly/disabled fields
-            return '<div class="input-group" id="' . $id . '_wrapper">'
+            return '<div class="input-group redshop-datepicker" id="' . $id . '_wrapper">'
                 . '<span class="input-group-addon" id="' . $id . '_img"><i class="fa fa-calendar"></i></span>'
                 . '<input type="text" name="' . $name . '" id="' . $id . '" ' . $attribs . ' />'
                 . '<span class="input-group-addon"><strong>' . strtolower($format) . '</strong></span>'

diff --git a/libraries/redshop/src/Fields/SiteHelper.php b/libraries/redshop/src/Fields/SiteHelper.php
@@ -169,7 +169,7 @@ public static function renderFields($fieldSection = 0, $sectionId = 0, $uniqueCl
                         $date,
                         $field->name,
                         $field->name,
-                        $format = '%d-%m-%Y',
+                        $format = 'd-m-Y',
                         array('class' => 'inputbox', 'size' => $size, 'maxlength' => '15')
                     );
                     break;

diff --git a/media/com_redshop/css/redshop.admin.css b/media/com_redshop/css/redshop.admin.css
@@ -29486,4 +29486,12 @@ div.modal.jviewport-width90 {
 div.modal.jviewport-width100 {
     width: 100vw;
     margin-left: -50vw;
+}
+
+.redshop-datepicker {
+    position: static;
+}
+
+.table-striped tbody > tr > td.day.active {
+    background-color: #337ab7 !important;
 }
diff --git a/media/com_redshop/css/redshop.admin.min.css b/media/com_redshop/css/redshop.admin.min.css