smartkiosk-client 0.1.8 → 0.1.9
Sign up to get free protection for your applications and to get access to all the features.
- data/app/models/payment.rb +1 -1
- data/config/boot.rb +3 -0
- data/lib/smartkiosk/client/version.rb +1 -1
- data/smartkiosk-client.gemspec +1 -0
- metadata +19 -3
data/app/models/payment.rb
CHANGED
@@ -38,7 +38,7 @@ class Payment < ActiveRecord::Base
|
|
38
38
|
:payment_paid_amount => paid_amount || 0,
|
39
39
|
:payment_enrolled_amount => ((paid_amount || 0) - (commission_amount || 0)).round(2),
|
40
40
|
:payment_commission_amount => commission_amount || 0,
|
41
|
-
:payment_paid_at => I18n.l(updated_at)
|
41
|
+
:payment_paid_at => I18n.l(updated_at.in_time_zone Time.zone)
|
42
42
|
}
|
43
43
|
end
|
44
44
|
end
|
data/config/boot.rb
CHANGED
@@ -5,11 +5,14 @@ require 'sass'
|
|
5
5
|
require 'sprockets'
|
6
6
|
require 'sprockets/sass'
|
7
7
|
require 'sprockets/helpers'
|
8
|
+
require 'timezone_local'
|
8
9
|
|
9
10
|
require 'sinatra/base'
|
10
11
|
require 'sinatra/activerecord'
|
11
12
|
require 'sinatra/reloader'
|
12
13
|
|
14
|
+
Time.zone = TimeZone::Local.get()
|
15
|
+
|
13
16
|
module Smartkiosk
|
14
17
|
class Client < Sinatra::Base
|
15
18
|
register Sinatra::ActiveRecordExtension
|
data/smartkiosk-client.gemspec
CHANGED
@@ -27,6 +27,7 @@ Gem::Specification.new do |gem|
|
|
27
27
|
gem.add_dependency 'sprockets-sass', '0.9.1'
|
28
28
|
gem.add_dependency 'sprockets-helpers', '0.8.0'
|
29
29
|
gem.add_dependency 'trollop', '2.0'
|
30
|
+
gem.add_dependency 'timezone_local', '0.1.5'
|
30
31
|
|
31
32
|
gem.add_dependency 'eventmachine', '1.0.0'
|
32
33
|
gem.add_dependency 'em-websocket', '0.4.0'
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: smartkiosk-client
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.9
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -188,6 +188,22 @@ dependencies:
|
|
188
188
|
- - '='
|
189
189
|
- !ruby/object:Gem::Version
|
190
190
|
version: '2.0'
|
191
|
+
- !ruby/object:Gem::Dependency
|
192
|
+
name: timezone_local
|
193
|
+
requirement: !ruby/object:Gem::Requirement
|
194
|
+
none: false
|
195
|
+
requirements:
|
196
|
+
- - '='
|
197
|
+
- !ruby/object:Gem::Version
|
198
|
+
version: 0.1.5
|
199
|
+
type: :runtime
|
200
|
+
prerelease: false
|
201
|
+
version_requirements: !ruby/object:Gem::Requirement
|
202
|
+
none: false
|
203
|
+
requirements:
|
204
|
+
- - '='
|
205
|
+
- !ruby/object:Gem::Version
|
206
|
+
version: 0.1.5
|
191
207
|
- !ruby/object:Gem::Dependency
|
192
208
|
name: eventmachine
|
193
209
|
requirement: !ruby/object:Gem::Requirement
|
@@ -610,7 +626,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
610
626
|
version: '0'
|
611
627
|
segments:
|
612
628
|
- 0
|
613
|
-
hash:
|
629
|
+
hash: 1362776259685194902
|
614
630
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
615
631
|
none: false
|
616
632
|
requirements:
|
@@ -619,7 +635,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
619
635
|
version: '0'
|
620
636
|
segments:
|
621
637
|
- 0
|
622
|
-
hash:
|
638
|
+
hash: 1362776259685194902
|
623
639
|
requirements: []
|
624
640
|
rubyforge_project:
|
625
641
|
rubygems_version: 1.8.23
|