dhatu 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a64565b15733b69599bd45a1a1f8af93c19057ee
-  data.tar.gz: 85ee2980fc41693f436a7996fd114912c56d0106
+  metadata.gz: 207582844252cbc513c51d56cd5ca842b933a252
+  data.tar.gz: 48bb89706fa65a6b83e2bb822f078e9f8f253c11
 SHA512:
-  metadata.gz: 8fa1dad1ce288a3215606a44819c5b1c539b50cf6436732fe8daa4590e08dc8aaefe55826e0dbc69101e83cda03d73448e8d50909efd376ec641965bc0e2da88
-  data.tar.gz: 9ec7b138ff2af5df71e299dccd35749982763d224e8377f958ef0d06ff20b64b0ec2d663fcb8c23fc6cd806f89880c589d20f9f3a14db2d07f0b73c8c6641395
+  metadata.gz: 20c3cc6e28d138f9decf50ccc03655fd3b58c0197cc6fd73e0864e0945051a9e18e50ff4f1369235df8b479b680dfe44859d90f6dc85987016737350dcda429a
+  data.tar.gz: 2dabaff57d5a3c3672fb3216b96b537446c766892e55e4ec5d240e3c19444bd54635dbad75aead27b81c0807ad9b29e5da97852768230846a537a175405b17e5

data/app/controllers/dhatu/promotions_controller.rb

@@ -4,7 +4,7 @@ module Dhatu
     private
 
     def permitted_params
-      params.require("dhatu/promotion").permit(:title, :short_description, :display_name, :display_email, :display_phone, :name_mandatory, :email_mandatory, :phone_mandatory)
+      params.require("dhatu/promotion").permit(:title, :short_description, :display_name, :display_email, :display_phone, :name_mandatory, :email_mandatory, :phone_mandatory, :show_popup, :show_only_on_homepage, :popup_lifespan_in_minutes)
     end
 
     def get_resource
@@ -65,7 +65,8 @@ module Dhatu
         view_path: "dhatu/promotions",
         collection_name: :promotions,
         item_name: :promotion,
-        class: Dhatu::Promotion
+        checkbox_fields: [:name_mandatory, :email_mandatory, :phone_mandatory, :show_popup, :show_only_on_homepage],
+        class: Dhatu::Promotion,
       }
     end
 

data/app/views/dhatu/promotions/_form.html.erb

@@ -37,7 +37,18 @@
           <%= theme_form_field(@promotion, :phone_mandatory, required: false, html_options: {type: :checkbox}, form_style: "top-bottom") %>
         </div>
       </div>
-      
+
+      <div class="row">
+        <div class="col-md-4 pl-20">
+          <%= theme_form_field(@promotion, :show_popup, required: false, html_options: {type: :checkbox}, form_style: "top-bottom") %>
+        </div>
+        <div class="col-md-4 pl-20">
+          <%= theme_form_field(@promotion, :show_only_on_homepage, required: false, html_options: {type: :checkbox}, form_style: "top-bottom") %>
+        </div>
+        <div class="col-md-4 pl-20">
+          <%= theme_form_field(@promotion, :popup_lifespan_in_minutes, required: false, html_options: {type: :number, style: "width:80px"}, form_style: "top-bottom") %>
+        </div>
+      </div>
     </div>
 
     <div>

data/app/views/dhatu/promotions/_show.html.erb

@@ -34,22 +34,52 @@
           <tr>
             <th>Display Name</th>
             <td><%= @promotion.display_name ? "Yes" : "No" %></td>
-            <th>Name Mandatory?</th>
-            <td><%= @promotion.name_mandatory ? "Yes" : "No" %></td>
+            <% if @promotion.display_phone %>
+              <th>Name Mandatory?</th>
+              <td><%= @promotion.name_mandatory ? "Yes" : "No" %></td>
+            <% else %>
+              <th></th>
+              <td></td>
+            <% end %>
           </tr>
 
           <tr>
             <th>Display Email</th>
             <td><%= @promotion.display_email ? "Yes" : "No" %></td>
+            <% if @promotion.display_email %>
             <th>Email Mandatory?</th>
-            <td><%= @promotion.email_mandatory ? "Yes" : "No" %></td>
+            <td><%= @promotion.email_mandatory ? "Yes" : "No" %></td
+              >
+            <% else %>
+              <th></th>
+              <td></td>
+            <% end %>
           </tr>
 
           <tr>
             <th>Display Phone</th>
             <td><%= @promotion.display_phone ? "Yes" : "No" %></td>
+            <% if @promotion.display_phone %>
             <th>Phone Mandatory?</th>
             <td><%= @promotion.phone_mandatory ? "Yes" : "No" %></td>
+            <% else %>
+              <th></th>
+              <td></td>
+            <% end %>
+          </tr>
+
+          <tr>
+            <th>Show Popup</th>
+            <td><%= @promotion.show_popup ? "Yes" : "No" %></td>
+            <th>Show Only on Homepage?</th>
+            <td><%= @promotion.show_only_on_homepage ? "Yes" : "No" %></td>
+          </tr>
+
+          <tr>
+            <th>Popup lifespan in minutes</th>
+            <td><%= @promotion.popup_lifespan_in_minutes %></td>
+            <th></th>
+            <td></td>
           </tr>
           
         </tbody>

data/lib/dhatu/version.rb

@@ -1,3 +1,3 @@
 module Dhatu
-  VERSION = '0.1.14'
+  VERSION = '0.1.15'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dhatu
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - kpvarma