From fee64a5764a548c66e7eb925642d199d8743c01f Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Tue, 4 Dec 2012 09:43:28 +1100
Subject: [PATCH] Datetime recognises input datetime format

---
 app/assets/javascripts/admin/order_cycle.js.erb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/admin/order_cycle.js.erb b/app/assets/javascripts/admin/order_cycle.js.erb
index a11e72f545..399d1975b2 100644
--- a/app/assets/javascripts/admin/order_cycle.js.erb
+++ b/app/assets/javascripts/admin/order_cycle.js.erb
@@ -114,7 +114,8 @@ angular.module('order_cycle', ['ngResource']).
       // using $parse instead of scope[attrs.datetimepicker] for cases
       // where attrs.datetimepicker is 'foo.bar.lol'
       $(element).datetimepicker({
-	dateFormat: Spree.translations.date_picker,
+	dateFormat: 'yy-mm-dd',
+	timeFormat: 'HH:mm:ss',
 	showOn: "button",
 	buttonImage: "<%= asset_path 'datepicker/cal.gif' %>",
 	buttonImageOnly: true,