Merge pull request #70 from StemboltHQ/fix_date_conversion_problem_wh…

…en_creating_bet Fix date conversion problem when creating bet
StemboltHQ · Apr 12, 2017 · 8129e77 · 8129e77
2 parents b036263 + 9f24d6a
commit 8129e77
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/app/assets/javascripts/lib/date_picker.js b/app/assets/javascripts/lib/date_picker.js
@@ -1,5 +1,6 @@
 $(document).on("turbolinks:load", function(){
   $(".jquery-datepicker").datetimepicker({
-    minDate: "0"
+    minDate: "0",
+    format: "Y-m-d G:i:s P"
   });
 });
diff --git a/app/views/shared/_bet_display.html.erb b/app/views/shared/_bet_display.html.erb
@@ -12,7 +12,7 @@
         </div>
 
         <div class="card-footer text-danger">
-          Expires on: <%= bet.expires_at.strftime('%A, %B %d %Y, %l:%M %P') %>
+          Expires on: <%= bet.expires_at.localtime.strftime('%A, %B %d %Y, %l:%M %P') %>
       </div>
       </div>
     </div>

diff --git a/config/application.rb b/config/application.rb
@@ -11,5 +11,6 @@ class Application < Rails::Application
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
+    config.time_zone = 'Pacific Time (US & Canada)'
   end
 end
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ @@
             </div>
             <div class="card-footer text-danger">
-              Expires on: <%= bet.expires_at.strftime('%A, %B %d %Y, %l:%M %P') %>
+              Expires on: <%= bet.expires_at.localtime.strftime('%A, %B %d %Y, %l:%M %P') %>
           </div>
           </div>
         </div>
@@ Expand Down @@