dhatu 0.1.5 → 0.1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (51) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/dhatu/blog_posts_controller.rb +5 -5
  3. data/app/controllers/dhatu/bookings_controller.rb +76 -0
  4. data/app/controllers/dhatu/branches_controller.rb +1 -1
  5. data/app/controllers/dhatu/categories_controller.rb +14 -12
  6. data/app/controllers/dhatu/events_controller.rb +7 -9
  7. data/app/controllers/dhatu/offers_controller.rb +6 -8
  8. data/app/controllers/dhatu/prices_controller.rb +90 -0
  9. data/app/controllers/dhatu/sections_controller.rb +5 -5
  10. data/app/controllers/dhatu/services_controller.rb +6 -8
  11. data/app/controllers/dhatu/team_members_controller.rb +5 -7
  12. data/app/controllers/dhatu/testimonials_controller.rb +10 -12
  13. data/app/models/dhatu/booking.rb +55 -0
  14. data/app/models/dhatu/category.rb +11 -13
  15. data/app/models/dhatu/event.rb +2 -1
  16. data/app/models/dhatu/offer.rb +1 -0
  17. data/app/models/dhatu/price.rb +59 -0
  18. data/app/models/dhatu/section.rb +1 -14
  19. data/app/models/dhatu/service.rb +1 -14
  20. data/app/uploaders/category_image_uploader.rb +8 -0
  21. data/app/views/dhatu/blog_posts/_show.html.erb +3 -5
  22. data/app/views/dhatu/bookings/_index.html.erb +48 -0
  23. data/app/views/dhatu/bookings/_row.html.erb +18 -0
  24. data/app/views/dhatu/bookings/_show.html.erb +62 -0
  25. data/app/views/dhatu/bookings/index.html.erb +79 -0
  26. data/app/views/dhatu/bookings/show.js.erb +17 -0
  27. data/app/views/dhatu/categories/_form.html.erb +5 -6
  28. data/app/views/dhatu/categories/_index.html.erb +3 -0
  29. data/app/views/dhatu/categories/_row.html.erb +2 -0
  30. data/app/views/dhatu/categories/_show.html.erb +29 -16
  31. data/app/views/dhatu/categories/index.html.erb +10 -4
  32. data/app/views/dhatu/dashboard/_index.html.erb +12 -0
  33. data/app/views/dhatu/events/_form.html.erb +5 -2
  34. data/app/views/dhatu/offers/_form.html.erb +5 -2
  35. data/app/views/dhatu/prices/_form.html.erb +45 -0
  36. data/app/views/dhatu/prices/_index.html.erb +49 -0
  37. data/app/views/dhatu/prices/_row.html.erb +24 -0
  38. data/app/views/dhatu/prices/_show.html.erb +76 -0
  39. data/app/views/dhatu/prices/index.html.erb +69 -0
  40. data/app/views/dhatu/services/_show.html.erb +1 -0
  41. data/app/views/dhatu/team_members/_form.html.erb +10 -2
  42. data/app/views/dhatu/testimonials/_form.html.erb +21 -8
  43. data/app/views/layouts/kuppayam/_sidebar.html.erb +12 -0
  44. data/config/routes.rb +16 -0
  45. data/lib/dhatu/version.rb +1 -1
  46. data/spec/dummy/spec/factories/blog_post.rb +2 -0
  47. data/spec/dummy/spec/factories/category.rb +51 -0
  48. data/spec/dummy/spec/factories/event.rb +2 -0
  49. data/spec/dummy/spec/factories/offer.rb +1 -1
  50. data/spec/dummy/spec/factories/section.rb +2 -0
  51. metadata +23 -8
@@ -0,0 +1,69 @@
1
+ <div class="row">
2
+
3
+ <div class="col-md-12">
4
+
5
+ <div class="tabs-vertical-env">
6
+
7
+ <ul id="div_category_types" class="nav tabs-vertical">
8
+ <% @categories.each do |ct| %>
9
+ <li class="<%= ct == @category ? 'active' : '' %>">
10
+ <%= link_to ct.name, prices_path(ct: ct.id) %>
11
+ </li>
12
+ <% end %>
13
+ </ul>
14
+
15
+ <!-- <ul class="nav nav-tabs nav-tabs-justified">
16
+ <%# Dhatu::Price::STATUS.each do |key, value| %>
17
+ <li class="<%#= @status == value ? 'active' : '' %>">
18
+ <%#= link_to dhatu.prices_path(st: value), "aria-expanded" => "#{ @status == value ? 'true' : 'false' }" do %>
19
+ <span class="visible-xs"><i class="fa-gift"></i></span>
20
+ <span class="hidden-xs"><%#= key %></span>
21
+ <%# end %>
22
+ </li>
23
+ <%# end %>
24
+ </ul> -->
25
+
26
+ <div class="tab-content">
27
+ <div class="tab-pane active">
28
+
29
+ <div id="div_price_action_buttons">
30
+ <div class="row">
31
+ <div class="col-sm-6">
32
+ <%= theme_button('Add a Price', 'plus', dhatu.new_price_path(), classes: "pull-left mr-10", btn_type: "success") if @current_user.has_create_permission?(Dhatu::Price) %>
33
+
34
+ <%= theme_button('Refresh', 'refresh', dhatu.prices_path(st: @status), classes: "pull-left mr-10", btn_type: "white") %>
35
+ </div>
36
+ <div class="col-sm-6">
37
+ <%= search_form_kuppayam(Dhatu::Price, dhatu.prices_path(st: @status), text: @filters[:query]) %>
38
+ </div>
39
+ </div>
40
+
41
+ </div>
42
+ <%= clear_tag(10) %>
43
+
44
+ <div id="div_price_index">
45
+ <%= render :partial=>"dhatu/prices/index" %>
46
+ </div>
47
+ <%= clear_tag(10) %>
48
+
49
+ </div>
50
+ </div>
51
+
52
+ </div>
53
+
54
+ </div>
55
+
56
+ </div>
57
+
58
+ <script type="text/javascript">
59
+ $('body').on('change', '#inp_name', function() {
60
+ var priceId = $('#inp_permalink').data("id");
61
+ if(priceId){
62
+ } else {
63
+ var permalink = convertToSlug($(this).val()).slice(0, 63);
64
+ $('#inp_permalink').val(permalink);
65
+ }
66
+ });
67
+ </script>
68
+
69
+
@@ -34,6 +34,7 @@
34
34
  <div class="col-md-3 col-sm-12 col-xs-12">
35
35
  <%= display_manage_buttons(@service) %>
36
36
  <%= display_publishable_buttons(@service) %>
37
+ <%= display_featurable_buttons(@service) %>
37
38
  </div>
38
39
  <% end %>
39
40
 
@@ -14,8 +14,16 @@
14
14
  <!-- Name (string) -->
15
15
  <%= theme_form_field(@team_member, :name, form_style: "top-bottom", html_options: { placeholder: "Dr. Alexander Grahambell"}) -%>
16
16
 
17
- <!-- Designation (string) -->
18
- <%= theme_form_field(@team_member, :designation, form_style: "top-bottom", html_options: { placeholder: "Vice President"}, required: false) -%>
17
+ <div class="row">
18
+ <div class="col-md-4 pr-20">
19
+ <!-- Designation (string) -->
20
+ <%= theme_form_field(@team_member, :designation, form_style: "top-bottom", html_options: { placeholder: "Vice President"}, required: false) -%>
21
+ </div>
22
+ <div class="col-md-4 pr-20">
23
+ <!-- Priority (integer) -->
24
+ <%= theme_form_field(@team_member, :priority, required: false, html_options: {type: :number, style: "width:70px;"}, form_style: "top-bottom") %>
25
+ </div>
26
+ </div>
19
27
 
20
28
  <!-- Statement (text) -->
21
29
  <%= theme_form_field(@team_member, :description, required: true, required: false, html_options: {type: :textarea, class: "form-control wysihtml5", "data-stylesheet-url": "assets/wysiwyg-color.css"}, form_style: "top-bottom") -%>
@@ -10,15 +10,28 @@
10
10
 
11
11
  <div class="form-inputs m-15">
12
12
 
13
- <!-- Name (string) -->
14
- <%= theme_form_field(@testimonial, :name, form_style: "top-bottom", html_options: { placeholder: "Dr. Alexander Grahambell"}) -%>
15
-
16
- <!-- Designation (string) -->
17
- <%= theme_form_field(@testimonial, :designation, form_style: "top-bottom", html_options: { placeholder: "Vice President"}) -%>
18
-
19
- <!-- Organisation (string) -->
20
- <%= theme_form_field(@testimonial, :organisation, form_style: "top-bottom", html_options: { placeholder: "ABC Oil Corporation"}) -%>
13
+ <div class="row">
14
+ <div class="col-md-4 pr-20">
15
+ <!-- Name (string) -->
16
+ <%= theme_form_field(@testimonial, :name, form_style: "top-bottom", html_options: { placeholder: "Dr. Alexander Grahambell"}) -%>
17
+ </div>
18
+ <div class="col-md-4 pr-20">
19
+ <!-- Designation (string) -->
20
+ <%= theme_form_field(@testimonial, :designation, form_style: "top-bottom", html_options: { placeholder: "Vice President"}) -%>
21
+ </div>
22
+ </div>
21
23
 
24
+ <div class="row">
25
+ <div class="col-md-4 pr-20">
26
+ <!-- Organisation (string) -->
27
+ <%= theme_form_field(@testimonial, :organisation, form_style: "top-bottom", html_options: { placeholder: "ABC Oil Corporation"}) -%>
28
+ </div>
29
+ <div class="col-md-4 pr-20">
30
+ <!-- Priority (integer) -->
31
+ <%= theme_form_field(@team_member, :priority, required: false, html_options: {type: :number, style: "width:70px;"}, form_style: "top-bottom") %>
32
+ </div>
33
+ </div>
34
+
22
35
  <!-- Statement (text) -->
23
36
  <%= theme_form_field(@testimonial, :statement, required: true, html_options: {type: :textarea, class: "form-control wysihtml5", "data-stylesheet-url": "assets/wysiwyg-color.css"}, form_style: "top-bottom") -%>
24
37
 
@@ -1,5 +1,11 @@
1
1
  <%
2
2
  dhatu_items = {
3
+ bookings: {
4
+ text: "Bookings",
5
+ icon_class: "fa-calendar",
6
+ url: dhatu.bookings_url,
7
+ has_permission: @current_user.has_read_permission?(Dhatu::Booking)
8
+ },
3
9
  sections: {
4
10
  text: "Sections",
5
11
  icon_class: "fa-reorder",
@@ -18,6 +24,12 @@
18
24
  url: dhatu.services_url,
19
25
  has_permission: @current_user.has_read_permission?(Dhatu::Service)
20
26
  },
27
+ prices: {
28
+ text: "Prices",
29
+ icon_class: "fa-dollar",
30
+ url: dhatu.prices_url,
31
+ has_permission: @current_user.has_read_permission?(Dhatu::Price)
32
+ },
21
33
  branches: {
22
34
  text: "Branches",
23
35
  icon_class: "fa-location-arrow",
@@ -4,6 +4,14 @@ Dhatu::Engine.routes.draw do
4
4
 
5
5
  scope :admin do
6
6
 
7
+ resources :bookings, only: [:index, :show] do
8
+ member do
9
+ put :update_status, as: :update_status
10
+ put :mark_as_featured
11
+ put :remove_from_featured
12
+ end
13
+ end
14
+
7
15
  resources :services do
8
16
  member do
9
17
  put :update_status, as: :update_status
@@ -12,6 +20,14 @@ Dhatu::Engine.routes.draw do
12
20
  end
13
21
  end
14
22
 
23
+ resources :prices do
24
+ member do
25
+ put :update_status, as: :update_status
26
+ put :mark_as_featured
27
+ put :remove_from_featured
28
+ end
29
+ end
30
+
15
31
  resources :branches do
16
32
  member do
17
33
  put :make_main, as: :make_main
@@ -1,3 +1,3 @@
1
1
  module Dhatu
2
- VERSION = '0.1.5'
2
+ VERSION = '0.1.6'
3
3
  end
@@ -10,6 +10,8 @@ FactoryGirl.define do
10
10
  meta_description "Blog post meta description which explain the essence of the post."
11
11
  description "Some Blog Post Description which is not less than 10 characters."
12
12
 
13
+ association :category, factory: :published_blog_post_category
14
+
13
15
  posted_at { Time.now - 4.hours }
14
16
  tags {{key1: "val1", key2: "val2"}}
15
17
 
@@ -0,0 +1,51 @@
1
+ FactoryGirl.define do
2
+
3
+ factory :category, class: Dhatu::Category do
4
+ name "Category Name"
5
+ one_liner "Category Name"
6
+ description "Category Short Description"
7
+ featured false
8
+ end_node true
9
+ end
10
+
11
+ factory :published_category, parent: :category do
12
+ status "published"
13
+ end
14
+
15
+ factory :unpublished_category, parent: :category do
16
+ status "unpublished"
17
+ end
18
+
19
+ factory :removed_category, parent: :category do
20
+ status "removed"
21
+ end
22
+
23
+ factory :featured_category, parent: :published_category do
24
+ featured true
25
+ end
26
+
27
+ factory :published_blog_post_category, parent: :category do
28
+ category_type "Dhatu::BlogPost"
29
+ end
30
+
31
+ factory :published_event_category, parent: :category do
32
+ category_type "Dhatu::Event"
33
+ end
34
+
35
+ factory :published_offer_category, parent: :category do
36
+ category_type "Dhatu::Offer"
37
+ end
38
+
39
+ factory :published_price_category, parent: :category do
40
+ category_type "Dhatu::Price"
41
+ end
42
+
43
+ factory :published_section_category, parent: :category do
44
+ category_type "Dhatu::Section"
45
+ end
46
+
47
+ factory :published_services_category, parent: :category do
48
+ category_type "Dhatu::Service"
49
+ end
50
+
51
+ end
@@ -8,6 +8,8 @@ FactoryGirl.define do
8
8
 
9
9
  date { Date.today }
10
10
 
11
+ association :category, factory: :published_event_category
12
+
11
13
  starts_at { Time.now - 4.hours }
12
14
  ends_at { Time.now - 1.hours }
13
15
 
@@ -4,7 +4,7 @@ FactoryGirl.define do
4
4
  title "Offer Title"
5
5
  offer_text "AED 1000 only"
6
6
  description "Some Offer Description"
7
-
7
+ association :category, factory: :published_offer_category
8
8
  starts_at { Time.now - 4.hours }
9
9
  ends_at { Time.now - 1.hours }
10
10
  end
@@ -14,6 +14,8 @@ FactoryGirl.define do
14
14
  button_one_link "www.domain.com/link_one"
15
15
  button_two_link "www.domain.com/link_two"
16
16
 
17
+ association :category, factory: :published_section_category
18
+
17
19
  end
18
20
 
19
21
  factory :published_section, parent: :unpublished_section do
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dhatu
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.5
4
+ version: 0.1.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - kpvarma
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-11-04 00:00:00.000000000 Z
11
+ date: 2017-11-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -107,7 +107,7 @@ dependencies:
107
107
  version: '0.1'
108
108
  - - ">="
109
109
  - !ruby/object:Gem::Version
110
- version: 0.1.19
110
+ version: 0.1.22
111
111
  type: :runtime
112
112
  prerelease: false
113
113
  version_requirements: !ruby/object:Gem::Requirement
@@ -117,7 +117,7 @@ dependencies:
117
117
  version: '0.1'
118
118
  - - ">="
119
119
  - !ruby/object:Gem::Version
120
- version: 0.1.19
120
+ version: 0.1.22
121
121
  - !ruby/object:Gem::Dependency
122
122
  name: pattana
123
123
  requirement: !ruby/object:Gem::Requirement
@@ -127,7 +127,7 @@ dependencies:
127
127
  version: '0.1'
128
128
  - - ">="
129
129
  - !ruby/object:Gem::Version
130
- version: 0.1.15
130
+ version: 0.1.18
131
131
  type: :runtime
132
132
  prerelease: false
133
133
  version_requirements: !ruby/object:Gem::Requirement
@@ -137,7 +137,7 @@ dependencies:
137
137
  version: '0.1'
138
138
  - - ">="
139
139
  - !ruby/object:Gem::Version
140
- version: 0.1.15
140
+ version: 0.1.18
141
141
  - !ruby/object:Gem::Dependency
142
142
  name: usman
143
143
  requirement: !ruby/object:Gem::Requirement
@@ -147,7 +147,7 @@ dependencies:
147
147
  version: '0.3'
148
148
  - - ">="
149
149
  - !ruby/object:Gem::Version
150
- version: 0.3.12
150
+ version: 0.3.16
151
151
  type: :runtime
152
152
  prerelease: false
153
153
  version_requirements: !ruby/object:Gem::Requirement
@@ -157,7 +157,7 @@ dependencies:
157
157
  version: '0.3'
158
158
  - - ">="
159
159
  - !ruby/object:Gem::Version
160
- version: 0.3.12
160
+ version: 0.3.16
161
161
  - !ruby/object:Gem::Dependency
162
162
  name: bcrypt
163
163
  requirement: !ruby/object:Gem::Requirement
@@ -407,11 +407,13 @@ files:
407
407
  - app/assets/stylesheets/dhatu/application.css
408
408
  - app/controllers/dhatu/application_controller.rb
409
409
  - app/controllers/dhatu/blog_posts_controller.rb
410
+ - app/controllers/dhatu/bookings_controller.rb
410
411
  - app/controllers/dhatu/branches_controller.rb
411
412
  - app/controllers/dhatu/categories_controller.rb
412
413
  - app/controllers/dhatu/dashboard_controller.rb
413
414
  - app/controllers/dhatu/events_controller.rb
414
415
  - app/controllers/dhatu/offers_controller.rb
416
+ - app/controllers/dhatu/prices_controller.rb
415
417
  - app/controllers/dhatu/resource_controller.rb
416
418
  - app/controllers/dhatu/sections_controller.rb
417
419
  - app/controllers/dhatu/services_controller.rb
@@ -422,10 +424,12 @@ files:
422
424
  - app/mailers/dhatu/application_mailer.rb
423
425
  - app/models/dhatu/application_record.rb
424
426
  - app/models/dhatu/blog_post.rb
427
+ - app/models/dhatu/booking.rb
425
428
  - app/models/dhatu/branch.rb
426
429
  - app/models/dhatu/category.rb
427
430
  - app/models/dhatu/event.rb
428
431
  - app/models/dhatu/offer.rb
432
+ - app/models/dhatu/price.rb
429
433
  - app/models/dhatu/section.rb
430
434
  - app/models/dhatu/service.rb
431
435
  - app/models/dhatu/team_member.rb
@@ -437,6 +441,11 @@ files:
437
441
  - app/views/dhatu/blog_posts/_row.html.erb
438
442
  - app/views/dhatu/blog_posts/_show.html.erb
439
443
  - app/views/dhatu/blog_posts/index.html.erb
444
+ - app/views/dhatu/bookings/_index.html.erb
445
+ - app/views/dhatu/bookings/_row.html.erb
446
+ - app/views/dhatu/bookings/_show.html.erb
447
+ - app/views/dhatu/bookings/index.html.erb
448
+ - app/views/dhatu/bookings/show.js.erb
440
449
  - app/views/dhatu/branches/_form.html.erb
441
450
  - app/views/dhatu/branches/_index.html.erb
442
451
  - app/views/dhatu/branches/_row.html.erb
@@ -459,6 +468,11 @@ files:
459
468
  - app/views/dhatu/offers/_row.html.erb
460
469
  - app/views/dhatu/offers/_show.html.erb
461
470
  - app/views/dhatu/offers/index.html.erb
471
+ - app/views/dhatu/prices/_form.html.erb
472
+ - app/views/dhatu/prices/_index.html.erb
473
+ - app/views/dhatu/prices/_row.html.erb
474
+ - app/views/dhatu/prices/_show.html.erb
475
+ - app/views/dhatu/prices/index.html.erb
462
476
  - app/views/dhatu/sections/_form.html.erb
463
477
  - app/views/dhatu/sections/_index.html.erb
464
478
  - app/views/dhatu/sections/_row.html.erb
@@ -497,6 +511,7 @@ files:
497
511
  - spec/dummy/spec/factories/blog_post_cover_image.rb
498
512
  - spec/dummy/spec/factories/blog_post_gallery_image.rb
499
513
  - spec/dummy/spec/factories/branch.rb
514
+ - spec/dummy/spec/factories/category.rb
500
515
  - spec/dummy/spec/factories/event.rb
501
516
  - spec/dummy/spec/factories/event_cover_image.rb
502
517
  - spec/dummy/spec/factories/event_gallery_image.rb