@@ -803,25 +803,29 @@ public function search_form($parameters = null)
803803 }elseif (in_array ($ key , $ this ->a_search_fields_date )){
804804 // Decode strings in URL
805805 $ date = urldecode ($ param );
806+
807+ // Reset Carbon instance
808+ unset($ carbon_instance );
806809
807810 if (ctype_digit ($ date ) and strlen ($ date ) == 4 ){
808811 // Create a formatted date from year
809- $ search_fields [$ key ] = Carbon::createFromFormat ('Y ' , $ date )->startOfYear ()->format (trans ('panichd::lang.datetime-format ' ));
812+ $ carbon_instance = Carbon::createFromFormat ('Y ' , $ date )->startOfYear ();
813+ $ search_fields [$ key ] = $ carbon_instance ->format (trans ('panichd::lang.datetime-format ' ));
810814
811815 // Specify date type if it's not set
812816 if (!isset ($ search_fields [$ key . '_type ' ])) $ search_fields [$ key . '_type ' ] = 'exact_year ' ;
813817
814818 }else {
815819 try {
816820 // Check if it's a full and formatted date time string
817- Carbon::createFromFormat (trans ('panichd::lang.datetime-format ' ), $ date );
818- $ search_fields [$ key ] = $ date ;
821+ $ carbon_instance = Carbon::createFromFormat (trans ('panichd::lang.datetime-format ' ), $ date );
822+ $ search_fields [$ key ] = $ carbon_instance -> format ( trans ( ' panichd::lang.datetime-format ' )) ;
819823
820824 } catch (\Exception $ e ) {
821825 try {
822826 // Check if it's a date string
823- $ datetime = Carbon::createFromFormat (trans ('panichd::lang.date-format ' ), $ date )->startOfDay ()-> format ( trans ( ' panichd::lang.datetime-format ' ) );
824- $ search_fields [$ key ] = $ datetime ;
827+ $ carbon_instance = Carbon::createFromFormat (trans ('panichd::lang.date-format ' ), $ date )->startOfDay ();
828+ $ search_fields [$ key ] = $ carbon_instance -> format ( trans ( ' panichd::lang. datetime-format ' )) ;
825829 if (!isset ($ search_fields [$ key . '_type ' ])) $ search_fields [$ key . '_type ' ] = 'exact_day ' ;
826830
827831 }catch (\Exception $ e ) {
@@ -830,6 +834,11 @@ public function search_form($parameters = null)
830834 }
831835 }
832836
837+ if (isset ($ carbon_instance )){
838+ // Pass DateTimeString for javascript DateTimePicker
839+ $ search_fields ['timestamp_ ' . $ key ] = $ carbon_instance ->toDateTimeString ();
840+ }
841+
833842 }elseif (in_array (str_replace ('_type ' , '' , $ key ), $ this ->a_search_fields_date ) and in_array ($ param , $ this ->a_search_fields_date_types )){
834843 // Get date field related type
835844 $ search_fields [$ key ] = $ param ;
0 commit comments