cd2_catton_cms 1.1.10 → 1.1.20

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
  SHA1:
3
- metadata.gz: 49fa751153745d0e04a74b61e8316736f0f9c1f7
4
- data.tar.gz: d973468185aa39a9b5be0ef3bb16d01180d75c74
3
+ metadata.gz: 1806dbd983b8d96ad95ef63b5e6013c128ef9e96
4
+ data.tar.gz: acc29caea79cb169aa26c9ccc482b8d04c86dba6
5
5
  SHA512:
6
- metadata.gz: a46a2171ff8c005db4b5f9574ee061f0bc0a8d4bf3560ba040f1d4852a3041c8b1a343fe4e507b177706443fc1ff7fe1e4368d897af27f1eecff3621165885e6
7
- data.tar.gz: df36acc3b7efafb2353843f9e01c84e2e77a525dcc9955bab115647747ae0de9f1785a3d9d8ad03bd61b5329fdd1253a1642d1149707b6e828ccaa3f01414285
6
+ metadata.gz: bfee3511f6ca3de99318b780f0e870375de80f2616b93d87ef17d716b278839ad0a425bcf7fe361e2233a67e8afb2b61ce0ed9aa406f7f01e8ced4b1748d7b2e
7
+ data.tar.gz: 6f4d6061fab40b468a4f80a15183ba12a5e7f258ed5c8f4c5993cc8cd343cdfaf5fa909ba9e603b7b21a5f7d9d5a15c28e74eeaa7c08f13c2a60ec20cd42d3df
@@ -1,84 +1,11 @@
1
1
  # frozen_string_literal: true
2
2
  module C
3
3
  class Enquiry < ApplicationRecord
4
- enum job_type: [
5
- 'Supply Only',
6
- 'Supply and Fit',
7
- ]
8
-
9
- enum response_type: [
10
- 'Callback',
11
- 'Quote'
12
- ]
13
-
14
- enum timber_type: [
15
- 'Hardwood',
16
- 'European Oak',
17
- 'Accoya',
18
- 'Other',
19
- ]
20
-
21
- enum frame: [
22
- 'Braemar',
23
- 'Buttermilk',
24
- 'Dove Grey',
25
- 'Forest Green',
26
- 'Garsenia',
27
- 'Oxford Blue',
28
- 'Poppy Red',
29
- 'RAL7034',
30
- 'Techno White',
31
- 'Dark Oak',
32
- 'Mahogany',
33
- 'Rosewood',
34
- 'Sikkins Teak',
35
- 'African Walnut',
36
- 'Antique Pine',
37
- 'Ebony',
38
- 'Jacobean Walnut',
39
- 'Red Wood',
40
- 'Saddolins Teak'
41
- ]
42
-
43
- enum handle: [
44
- 'Chrome',
45
- 'Black',
46
- 'Gold',
47
- 'Satin',
48
- 'White',
49
- 'Monkey Tail'
50
- ]
51
-
52
- mount_uploader :file, C::FileUploader
53
-
54
- validates :phone, presence: true
55
- validates :response_type, presence: true
56
4
 
57
5
  validates :name, presence: true
58
6
 
59
7
  scope :ordered, -> { order created_at: :desc }
60
8
 
61
- def get_jobs_selected
62
- this = []
63
- this << 'Windows' if job_windows
64
- this << 'Doors' if job_doors
65
- this << 'Bi-Fold Doors' if job_bi
66
- this << 'Conservatory' if job_conservatory
67
- this << 'Lantern Tops' if job_lantern
68
- this << 'Garden Rooms' if job_garden
69
- this << 'Orangery' if job_orangery
70
- this << "Other: #{job_string}" if job_other
71
- return this.join(', ')
72
- end
73
-
74
- def get_timber_selected
75
- if timber_type == 'Other'
76
- return 'Other: ' + timber_string
77
- else
78
- return timber_type
79
- end
80
- end
81
-
82
9
  VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i
83
10
  validates :email,
84
11
  presence: true,
data/lib/c/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  # frozen_string_literal: true
2
2
  module C
3
- VERSION = '1.1.10'
3
+ VERSION = '1.1.20'
4
4
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cd2_catton_cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.10
4
+ version: 1.1.20
5
5
  platform: ruby
6
6
  authors:
7
7
  - CD2
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-12-15 00:00:00.000000000 Z
11
+ date: 2018-01-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -655,80 +655,80 @@ required_rubygems_version: !ruby/object:Gem::Requirement
655
655
  version: '0'
656
656
  requirements: []
657
657
  rubyforge_project:
658
- rubygems_version: 2.6.11
658
+ rubygems_version: 2.6.13
659
659
  signing_key:
660
660
  specification_version: 4
661
661
  summary: cms
662
662
  test_files:
663
- - spec/spec_helper.rb
664
- - spec/dummy/seed/images/1/main.jpg
665
- - spec/dummy/seed/images/1/thumb2.jpg
666
- - spec/dummy/seed/images/1/thumb.JPG
667
- - spec/dummy/seed/images/2/main.jpeg
668
- - spec/dummy/seed/images/2/thumb2.JPG
669
- - spec/dummy/seed/images/2/thumb.JPG
670
- - spec/dummy/seed/highlight2.png
671
- - spec/dummy/seed/highlight1.png
672
- - spec/dummy/app/models/page.rb
673
- - spec/dummy/app/models/application_record.rb
674
- - spec/dummy/app/controllers/application_controller.rb
675
- - spec/dummy/app/controllers/blogs_controller.rb
676
- - spec/dummy/app/controllers/pages_controller.rb
677
663
  - spec/dummy/app/assets/config/manifest.js
678
664
  - spec/dummy/app/assets/images/placeholder.png
679
- - spec/dummy/app/assets/javascripts/pages.coffee
680
- - spec/dummy/app/assets/javascripts/cable.js
681
665
  - spec/dummy/app/assets/javascripts/application.js
666
+ - spec/dummy/app/assets/javascripts/cable.js
667
+ - spec/dummy/app/assets/javascripts/pages.coffee
682
668
  - spec/dummy/app/assets/stylesheets/application.sass
683
669
  - spec/dummy/app/assets/stylesheets/c/application.sass
684
- - spec/dummy/bin/update
685
- - spec/dummy/bin/rake
686
- - spec/dummy/bin/setup
670
+ - spec/dummy/app/controllers/application_controller.rb
671
+ - spec/dummy/app/controllers/blogs_controller.rb
672
+ - spec/dummy/app/controllers/pages_controller.rb
673
+ - spec/dummy/app/models/application_record.rb
674
+ - spec/dummy/app/models/page.rb
687
675
  - spec/dummy/bin/bundle
688
676
  - spec/dummy/bin/rails
689
- - spec/dummy/config/secrets.yml
690
- - spec/dummy/config/routes.rb
691
- - spec/dummy/config/sidekiq.yml
692
- - spec/dummy/config/locales/en.yml
677
+ - spec/dummy/bin/rake
678
+ - spec/dummy/bin/setup
679
+ - spec/dummy/bin/update
680
+ - spec/dummy/config/application.rb
681
+ - spec/dummy/config/boot.rb
693
682
  - spec/dummy/config/cable.yml
694
- - spec/dummy/config/environments/production.rb
695
- - spec/dummy/config/environments/development.rb
696
- - spec/dummy/config/environments/test.rb
697
- - spec/dummy/config/spring.rb
698
683
  - spec/dummy/config/database.travis.yml
699
- - spec/dummy/config/environment.rb
700
- - spec/dummy/config/application.rb
701
- - spec/dummy/config/puma.rb
702
684
  - spec/dummy/config/database.yml
703
- - spec/dummy/config/boot.rb
685
+ - spec/dummy/config/environment.rb
686
+ - spec/dummy/config/environments/development.rb
687
+ - spec/dummy/config/environments/production.rb
688
+ - spec/dummy/config/environments/test.rb
704
689
  - spec/dummy/config/initializers/application_controller_renderer.rb
690
+ - spec/dummy/config/initializers/assets.rb
705
691
  - spec/dummy/config/initializers/backtrace_silencers.rb
706
692
  - spec/dummy/config/initializers/carrierwave.rb
707
- - spec/dummy/config/initializers/mime_types.rb
693
+ - spec/dummy/config/initializers/commercity.rb
694
+ - spec/dummy/config/initializers/cookies_serializer.rb
708
695
  - spec/dummy/config/initializers/filter_parameter_logging.rb
696
+ - spec/dummy/config/initializers/inflections.rb
697
+ - spec/dummy/config/initializers/mime_types.rb
698
+ - spec/dummy/config/initializers/new_framework_defaults.rb
709
699
  - spec/dummy/config/initializers/session_store.rb
710
700
  - spec/dummy/config/initializers/wrap_parameters.rb
711
- - spec/dummy/config/initializers/new_framework_defaults.rb
712
- - spec/dummy/config/initializers/assets.rb
713
- - spec/dummy/config/initializers/cookies_serializer.rb
714
- - spec/dummy/config/initializers/commercity.rb
715
- - spec/dummy/config/initializers/inflections.rb
701
+ - spec/dummy/config/locales/en.yml
702
+ - spec/dummy/config/puma.rb
703
+ - spec/dummy/config/routes.rb
704
+ - spec/dummy/config/secrets.yml
705
+ - spec/dummy/config/sidekiq.yml
706
+ - spec/dummy/config/spring.rb
716
707
  - spec/dummy/config.ru
717
- - spec/dummy/spec/models/redirect_spec.rb
718
- - spec/dummy/spec/support/seed/images/product_image.png
719
- - spec/dummy/spec/support/factory_girl.rb
720
- - spec/dummy/Rakefile
721
- - spec/dummy/public/favicon.ico
722
- - spec/dummy/public/422.html
723
- - spec/dummy/public/apple-touch-icon.png
724
- - spec/dummy/public/500.html
725
- - spec/dummy/public/404.html
726
- - spec/dummy/public/apple-touch-icon-precomposed.png
727
- - spec/dummy/lib/tasks/reset_all.rake
728
- - spec/dummy/lib/tasks/seeds/seed_blogs.rake
729
- - spec/dummy/lib/tasks/seeds/seed_pages.rake
730
- - spec/dummy/lib/tasks/reprocess_images.rake
731
708
  - spec/dummy/db/schema.rb
732
709
  - spec/dummy/Gemfile
733
710
  - spec/dummy/Gemfile.lock
711
+ - spec/dummy/lib/tasks/reprocess_images.rake
712
+ - spec/dummy/lib/tasks/reset_all.rake
713
+ - spec/dummy/lib/tasks/seeds/seed_blogs.rake
714
+ - spec/dummy/lib/tasks/seeds/seed_pages.rake
715
+ - spec/dummy/public/404.html
716
+ - spec/dummy/public/422.html
717
+ - spec/dummy/public/500.html
718
+ - spec/dummy/public/apple-touch-icon-precomposed.png
719
+ - spec/dummy/public/apple-touch-icon.png
720
+ - spec/dummy/public/favicon.ico
721
+ - spec/dummy/Rakefile
722
+ - spec/dummy/seed/highlight1.png
723
+ - spec/dummy/seed/highlight2.png
724
+ - spec/dummy/seed/images/1/main.jpg
725
+ - spec/dummy/seed/images/1/thumb.JPG
726
+ - spec/dummy/seed/images/1/thumb2.jpg
727
+ - spec/dummy/seed/images/2/main.jpeg
728
+ - spec/dummy/seed/images/2/thumb.JPG
729
+ - spec/dummy/seed/images/2/thumb2.JPG
730
+ - spec/dummy/spec/models/redirect_spec.rb
731
+ - spec/dummy/spec/support/factory_girl.rb
732
+ - spec/dummy/spec/support/seed/images/product_image.png
734
733
  - spec/rails_helper.rb
734
+ - spec/spec_helper.rb