dhatu 0.3.8.pre.materialize → 0.3.9.pre.materialize

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c50e82ba159c036a18a8f743d46269e6f84c4d59a0566688cb40b4e0dc8a4fc5
-  data.tar.gz: c6ac9decad26ff0f0b85470bd90e77d93e1643fbbb93e6dd3f854269eb7b120b
+  metadata.gz: 14a97828aea901e835ee1b20a05f0e9af6d07403f0943e359ded44cf1d5c9115
+  data.tar.gz: 7a709e6a1507ada075b97ae0d3996fb6425fd67c887293237f7b288dd74b683b
 SHA512:
-  metadata.gz: be3bed96f12b862ba7b37b1f0eefefbe35892376f6197c9467ce3a269232d2ee12998270a86ad340847b4ea03b878808ad6d642b9a12f9a48b49499cdc21242d
-  data.tar.gz: 2a21d5dd957df3f9f7da300b6f61aaf735ff20339f1355e3b302e971c3fd042a532322974d47fade42bd7f03a087d7ef26a1da61a92ae9c40f0ede17672bcbe4
+  metadata.gz: 28ffbc4721182c6478cc8aedae7f6a2cc12ae644eed6b38d299e9f7f61bde8d8e6b8e9732741efb1f807c6b87fe76fca72e30bdbda4a76465fc32647a8729af1
+  data.tar.gz: 86dc245eba87553360f906150edd9eb704f3c2e84c6420d16d67b69e582c40bb575eb9ad2681321e8fb60bbcc7b1c199d2cee436bfeb4264c16b12e7383af4c0

data/app/controllers/dhatu/promotions_controller.rb

@@ -4,12 +4,13 @@ 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, :show_popup, :show_only_on_homepage, :popup_lifespan_in_minutes)
+      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, :has_redirection, :offer_id)
     end
 
     def get_resource
       @promotion = @r_object = @resource_options[:class].find_by_id(params[:id])
       @promotion_attributes = @promotion.promotion_attributes.page(@current_page).per(@per_page)
+      @offers = @promotion.promotion_attributes.page(@current_page).per(@per_page)
     end
 
     def get_collections
@@ -102,7 +103,7 @@ module Dhatu
         # Both Peacock and Parrot expect table based layout and will reload a single row after create / update
 
         #
-        checkbox_fields: [:name_mandatory, :email_mandatory, :phone_mandatory, :show_popup, :show_only_on_homepage],
+        checkbox_fields: [:name_mandatory, :email_mandatory, :phone_mandatory, :show_popup, :show_only_on_homepage, :has_redirection],
 
         # Rendering Paths
         view_path: "dhatu/promotions",
@@ -128,5 +129,9 @@ module Dhatu
       set_nav("dhatu/promotions")
     end
 
+    def before_resource_validation
+
+    end
+
   end
 end

data/app/models/dhatu/promotion.rb

@@ -16,6 +16,7 @@ class Dhatu::Promotion < Dhatu::ApplicationRecord
   has_many :promotion_attributes
   has_many :promotion_enquiries
   has_one :cover_image, :as => :imageable, :dependent => :destroy, :class_name => "Image::CoverImage"
+  belongs_to :offer, optional: true
   
   # Callbacks
   after_create :generate_and_save_code

data/app/views/dhatu/bookings/_index.html.erb

@@ -26,7 +26,7 @@
 						<% if booking.new? || booking.unread? %>
 							<%= link_to booking.name, booking_path(booking), remote: true, style: "font-weight:800;" %>
 						<% else %>
-							<%= link_to booking.name, booking_path(booking), remote: true %></td>
+							<%= link_to booking.name, booking_path(booking), remote: true %>
 						<% end %>
 						<br><%= link_to booking.email, booking_path(booking), remote: true %> 
 						<br><%= link_to booking.mobile, booking_path(booking), remote: true %>

data/app/views/dhatu/offers/_row.html.erb

@@ -4,13 +4,14 @@
     <%= serial_number(i) %>
   </th>
 
-  <td class="display-image hidden-sm hidden-xs">
+  <td class="display-image">
     <%= display_thumbnail(offer) %>
   </td>
 
-  <td class="display-link"><%= link_to offer.title, offer_path(offer), remote: true %></td>
-
-  <td class="display-link hidden-sm hidden-xs"><%= link_to offer.offer_text, offer_path(offer), remote: true %></td>
+  <td class="display-link">
+    <%= link_to offer.title, offer_path(offer), remote: true, style: "font-weight:bold;color:#4b4b4b;" %><br>
+    <%= link_to offer.offer_text, offer_path(offer), remote: true %>
+  </td>
 
   <td class="hidden-sm hidden-xs"><%= display_featured(offer) %></td>
   

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

@@ -49,6 +49,19 @@
           <%= theme_form_field(@promotion, :popup_lifespan_in_minutes, required: false, html_options: {type: :number, style: "width:80px"}, form_style: "top-bottom") %>
         </div>
       </div>
+
+      <div class="row">
+        <div class="col-md-4 pl-20">
+          <%= theme_form_field(@promotion, :has_redirection, required: false, html_options: {type: :checkbox}, form_style: "top-bottom") %>
+        </div>
+
+        <div class="col-md-4 pl-20">
+          <% @offers = Dhatu::Offer.published %>
+          <% options_list = Array[*@offers.collect {|f| [f.title, f.id] }].sort %>           
+           <%= theme_form_select_group(@promotion, :offer_id, options_list, param_name: "dhatu/promotion[offer_id]", label: "Choose Type", prompt: "Select Offer", form_style: "top-bottom") %>
+        </div>
+      </div>
+
     </div>
 
     <div>

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

@@ -4,7 +4,8 @@
     
     <div class="col-md-9 col-sm-12 col-xs-12">
       <%= theme_panel_heading(@promotion.title) %>
-      <%= theme_panel_sub_heading(@promotion.short_description, "#") if @promotion.short_description %>
+      <%= theme_panel_sub_heading(@promotion.offer.title, "#") if @promotion.offer %>
+      <%= theme_panel_description(@promotion.short_description) %>
       <%= clear_tag(10) %>
       <%= display_publishable_status(@promotion) %>
       <%= display_featured(@promotion) %>
@@ -166,6 +167,22 @@
             <% end %>
           </tr>
 
+          <tr>
+            <th colspan="4"></th>
+          </tr>
+
+          <tr>
+            <th>Redirect to Offer Page</th>
+            <td colspan="3">
+              <%= @promotion.has_redirection ? "Yes" : "No" %>
+              (<%= @promotion.offer.try(:title) %>)
+            </td>
+          </tr>
+
+          <tr>
+            <th colspan="4"></th>
+          </tr>
+
           <tr>
             <th>Show Popup</th>
             <td><%= @promotion.show_popup ? "Yes" : "No" %></td>

data/lib/dhatu/version.rb

@@ -1,5 +1,5 @@
 module Dhatu
-  VERSION = '0.3.8.pre.materialize'
+  VERSION = '0.3.9.pre.materialize'
   # The old version to migrate existing applications
   # VERSION = '0.1.25'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dhatu
 version: !ruby/object:Gem::Version
-  version: 0.3.8.pre.materialize
+  version: 0.3.9.pre.materialize
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-01 00:00:00.000000000 Z
+date: 2018-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails