ecom_core 1.2.33 → 1.2.34

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a8a7e36cd705a1ecc9fd9211ee4e16695e93c02bdfec41122592a411f323914b
4
- data.tar.gz: 51fea59e1ee52f090d450d667d27f45628f969aef8005caed0c56c401ae8781f
3
+ metadata.gz: 7f5da9e54b6a4e32ddbc38cfaca7f5aa2706c2d2edfb37ebaf4bd24314604229
4
+ data.tar.gz: bb9bbc08454325024a7175ec2fe4f4ce471578148cd49e4ca0f1c2b37a28a5e1
5
5
  SHA512:
6
- metadata.gz: b12192fe563a2566ac3b8bdc3aeb74597e6a85a985e1d0d4542aa0e6443c8d21865b0161960f68b0a971d1087f42f69da0d35d91b2c22a05a000ae0cc535f209
7
- data.tar.gz: 68647fa87b9ad37c2da425386c04304c91436cf079fd077d56d1917514f381ccdede99b0fe85b07701fd228cb7c01126f4a8edd5eb970e05f1fa6d140acce359
6
+ metadata.gz: 4fc5a1a8b1e1e230f9ee54c3419416e6ebd82a04155df9bc7fc98f3e7fb4e923bc4f18475935d2caf55e26c179661c9659009689d1e9a54d6664f7895af43267
7
+ data.tar.gz: af6d66967c17c381444c08cdb5450afda1e5afaafe1acb217a11831ffa47488a325073b86c1c5ce88d2608d733dd910d8323e69864d6608fb9d814a6729400ed
@@ -32,7 +32,8 @@ module Ecom
32
32
  company = Ecom::Core::Company.first
33
33
  date = employment_date.to_s[0..3]
34
34
  company_name = company ? company.name : ''
35
- self.employee_id = "#{company_name}/#{employment}/#{date}/#{id}"
35
+ employee_id = "#{company_name}/#{employment}/#{date}/#{id}"
36
+ update_column(:employee_id, employee_id)
36
37
  end
37
38
  end
38
39
  end
@@ -49,7 +49,9 @@ module Ecom
49
49
  end
50
50
 
51
51
  if OvertimeSheet.open_exists?(project_id)
52
- raise 'There is already an open overtime sheet. It has to be submitted before creating a new one.'
52
+ open_overtime_sheet = OvertimeSheet.find_by(status: 'Open')
53
+ raise "There is already an open overtime sheet for #{open_overtime_sheet.date}.
54
+ It has to be submitted before creating a new one."
53
55
  end
54
56
 
55
57
  OvertimeSheet.create(date: date, opened_at: Time.now, status: StatusConstants::OPEN, project_id: project_id)
@@ -12,7 +12,14 @@ module Ecom
12
12
  end
13
13
 
14
14
  def filename
15
- original_filename
15
+ "#{secure_token}.#{file.extension}" if original_filename.present?
16
+ end
17
+
18
+ protected
19
+
20
+ def secure_token
21
+ var = :"@#{mounted_as}_secure_token"
22
+ model.instance_variable_get(var) || model.instance_variable_set(var, SecureRandom.uuid)
16
23
  end
17
24
  end
18
25
  end
@@ -1,5 +1,5 @@
1
1
  module Ecom
2
2
  module Core
3
- VERSION = '1.2.33'.freeze
3
+ VERSION = '1.2.34'.freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ecom_core
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.33
4
+ version: 1.2.34
5
5
  platform: ruby
6
6
  authors:
7
7
  - Henock L.
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-10-01 00:00:00.000000000 Z
11
+ date: 2020-10-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: aasm
@@ -497,7 +497,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
497
497
  - !ruby/object:Gem::Version
498
498
  version: '0'
499
499
  requirements: []
500
- rubygems_version: 3.1.4
500
+ rubygems_version: 3.1.2
501
501
  signing_key:
502
502
  specification_version: 4
503
503
  summary: Core engine for construction management application.